diff options
32 files changed, 305 insertions, 295 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core/.classpath index 024fd574b42..8a8f1668cdc 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/.classpath +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/.classpath @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <!-- <classpathentry kind="src" path="test"/>-->
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..f287d53cf45 --- /dev/null +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/.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.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF index 9fea77c193b..3d4475746e8 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF @@ -40,5 +40,5 @@ Bundle-Name: %pluginName Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.infra.core.Activator
Bundle-SymbolicName: org.eclipse.papyrus.infra.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java index cb3098852ec..9c96ac90e00 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java @@ -56,7 +56,9 @@ public abstract class EMFLogicalModel extends AbstractBaseModel implements IEMFM if(!getModelManager().getTransactionalEditingDomain().isReadOnly(resource) && !ModelUtils.resourceFailedOnLoad(resource)) {
try {
resource.save(null);
- } catch (Exception ex) {
+ } catch (IOException ex) {
+ //If an exception occurs, we should not prevent other resources from being saved.
+ //This would probably make things even worse. Catch and log.
Activator.log.error(ex);
}
}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java index 48475d9458e..96f02ae8f5d 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java @@ -62,7 +62,7 @@ import com.google.common.base.Optional; /** * This class is used to manage a set of {@link IModel}. - * + * * <h2>>Usage</h2> * <ul> * <li>First, register associated model. A loader can be used.</li> @@ -70,16 +70,16 @@ import com.google.common.base.Optional; * <li>Then, it is possible to get associated models</li> * <li>Finally, call save()</li> * </ul> - * + * * Please note that indirectly referenced models are loaded on demand. If a * model contains a cross reference towards another model (e.g. an import in * case of UML) the referenced resource does not appear initially in the set. * However, it is added once the referenced model is resolved. - * + * * TODO Modify ModelSetSnippet in order to inform them of model addition. - * + * * @author cedric dumoulin - * + * */ public class ModelSet extends ResourceSetImpl { @@ -125,9 +125,9 @@ public class ModelSet extends ResourceSetImpl { /** - * + * * Constructor. - * + * */ public ModelSet() { registerModel(additional); @@ -146,7 +146,7 @@ public class ModelSet extends ResourceSetImpl { * Register the specified model under its associated key. The key is defined * in the model itself. It is usually the model type from * (ModelPackage.eCONTENT_TYPE). - * + * * @param model * the model */ @@ -166,7 +166,7 @@ public class ModelSet extends ResourceSetImpl { /** * Get a model by its key. TODO throw an exception if not found. - * + * * @param key * the key * @return the model @@ -177,7 +177,7 @@ public class ModelSet extends ResourceSetImpl { /** * Get a model by its key. TODO throw an exception if not found. - * + * * @param key * the key * @return the model @@ -249,7 +249,7 @@ public class ModelSet extends ResourceSetImpl { /** * @deprecated please use {@link #getAssociatedResource(EObject, String, boolean)} instead - * + * * @param modelElement * @param associatedResourceExtension * @return @@ -261,7 +261,7 @@ public class ModelSet extends ResourceSetImpl { /** * @deprecated please use {@link #getAssociatedResource(Resource, String, boolean)} instead - * + * * @param modelResource * @param associatedResourceExtension * @return @@ -273,7 +273,7 @@ public class ModelSet extends ResourceSetImpl { /** * Retrieve and load the associated resource which have the given extension. - * + * * @param modelElement * @param associatedResourceExtension * @param loadOnDemand @@ -289,7 +289,7 @@ public class ModelSet extends ResourceSetImpl { /** * Retrieve and load the associated resource which have the given extension. - * + * * @param modelResource * @param associatedResourceExtension * @param loadOnDemand @@ -308,7 +308,7 @@ public class ModelSet extends ResourceSetImpl { /** * This method is called by getResource, createResource and demandLoad before returning * the resource to the caller so we can set options on the resource. - * + * * @param r * , can be null * @return the same resource for convenience @@ -336,7 +336,7 @@ public class ModelSet extends ResourceSetImpl { /** * Create the transactional editing domain. - * + * * @return the transactional editing domain */ public synchronized TransactionalEditingDomain getTransactionalEditingDomain() { @@ -352,7 +352,7 @@ public class ModelSet extends ResourceSetImpl { /** * @return the filenameWithoutExtension - * + * * @deprecated Use the {@link #getURIWithoutExtension()} API, instead. */ @Deprecated @@ -397,11 +397,11 @@ public class ModelSet extends ResourceSetImpl { /** * Create all the associated models. This creates the models, regardless if * they already exist. - * + * * @param newFile * The file from which path is extracted to create the new * resources - * + * * @deprecated Use the {@link #createModels(URI)} API, instead. */ @Deprecated @@ -412,7 +412,7 @@ public class ModelSet extends ResourceSetImpl { /** * Create all the associated models. This creates the models, regardless if * they already exist. - * + * * @param newFile * The file from which path is extracted to create the new * resources @@ -434,9 +434,9 @@ public class ModelSet extends ResourceSetImpl { /** * Create the model specified by the identifiers. Other models are * untouched, unless they are sharing something with specified models. - * + * * This creates the models, regardless if they already exist. - * + * * @param newFile * The file from which path is extracted to create the new * resources @@ -458,7 +458,7 @@ public class ModelSet extends ResourceSetImpl { /** * Load only the specified model. ModelSetSnippets are not called. Model is * loaded using the ModelSet Path. - * + * * @param modelIdentifier * the model identifier * @param file @@ -478,7 +478,7 @@ public class ModelSet extends ResourceSetImpl { /** * Import only the specified model. ModelSetSnippets are not called. - * + * * @param modelIdentifier * the model identifier * @param file @@ -499,7 +499,7 @@ public class ModelSet extends ResourceSetImpl { /** * Load all the associated models from a handle on one of the associated * file. - * + * * @param file * The file to load (no matter the extension) * @deprecated Use the {@link #loadModels(URI)} API, instead. @@ -516,7 +516,7 @@ public class ModelSet extends ResourceSetImpl { /** * Load all the associated models from a URI identifying one of the associated * files. - * + * * @param uri * The URI to load (no matter the extension) */ @@ -566,14 +566,14 @@ public class ModelSet extends ResourceSetImpl { * Import specified models into the ModelSet. The models are imported using * the specified IFile. After import, the models are associated with the * ModelSet Path. - * + * * @param modelIdentifiers * The model to import from the specified IFile. * @param file * The IFile used to import the model. * @throws ModelException * If an error occur during import. - * + * * @deprecated Use the {@link #importModels(ModelIdentifiers, URI)} API, instead */ @Deprecated @@ -586,7 +586,7 @@ public class ModelSet extends ResourceSetImpl { * Import specified models into the ModelSet. The models are imported using * the specified IFile. After import, the models are associated with the * ModelSet Path. - * + * * @param modelIdentifiers * The model to import from the specified IFile. * @param file @@ -613,14 +613,14 @@ public class ModelSet extends ResourceSetImpl { * Import only the specified model. ModelSetSnippets are not called. An * import can be performed after model are loaded. Normally, it should not * be done before a model is loaded. - * + * * @param modelIdentifier * the model identifier * @param file * the file * @throws ModelException * @returns The loaded model. - * + * * @deprecated Use the {@link #importModel(String, URI)} API, instead. */ @Deprecated @@ -633,7 +633,7 @@ public class ModelSet extends ResourceSetImpl { * Import only the specified model. ModelSetSnippets are not called. An * import can be performed after model are loaded. Normally, it should not * be done before a model is loaded. - * + * * @param modelIdentifier * the model identifier * @param file @@ -666,7 +666,7 @@ public class ModelSet extends ResourceSetImpl { /** * Save the resources. - * + * * @param monitor * The monitor. * @throws IOException @@ -712,12 +712,22 @@ public class ModelSet extends ResourceSetImpl { try { // Walk all registered models for(IModel model : modelList) { - if(!(model instanceof AdditionalResourcesModel)) { - model.saveModel(); - monitor.worked(1); + try { + if(!(model instanceof AdditionalResourcesModel)) { + model.saveModel(); + monitor.worked(1); + } + } catch (Exception ex) { + //If an exception occurs, we should not prevent other models from being saved. + //This would probably make things even worse. Catch and log. + Activator.log.error(ex); } } - additional.saveModel(); + try { + additional.saveModel(); + } catch (Exception ex) { + Activator.log.error(ex); + } //Delete resource back end to delete on save handleResourcesToDelete(); @@ -790,12 +800,12 @@ public class ModelSet extends ResourceSetImpl { /** * Finds the file corresponding to the specified URI, using a URI converter * if necessary (and provided) to normalize it. - * + * * @param uri * a URI * @param converter * an optional URI converter (may be <code>null</code>) - * + * * @return the file, if available in the workspace */ protected IFile getFile(URI uri) { @@ -849,12 +859,12 @@ public class ModelSet extends ResourceSetImpl { /** * The resources are already loaded, but we want to save them under another * name. - * + * * @param path * the path * @throws IOException * Signals that an I/O exception has occurred. - * + * * @deprecated Use the {@link #saveAs(URI)} API, instead. */ @Deprecated @@ -865,7 +875,7 @@ public class ModelSet extends ResourceSetImpl { /** * The resources are already loaded, but we want to save them under another * name. - * + * * @param path * the path * @throws IOException @@ -941,7 +951,7 @@ public class ModelSet extends ResourceSetImpl { /** * Obtains my internal API adapter. - * + * * @return my internal API adapter */ public Internal getInternal() { @@ -966,7 +976,7 @@ public class ModelSet extends ResourceSetImpl { /** * Add a {@link IModelSetSnippet}. A snippet allows to add code that will * perform additional operations on the ModelSet. - * + * * @param snippet * The snippet to add. */ @@ -976,11 +986,11 @@ public class ModelSet extends ResourceSetImpl { /** * A list of {@link IModelSetSnippet}. - * + * * Used by Models to maintain their list of Snippets. - * + * * @author cedric dumoulin - * + * */ public class ModelSetSnippetList extends ArrayList<IModelSetSnippet> { @@ -989,7 +999,7 @@ public class ModelSet extends ResourceSetImpl { /** * Call the start method on all registered snippets. - * + * * @param modelsManager * The model that is starting */ @@ -1001,7 +1011,7 @@ public class ModelSet extends ResourceSetImpl { /** * Call the start method on all registered snippets. - * + * * @param modelsManager * The model that is stopping */ @@ -1020,10 +1030,10 @@ public class ModelSet extends ResourceSetImpl { /** * Sets the {@link ModelSet}'s primary resource URI. - * + * * @param uri * the URI - * + * * @see ModelSet#createModels(URI) * @see ModelSet#saveAs(URI) */ @@ -1032,7 +1042,7 @@ public class ModelSet extends ResourceSetImpl { /** * Register a model with the option to force it (in case a more specific * implementation of the model is already registered). - * + * * @param model * a model to register * @param force @@ -1042,7 +1052,7 @@ public class ModelSet extends ResourceSetImpl { } /** - * + * * @param target */ public void saveCopy(IPath targetPathWithoutExtension) { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelUtils.java index 76db49aa909..e745574077c 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelUtils.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelUtils.java @@ -1,5 +1,5 @@ /** - * + * */ package org.eclipse.papyrus.infra.core.resource; @@ -9,11 +9,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.eclipse.core.internal.resources.ResourceException; import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.common.util.WrappedException; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.Resource.Diagnostic; import org.eclipse.emf.ecore.xmi.IllegalValueException; import org.eclipse.papyrus.infra.core.Activator; import org.eclipse.papyrus.infra.core.services.ServiceException; @@ -107,17 +104,9 @@ public class ModelUtils { } public static boolean resourceFailedOnLoad(Resource r) { - if(r.getErrors() != null) { - for(Diagnostic d : r.getErrors()) { - if(d instanceof WrappedException) { - WrappedException wrapped = (WrappedException)d; - if(wrapped.getCause() instanceof ResourceException && r.getContents().isEmpty()) { - return true; - } - } - } - } - return false; + //If the resource failed on load, but the contents is not empty, then we may try to save it + //(e.g. the resource didn't exist, but we'll create it during save, if possible) + return !r.getErrors().isEmpty() && r.getContents().isEmpty(); } /** @@ -129,7 +118,7 @@ public class ModelUtils { // L <= Empty list that will contain the sorted nodes // while there are unmarked nodes do // select an unmarked node n - // visit(n) + // visit(n) // function visit(node n) // if n has a temporary mark then stop (not a DAG) // if n is not marked (i.e. has not been visited yet) then @@ -143,7 +132,7 @@ public class ModelUtils { do { List<IModel> skippedModels = new ArrayList<IModel>(); for(IModel model : modelsToLoad) { - + List<String> dependencies = model.getAfterLoadModelIdentifiers(); // no dependency => start if(dependencies == null) { @@ -152,6 +141,7 @@ public class ModelUtils { // model has dependencies. Check if the dependencies are already inserted in the ordered list Collection<IModel> startedModels = Collections2.transform(dependencies, new Function<String, IModel>() { + @Override public IModel apply(String arg0) { return models.get(arg0); } @@ -163,25 +153,31 @@ public class ModelUtils { } } } - + // implement here a safeguard in case no models has been added to orderedModels if(!skippedModels.isEmpty() && skippedModels.size() == modelsToLoad.size()) { - Activator.log.error("Impossible to load models. Cycles in dependency graph for the following set of models: "+modelsToLoad, null); + Activator.log.error("Impossible to load models. Cycles in dependency graph for the following set of models: " + modelsToLoad, null); break; } else { modelsToLoad = skippedModels; } - } while(!modelsToLoad.isEmpty()); - + } while(!modelsToLoad.isEmpty()); + return orderedModels; } - + /** - * Returns the resource from the model set. If the resource is not yet in the resource set, it will create it. Once it is created, if asked, it will load it. If it is already present, it will not load it. - * @param modelSet model set in which the resource should be - * @param loadAfterCreation <code>true</code> if the resource should be load if it has been created - * @param resourceURI the uri of the resource - * @param contentType the content type identifier of the resource if it has to be created. + * Returns the resource from the model set. If the resource is not yet in the resource set, it will create it. Once it is created, if asked, it + * will load it. If it is already present, it will not load it. + * + * @param modelSet + * model set in which the resource should be + * @param loadAfterCreation + * <code>true</code> if the resource should be load if it has been created + * @param resourceURI + * the uri of the resource + * @param contentType + * the content type identifier of the resource if it has to be created. * @return the resource found or created */ public static Resource getOrCreateResource(ModelSet modelSet, boolean loadAfterCreation, URI resourceURI, String contentType) { @@ -191,10 +187,10 @@ public class ModelUtils { if(loadAfterCreation) { try { resource.load(modelSet.getLoadOptions()); - } catch(IOException e) { - // physical resource does not exists, but EMF resource itself is build. + } catch (IOException e) { + // physical resource does not exists, but EMF resource itself is build. Activator.log.debug(e.getMessage()); - } + } } } return resource; diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java index b35cb8e02c5..23bb97b79d0 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/sasheditor/SashModelUtils.java @@ -1,5 +1,5 @@ /**
- *
+ *
*/
package org.eclipse.papyrus.infra.core.resource.sasheditor;
@@ -12,9 +12,9 @@ import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers; /**
* Set of utility methods linked to Trace for ControlMode
- *
+ *
* @author cedric dumoulin
- *
+ *
*/
public class SashModelUtils {
@@ -23,12 +23,14 @@ public class SashModelUtils { * Warning: This method is designed to be call from ui.handlers. It is not
* designed to be call from Editors. This method can return null if called
* during the MultiEditor initialization.
- *
+ *
* @see ServiceUtilsForActionHandlers.getInstance().getModelSet()
- *
+ *
* @return The {@link SashModel} of the current editor, or null if not
* found.
+ * @deprecated Use {@link #getSashModel(ModelSet)} or {@link #getSashModel(ServicesRegistry)} instead
*/
+ @Deprecated
public static SashModel getSashModel() {
try {
@@ -43,14 +45,16 @@ public class SashModelUtils { * Warning: This method is designed to be call from ui.handlers. It is not
* designed to be call from Editors. This method can return null if called
* during the MultiEditor initialization.
- *
+ *
* @see ServiceUtilsForActionHandlers.getInstance().getModelSet()
- *
+ *
* @return The {@link SashModel} of the current editor, or null if not
* found.
* @throws ServiceException
* If an error occurs while getting or starting the service.
+ * @deprecated Use {@link #getSashModelChecked(ServicesRegistry)} instead
*/
+ @Deprecated
public static SashModel getSashModelChecked() throws ServiceException {
return (SashModel)ServiceUtilsForActionHandlers.getInstance().getModelSet().getModel(SashModel.MODEL_ID);
@@ -58,10 +62,10 @@ public class SashModelUtils { /**
* Gets the SashModel from the {@link ModelSet}. <br>
- *
+ *
* @param modelsManager
* The modelManager containing the requested model.
- *
+ *
* @return The {@link SashModel} registered in modelManager, or null if not
* found.
*/
@@ -72,10 +76,10 @@ public class SashModelUtils { /**
* Gets the SashModel from the {@link ModelSet}. <br>
- *
+ *
* @param ServicesRegistry
* The servie registry under which the ModelSet is registered.
- *
+ *
* @return The {@link SashModel} registered in modelManager, or null if not
* found.
*/
@@ -90,10 +94,10 @@ public class SashModelUtils { /**
* Gets the SashModel from the {@link ModelSet}. <br>
- *
+ *
* @param ServicesRegistry
* The servie registry under which the ModelSet is registered.
- *
+ *
* @return The {@link SashModel} registered in modelManager, or null if not
* found.
* @throws ServiceException
@@ -106,7 +110,7 @@ public class SashModelUtils { /**
* Retrieve the uri of the initial di opened
- *
+ *
* @param modelSet
* @return
*/
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomain.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomain.java index de7b67ec2eb..0d178b8c6be 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomain.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomain.java @@ -22,6 +22,7 @@ import java.util.Set; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
@@ -92,8 +93,11 @@ public class PapyrusROTransactionalEditingDomain extends TransactionalEditingDom InternalTransaction tx = getActiveTransaction();
// If there's no transaction, then there will be nothing to roll back. And if it's unprotected, let the client do whatever.
- // And, of course, don't interfere with rollback!
- if((tx != null) && !tx.isRollingBack() && !Boolean.TRUE.equals(tx.getOptions().get(Transaction.OPTION_UNPROTECTED))) {
+ // And, of course, don't interfere with rollback! Finally, if we're already going to roll back, don't bother
+ if((tx != null) && !tx.isRollingBack() //
+ && !Boolean.TRUE.equals(tx.getOptions().get(Transaction.OPTION_UNPROTECTED)) //
+ && !willRollBack(tx)) {
+
boolean readOnly;
// Check for Resource first because CDO resources *are* EObjects
@@ -119,6 +123,11 @@ public class PapyrusROTransactionalEditingDomain extends TransactionalEditingDom }
}
}
+
+ private boolean willRollBack(Transaction tx) {
+ IStatus status = tx.getStatus();
+ return (status != null) && (status.getSeverity() >= IStatus.ERROR);
+ }
protected boolean makeWritable(Resource resource) {
URI[] uris = getCompositeModelURIs(resource.getURI());
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java index 6e9a377efed..7ffdcef936f 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java @@ -31,7 +31,6 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.text.IDocument;
import org.eclipse.ocl.examples.domain.evaluation.DomainModelManager;
-import org.eclipse.ocl.examples.domain.evaluation.EvaluationHaltedException;
import org.eclipse.ocl.examples.domain.utilities.DomainUtil;
import org.eclipse.ocl.examples.domain.values.CollectionValue;
import org.eclipse.ocl.examples.domain.values.impl.InvalidValueException;
@@ -44,7 +43,6 @@ import org.eclipse.ocl.examples.pivot.context.ParserContext; import org.eclipse.ocl.examples.pivot.evaluation.EvaluationEnvironment;
import org.eclipse.ocl.examples.pivot.evaluation.EvaluationVisitor;
import org.eclipse.ocl.examples.pivot.evaluation.EvaluationVisitorImpl;
-import org.eclipse.ocl.examples.pivot.evaluation.PivotEvaluationEnvironment;
import org.eclipse.ocl.examples.pivot.manager.MetaModelManager;
import org.eclipse.ocl.examples.pivot.utilities.BaseResource;
import org.eclipse.ocl.examples.pivot.utilities.PivotEnvironment;
@@ -243,8 +241,6 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { value = evaluationVisitor.visitExpressionInOCL(expressionInOCL);
} catch (InvalidValueException e) {
value = e;
- } catch (EvaluationHaltedException e) {
- value = new InvalidValueException(ConsoleMessages.Result_EvaluationTerminated);
} catch (Exception e) {
value = new InvalidValueException(e, ConsoleMessages.Result_EvaluationFailure);
} finally {
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap index b002ca5196b..8aa2f8c8269 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap @@ -182,7 +182,7 @@ <!-- MDT OCL -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT OCL 5.0",0) -->
- <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201401270935">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/interim/5.0.0">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap index 4611782e890..ac3db8a1754 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap @@ -303,7 +303,7 @@ <!-- MDT OCL -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT OCL 5.0",0) -->
- <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201401270935">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/interim/5.0.0">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap index 414646c8eb3..7c81a76828c 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap @@ -254,7 +254,7 @@ <!-- MDT OCL -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT OCL 5.0",0) -->
- <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201401270935">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/interim/5.0.0">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap index 73318474f1b..ad798b3f153 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap @@ -451,7 +451,7 @@ <!-- MDT OCL -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT OCL 5.0",0) -->
- <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201401270935">
+ <rm:uri format="{0}/modeling/mdt/ocl/updates/interim/5.0.0">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml index a6349e58396..94b2523b4d2 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml @@ -40,6 +40,11 @@ <url>http://download.eclipse.org/modeling/emf/cdo/drops/S20140129-1205</url> </repository> <repository> + <id>uml-5</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0-I-builds/I201403011958</url> + </repository> + <repository> <id>eclipse-update</id> <layout>p2</layout> <url>http://download.eclipse.org/eclipse/updates/4.4</url> diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/resource/tests/CDOAwareModelSetTest.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/resource/tests/CDOAwareModelSetTest.java index 744e4e4a249..5d69a8cb927 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/resource/tests/CDOAwareModelSetTest.java +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/resource/tests/CDOAwareModelSetTest.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013 CEA LIST. + * Copyright (c) 2013, 2014 CEA LIST and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -8,6 +8,8 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Christian W. Damus (CEA) - bug 429242 + * *****************************************************************************/ package org.eclipse.papyrus.cdo.core.resource.tests; @@ -85,15 +87,6 @@ public class CDOAwareModelSetTest extends AbstractPapyrusCDOTest { fixture.unload(); assertThat(fixture.getResources(), equalTo(Collections.EMPTY_LIST)); - - fixture.loadModels(getTestResourceURI(MODEL_FILENAME)); - - CDOTransaction transaction = getTransaction(fixture); - assertThat(transaction.isDirty(), is(false)); - - Resource resource = fixture.getResource(getTestResourceURI(MODEL_FILENAME), false); - assertThat(resource, notNullValue()); - assertThat(resource.isLoaded(), is(true)); } @Test @@ -200,6 +193,7 @@ public class CDOAwareModelSetTest extends AbstractPapyrusCDOTest { } catch (ServiceMultiException e) { if(Iterables.any(Iterables.transform(e.getExceptions(), new Function<Throwable, Throwable>() { + @Override public Throwable apply(Throwable input) { return input.getCause(); } diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java index f99cc108e19..46d5c21446e 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/core/tests/AbstractPapyrusCDOTest.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013 CEA LIST. + * Copyright (c) 2013, 2014 CEA LIST and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -8,6 +8,8 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Christian W. Damus (CEA) - bug 429242 + * *****************************************************************************/ package org.eclipse.papyrus.cdo.core.tests; @@ -271,7 +273,7 @@ public abstract class AbstractPapyrusCDOTest { } protected void loadTemplate(String templateName, String resourceName, Resource... resource) { - ResourceSet rset = resource[0].getResourceSet(); + ResourceSet rset = new ResourceSetImpl(); // load all the templates Resource[] templates = new Resource[resource.length]; @@ -290,11 +292,12 @@ public abstract class AbstractPapyrusCDOTest { } // unload the now empty template resources - for(int i = 0; i < templates.length; i++) { - templates[i].unload(); - rset.getResources().remove(templates[i]); - templates[i].eAdapters().clear(); + for(Resource next : rset.getResources()) { + next.unload(); + next.eAdapters().clear(); } + rset.getResources().clear(); + rset.eAdapters().clear(); } protected <T extends EObject> T getMasterViewObject(T object) { diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AbstractModelExportTest.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AbstractModelExportTest.java index 3960a265db5..3d6458892e8 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AbstractModelExportTest.java +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/exporter/tests/AbstractModelExportTest.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013 CEA LIST. + * Copyright (c) 2013, 2014 CEA LIST and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -8,6 +8,8 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Christian W. Damus (CEA) - bug 429242 + * *****************************************************************************/ package org.eclipse.papyrus.cdo.internal.core.exporter.tests; @@ -108,7 +110,7 @@ public abstract class AbstractModelExportTest extends AbstractPapyrusCDOTest { // load blank model Resource uml = ((AbstractBaseModel)result.getModel(UmlModel.MODEL_ID)).getResource(); Resource notation = ((AbstractBaseModel)result.getModel(NotationModel.MODEL_ID)).getResource(); - Resource di = ((AbstractBaseModel)result.getModel(DiModel.MODEL_ID)).getResource(); + Resource di = ((AbstractBaseModel)result.getModel(DiModel.DI_MODEL_ID)).getResource(); loadTemplate("empty", "model", uml, notation, di); return result; diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di index 7e820fe875e..e094f1ea380 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.di @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ASCII"?> +<?xml version="1.0" encoding="UTF-8"?> <di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> <pageList> <availablePage> diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation index e58ec2f11b1..d0101d06908 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.notation @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_a6YuMBexEeOaDesjAlqXXw" type="PapyrusUMLClassDiagram" name="Classes" measurementUnit="Pixel"> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_a6YuMBexEeOaDesjAlqXXw" type="PapyrusUMLClassDiagram" name="Classes" measurementUnit="Pixel"> <children xmi:type="notation:Shape" xmi:id="_a6YuMRexEeOaDesjAlqXXw" type="2008"> <children xmi:type="notation:DecorationNode" xmi:id="_a6YuMhexEeOaDesjAlqXXw" type="5029"/> <children xmi:type="notation:BasicCompartment" xmi:id="_a6YuMxexEeOaDesjAlqXXw" type="7017"> @@ -30,7 +30,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6YuRxexEeOaDesjAlqXXw"/> </children> <element xmi:type="uml:Class" href="admin.uml#_a62oQxexEeOaDesjAlqXXw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6YuSBexEeOaDesjAlqXXw" x="95" y="91"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6YuSBexEeOaDesjAlqXXw" x="80" y="89"/> </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_a6YuSRexEeOaDesjAlqXXw"/> <element xmi:type="uml:Model" href="admin.uml#_a62oQBexEeOaDesjAlqXXw"/> diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml index fe7fd6f3364..0ca12fe3f8d 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/admin.uml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_a62oQBexEeOaDesjAlqXXw" name="AdminConsole"> - <packageImport xmi:id="_a62oQRexEeOaDesjAlqXXw"> +<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_a62oQBexEeOaDesjAlqXXw" name="AdminConsole"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_a62oQRexEeOaDesjAlqXXw"> <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> </packageImport> - <packageImport xmi:id="_a62oQhexEeOaDesjAlqXXw"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_a62oQhexEeOaDesjAlqXXw"> <importedPackage xmi:type="uml:Model" href="tracker.uml#_a28_sBexEeOaDesjAlqXXw"/> </packageImport> <packagedElement xmi:type="uml:Class" xmi:id="_a62oQxexEeOaDesjAlqXXw" name="AdminConsole"/> diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di index c30e5b88ba8..dba6a6b6cbe 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.di @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ASCII"?> +<?xml version="1.0" encoding="UTF-8"?> <di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> <pageList> <availablePage> diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation index c73fe29a98b..f4382bd9c67 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.notation @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_a4w9kBexEeOaDesjAlqXXw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> <children xmi:type="notation:Shape" xmi:id="_a4w9kRexEeOaDesjAlqXXw" type="2008"> <children xmi:type="notation:DecorationNode" xmi:id="_a4w9khexEeOaDesjAlqXXw" type="5029"/> @@ -38,7 +38,7 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w9rBexEeOaDesjAlqXXw"/> </children> <element xmi:type="uml:Class" href="garage.uml#_a5Qs0RexEeOaDesjAlqXXw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w9rRexEeOaDesjAlqXXw" x="81" y="36"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4w9rRexEeOaDesjAlqXXw" x="63" y="50"/> </children> <children xmi:type="notation:Shape" xmi:id="_a4w9rhexEeOaDesjAlqXXw" type="2008"> <children xmi:type="notation:DecorationNode" xmi:id="_a4w9rxexEeOaDesjAlqXXw" type="5029"/> diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml index 462cf8efb05..64b21b1a53e 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/garage.uml @@ -1,27 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_a5Qs0BexEeOaDesjAlqXXw" name="model"> +<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_a5Qs0BexEeOaDesjAlqXXw" name="model"> <packagedElement xmi:type="uml:Class" xmi:id="_a5Qs0RexEeOaDesjAlqXXw" name="Garage" classifierBehavior="_a5Qs2xexEeOaDesjAlqXXw"> - <ownedAttribute xmi:id="_a5Qs0hexEeOaDesjAlqXXw" name="personalDoor" type="_a5Qs6hexEeOaDesjAlqXXw" aggregation="composite" association="_a5Qs6xexEeOaDesjAlqXXw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_a5Qs0hexEeOaDesjAlqXXw" name="personalDoor" type="_a5Qs6hexEeOaDesjAlqXXw" aggregation="composite" association="_a5Qs6xexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a5Qs0xexEeOaDesjAlqXXw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a5Qs1BexEeOaDesjAlqXXw" value="2"/> </ownedAttribute> - <ownedAttribute xmi:id="_a5Qs1RexEeOaDesjAlqXXw" name="garageDoor" type="_a5Qs6RexEeOaDesjAlqXXw" aggregation="composite" association="_a5Qs7xexEeOaDesjAlqXXw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_a5Qs1RexEeOaDesjAlqXXw" name="garageDoor" type="_a5Qs6RexEeOaDesjAlqXXw" aggregation="composite" association="_a5Qs7xexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a5Qs1hexEeOaDesjAlqXXw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a5Qs1xexEeOaDesjAlqXXw" value="3"/> </ownedAttribute> - <ownedAttribute xmi:id="_a5Qs2BexEeOaDesjAlqXXw" name="opener" type="_a5Qs8xexEeOaDesjAlqXXw" aggregation="composite" association="_a5Qs-xexEeOaDesjAlqXXw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_a5Qs2BexEeOaDesjAlqXXw" name="opener" type="_a5Qs8xexEeOaDesjAlqXXw" aggregation="composite" association="_a5Qs-xexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a5Qs2RexEeOaDesjAlqXXw"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a5Qs2hexEeOaDesjAlqXXw" value="*"/> </ownedAttribute> <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_a5Qs2xexEeOaDesjAlqXXw" name="OperationCycle"> - <region xmi:id="_a5Qs3BexEeOaDesjAlqXXw" name="Region1"> - <transition xmi:id="_a5Qs3RexEeOaDesjAlqXXw" name="Transition0" source="_a5Qs5BexEeOaDesjAlqXXw" target="_a5Qs6BexEeOaDesjAlqXXw"/> - <transition xmi:id="_a5Qs3hexEeOaDesjAlqXXw" name="opener_clicked" source="_a5Qs6BexEeOaDesjAlqXXw" target="_a5Qs5xexEeOaDesjAlqXXw"/> - <transition xmi:id="_a5Qs3xexEeOaDesjAlqXXw" name="opener_clicked" source="_a5Qs5xexEeOaDesjAlqXXw" target="_a5Qs5hexEeOaDesjAlqXXw"/> - <transition xmi:id="_a5Qs4BexEeOaDesjAlqXXw" name="opener_clicked" source="_a5Qs5hexEeOaDesjAlqXXw" target="_a5Qs5xexEeOaDesjAlqXXw"/> - <transition xmi:id="_a5Qs4RexEeOaDesjAlqXXw" name="opener_clicked" source="_a5Qs5RexEeOaDesjAlqXXw" target="_a5Qs5hexEeOaDesjAlqXXw"/> - <transition xmi:id="_a5Qs4hexEeOaDesjAlqXXw" name="top_reached" source="_a5Qs5xexEeOaDesjAlqXXw" target="_a5Qs5RexEeOaDesjAlqXXw"/> - <transition xmi:id="_a5Qs4xexEeOaDesjAlqXXw" name="bottom_reached" source="_a5Qs5hexEeOaDesjAlqXXw" target="_a5Qs6BexEeOaDesjAlqXXw"/> + <region xmi:type="uml:Region" xmi:id="_a5Qs3BexEeOaDesjAlqXXw" name="Region1"> + <transition xmi:type="uml:Transition" xmi:id="_a5Qs3RexEeOaDesjAlqXXw" name="Transition0" source="_a5Qs5BexEeOaDesjAlqXXw" target="_a5Qs6BexEeOaDesjAlqXXw"/> + <transition xmi:type="uml:Transition" xmi:id="_a5Qs3hexEeOaDesjAlqXXw" name="opener_clicked" source="_a5Qs6BexEeOaDesjAlqXXw" target="_a5Qs5xexEeOaDesjAlqXXw"/> + <transition xmi:type="uml:Transition" xmi:id="_a5Qs3xexEeOaDesjAlqXXw" name="opener_clicked" source="_a5Qs5xexEeOaDesjAlqXXw" target="_a5Qs5hexEeOaDesjAlqXXw"/> + <transition xmi:type="uml:Transition" xmi:id="_a5Qs4BexEeOaDesjAlqXXw" name="opener_clicked" source="_a5Qs5hexEeOaDesjAlqXXw" target="_a5Qs5xexEeOaDesjAlqXXw"/> + <transition xmi:type="uml:Transition" xmi:id="_a5Qs4RexEeOaDesjAlqXXw" name="opener_clicked" source="_a5Qs5RexEeOaDesjAlqXXw" target="_a5Qs5hexEeOaDesjAlqXXw"/> + <transition xmi:type="uml:Transition" xmi:id="_a5Qs4hexEeOaDesjAlqXXw" name="top_reached" source="_a5Qs5xexEeOaDesjAlqXXw" target="_a5Qs5RexEeOaDesjAlqXXw"/> + <transition xmi:type="uml:Transition" xmi:id="_a5Qs4xexEeOaDesjAlqXXw" name="bottom_reached" source="_a5Qs5hexEeOaDesjAlqXXw" target="_a5Qs6BexEeOaDesjAlqXXw"/> <subvertex xmi:type="uml:Pseudostate" xmi:id="_a5Qs5BexEeOaDesjAlqXXw" name="Initial0"/> <subvertex xmi:type="uml:State" xmi:id="_a5Qs5RexEeOaDesjAlqXXw" name="Door Open"/> <subvertex xmi:type="uml:State" xmi:id="_a5Qs5hexEeOaDesjAlqXXw" name="Door Closing"/> @@ -33,31 +33,31 @@ <packagedElement xmi:type="uml:Class" xmi:id="_a5Qs6RexEeOaDesjAlqXXw" name="GarageDoor"/> <packagedElement xmi:type="uml:Class" xmi:id="_a5Qs6hexEeOaDesjAlqXXw" name="PersonalDoor"/> <packagedElement xmi:type="uml:Association" xmi:id="_a5Qs6xexEeOaDesjAlqXXw" name="garage_personalDoor_1" memberEnd="_a5Qs7BexEeOaDesjAlqXXw _a5Qs0hexEeOaDesjAlqXXw"> - <ownedEnd xmi:id="_a5Qs7BexEeOaDesjAlqXXw" name="garage" type="_a5Qs0RexEeOaDesjAlqXXw" association="_a5Qs6xexEeOaDesjAlqXXw"> + <ownedEnd xmi:type="uml:Property" xmi:id="_a5Qs7BexEeOaDesjAlqXXw" name="garage" type="_a5Qs0RexEeOaDesjAlqXXw" association="_a5Qs6xexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a5Qs7RexEeOaDesjAlqXXw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a5Qs7hexEeOaDesjAlqXXw" value="1"/> </ownedEnd> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_a5Qs7xexEeOaDesjAlqXXw" name="garage_garageDoor_1" memberEnd="_a5Qs8BexEeOaDesjAlqXXw _a5Qs1RexEeOaDesjAlqXXw"> - <ownedEnd xmi:id="_a5Qs8BexEeOaDesjAlqXXw" name="garage" type="_a5Qs0RexEeOaDesjAlqXXw" association="_a5Qs7xexEeOaDesjAlqXXw"> + <ownedEnd xmi:type="uml:Property" xmi:id="_a5Qs8BexEeOaDesjAlqXXw" name="garage" type="_a5Qs0RexEeOaDesjAlqXXw" association="_a5Qs7xexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a5Qs8RexEeOaDesjAlqXXw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a5Qs8hexEeOaDesjAlqXXw" value="1"/> </ownedEnd> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_a5Qs8xexEeOaDesjAlqXXw" name="Opener"> - <ownedAttribute xmi:id="_a5Qs9BexEeOaDesjAlqXXw" name="opens" type="_a5Qs6RexEeOaDesjAlqXXw" association="_a5Qs9xexEeOaDesjAlqXXw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_a5Qs9BexEeOaDesjAlqXXw" name="opens" type="_a5Qs6RexEeOaDesjAlqXXw" association="_a5Qs9xexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a5Qs9RexEeOaDesjAlqXXw"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a5Qs9hexEeOaDesjAlqXXw" value="1"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_a5Qs9xexEeOaDesjAlqXXw" name="opener_garageDoor_1" memberEnd="_a5Qs-BexEeOaDesjAlqXXw _a5Qs9BexEeOaDesjAlqXXw"> - <ownedEnd xmi:id="_a5Qs-BexEeOaDesjAlqXXw" name="opener" type="_a5Qs8xexEeOaDesjAlqXXw" association="_a5Qs9xexEeOaDesjAlqXXw"> + <ownedEnd xmi:type="uml:Property" xmi:id="_a5Qs-BexEeOaDesjAlqXXw" name="opener" type="_a5Qs8xexEeOaDesjAlqXXw" association="_a5Qs9xexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a5Qs-RexEeOaDesjAlqXXw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a5Qs-hexEeOaDesjAlqXXw" value="1"/> </ownedEnd> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_a5Qs-xexEeOaDesjAlqXXw" name="garage_opener_1" memberEnd="_a5Qs_BexEeOaDesjAlqXXw _a5Qs2BexEeOaDesjAlqXXw"> - <ownedEnd xmi:id="_a5Qs_BexEeOaDesjAlqXXw" name="garage" type="_a5Qs0RexEeOaDesjAlqXXw" association="_a5Qs-xexEeOaDesjAlqXXw"> + <ownedEnd xmi:type="uml:Property" xmi:id="_a5Qs_BexEeOaDesjAlqXXw" name="garage" type="_a5Qs0RexEeOaDesjAlqXXw" association="_a5Qs-xexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a5Qs_RexEeOaDesjAlqXXw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a5Qs_hexEeOaDesjAlqXXw" value="1"/> </ownedEnd> diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation index 187f569c8d4..345c59f7fc5 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.notation @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_a8MFABexEeOaDesjAlqXXw" type="PapyrusUMLProfileDiagram" name="profile" measurementUnit="Pixel"> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_a8MFABexEeOaDesjAlqXXw" type="PapyrusUMLProfileDiagram" name="profile" measurementUnit="Pixel"> <children xmi:type="notation:Shape" xmi:id="_a8MFARexEeOaDesjAlqXXw" type="1026"> <children xmi:type="notation:DecorationNode" xmi:id="_a8MFAhexEeOaDesjAlqXXw" type="1034"/> <children xmi:type="notation:BasicCompartment" xmi:id="_a8MFAxexEeOaDesjAlqXXw" type="1071"> @@ -27,18 +27,6 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_a8wFzBexEeOaDesjAlqXXw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a8MFExexEeOaDesjAlqXXw" x="54" y="135"/> </children> - <children xmi:type="notation:Shape" xmi:id="_a8MFFBexEeOaDesjAlqXXw" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a8MFFRexEeOaDesjAlqXXw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8MFFhexEeOaDesjAlqXXw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8MFFxexEeOaDesjAlqXXw" key="StereotypeList" value="StandardProfileL2::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8MFGBexEeOaDesjAlqXXw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8MFGRexEeOaDesjAlqXXw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8MFGhexEeOaDesjAlqXXw" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_a8MFGxexEeOaDesjAlqXXw" type="1084"/> - <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a8MFHBexEeOaDesjAlqXXw" x="63" y="27"/> - </children> <children xmi:type="notation:Shape" xmi:id="_a8MFHRexEeOaDesjAlqXXw" type="2006"> <children xmi:type="notation:DecorationNode" xmi:id="_a8MFHhexEeOaDesjAlqXXw" type="5023"/> <children xmi:type="notation:BasicCompartment" xmi:id="_a8MFHxexEeOaDesjAlqXXw" type="1063"> @@ -88,33 +76,18 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_a8wF2BexEeOaDesjAlqXXw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a8MsGhexEeOaDesjAlqXXw" x="360" y="126"/> </children> - <children xmi:type="notation:Shape" xmi:id="_a8MsGxexEeOaDesjAlqXXw" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a8MsHBexEeOaDesjAlqXXw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8MsHRexEeOaDesjAlqXXw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8MsHhexEeOaDesjAlqXXw" key="StereotypeList" value="StandardProfileL2::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8MsHxexEeOaDesjAlqXXw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8MsIBexEeOaDesjAlqXXw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a8MsIRexEeOaDesjAlqXXw" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_a8MsIhexEeOaDesjAlqXXw" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_7OlfYKY9EeOyAOqIySP6zQ" type="1031"> + <children xmi:type="notation:DecorationNode" xmi:id="_7OlfYqY9EeOyAOqIySP6zQ" type="1084"/> + <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7OlfYaY9EeOyAOqIySP6zQ" x="70" y="34"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_8bglgKY9EeOyAOqIySP6zQ" type="1031"> + <children xmi:type="notation:DecorationNode" xmi:id="_8bhMkKY9EeOyAOqIySP6zQ" type="1084"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a8MsIxexEeOaDesjAlqXXw" x="351" y="18"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8bglgaY9EeOyAOqIySP6zQ" x="364" y="32"/> </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_a8MsJBexEeOaDesjAlqXXw"/> <element xmi:type="uml:Profile" href="j2ee.profile.uml#_a8wFsBexEeOaDesjAlqXXw"/> - <edges xmi:type="notation:Connector" xmi:id="_a8MsJRexEeOaDesjAlqXXw" type="1013" source="_a8MFARexEeOaDesjAlqXXw" target="_a8MFFBexEeOaDesjAlqXXw"> - <styles xmi:type="notation:FontStyle" xmi:id="_a8MsJhexEeOaDesjAlqXXw"/> - <element xmi:type="uml:Extension" href="j2ee.profile.uml#_a8wF0hexEeOaDesjAlqXXw"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a8MsJxexEeOaDesjAlqXXw" points="[15, -4, -291, 63]$[256, -68, -50, -1]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a8MsKBexEeOaDesjAlqXXw" id="(0.4918032786885246,0.03)"/> - </edges> - <edges xmi:type="notation:Connector" xmi:id="_a8MsKRexEeOaDesjAlqXXw" type="1013" source="_a8MFLRexEeOaDesjAlqXXw" target="_a8MsGxexEeOaDesjAlqXXw"> - <styles xmi:type="notation:FontStyle" xmi:id="_a8MsKhexEeOaDesjAlqXXw"/> - <element xmi:type="uml:Extension" href="j2ee.profile.uml#_a8wF2hexEeOaDesjAlqXXw"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a8MsKxexEeOaDesjAlqXXw" points="[23, -14, -119, 70]$[121, -92, -21, -8]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a8MsLBexEeOaDesjAlqXXw" id="(0.34,0.09)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a8MsLRexEeOaDesjAlqXXw" id="(0.46,0.88)"/> - </edges> <edges xmi:type="notation:Connector" xmi:id="_a8MsLhexEeOaDesjAlqXXw" type="4001" source="_a8MFARexEeOaDesjAlqXXw" target="_a8MFLRexEeOaDesjAlqXXw"> <children xmi:type="notation:DecorationNode" xmi:id="_a8MsLxexEeOaDesjAlqXXw" visible="false" type="6001"> <layoutConstraint xmi:type="notation:Location" xmi:id="_a8MsMBexEeOaDesjAlqXXw" y="60"/> @@ -140,4 +113,14 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a8MsPRexEeOaDesjAlqXXw" id="(0.8114754098360656,0.67)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a8MsPhexEeOaDesjAlqXXw" id="(0.24,0.69)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_7OupUKY9EeOyAOqIySP6zQ" type="1013" source="_a8MFARexEeOaDesjAlqXXw" target="_7OlfYKY9EeOyAOqIySP6zQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_7OupUaY9EeOyAOqIySP6zQ"/> + <element xmi:type="uml:Extension" href="j2ee.profile.uml#_a8wF0hexEeOaDesjAlqXXw"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7OupUqY9EeOyAOqIySP6zQ" points="[-32, -50, 83, 135]$[-115, -185, 0, 0]"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_8bohUKY9EeOyAOqIySP6zQ" type="1013" source="_a8MFLRexEeOaDesjAlqXXw" target="_8bglgKY9EeOyAOqIySP6zQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_8bohUaY9EeOyAOqIySP6zQ"/> + <element xmi:type="uml:Extension" href="j2ee.profile.uml#_a8wF2hexEeOaDesjAlqXXw"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8bohUqY9EeOyAOqIySP6zQ" points="[-50, -22, 360, 154]$[-410, -176, 0, 0]"/> + </edges> </notation:Diagram> diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml index d9c4e031798..d74a8372a22 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/j2ee.profile.uml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_a8wFsBexEeOaDesjAlqXXw" name="j2ee" metaclassReference="_a8wFyhexEeOaDesjAlqXXw _a8wFyxexEeOaDesjAlqXXw"> +<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_a8wFsBexEeOaDesjAlqXXw" name="j2ee" metaclassReference="_a8wFyhexEeOaDesjAlqXXw _a8wFyxexEeOaDesjAlqXXw"> <eAnnotations xmi:id="_a8wFsRexEeOaDesjAlqXXw" source="http://www.eclipse.org/uml2/2.0.0/UML"> <contents xmi:type="ecore:EPackage" xmi:id="_a8wFshexEeOaDesjAlqXXw" name="j2ee" nsURI="http:///schemas/j2ee/_6PHYYFkiEeK52Llgof0Xvg/0" nsPrefix="j2ee"> <eAnnotations xmi:id="_a8wFsxexEeOaDesjAlqXXw" source="PapyrusVersion"> diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di index fc456744fcf..517cfbb89db 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.di @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ASCII"?> +<?xml version="1.0" encoding="UTF-8"?> <di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> <pageList> <availablePage> diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation index 35e3b9f6eb8..f88243fc3f7 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.notation @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_a2RqQBexEeOaDesjAlqXXw" type="PapyrusUMLClassDiagram" name="Classes" measurementUnit="Pixel"> <children xmi:type="notation:Shape" xmi:id="_a2RqQRexEeOaDesjAlqXXw" type="2008"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2RqQhexEeOaDesjAlqXXw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqQxexEeOaDesjAlqXXw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqRBexEeOaDesjAlqXXw" key="StereotypeList" value="j2ee::Bean"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqRRexEeOaDesjAlqXXw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqRhexEeOaDesjAlqXXw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqRxexEeOaDesjAlqXXw" key="StereotypePropertyLocation" value="Compartment"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSSFgKY9EeOyAOqIySP6zQ" key="StereotypeWithQualifiedNameList" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSSFgaY9EeOyAOqIySP6zQ" key="StereotypeList" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSSFgqY9EeOyAOqIySP6zQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSSFg6Y9EeOyAOqIySP6zQ" key="PropStereoDisplay" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSSskKY9EeOyAOqIySP6zQ" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_a2RqSBexEeOaDesjAlqXXw" type="5029"/> <children xmi:type="notation:BasicCompartment" xmi:id="_a2RqSRexEeOaDesjAlqXXw" type="7017"> @@ -29,11 +29,11 @@ </eAnnotations> <children xmi:type="notation:Shape" xmi:id="_a2RqVRexEeOaDesjAlqXXw" type="3013"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2RqVhexEeOaDesjAlqXXw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqVxexEeOaDesjAlqXXw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqWBexEeOaDesjAlqXXw" key="StereotypeList" value="j2ee::Finder"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqWRexEeOaDesjAlqXXw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqWhexEeOaDesjAlqXXw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqWxexEeOaDesjAlqXXw" key="StereotypePropertyLocation" value="Compartment"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSWW8KY9EeOyAOqIySP6zQ" key="StereotypeWithQualifiedNameList" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSW-AKY9EeOyAOqIySP6zQ" key="StereotypeList" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSW-AaY9EeOyAOqIySP6zQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSW-AqY9EeOyAOqIySP6zQ" key="PropStereoDisplay" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSW-A6Y9EeOyAOqIySP6zQ" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> <element xmi:type="uml:Operation" href="tracker.uml#_a29ACRexEeOaDesjAlqXXw"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_a2RqXBexEeOaDesjAlqXXw"/> @@ -53,15 +53,15 @@ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2RqZxexEeOaDesjAlqXXw"/> </children> <element xmi:type="uml:Class" href="tracker.uml#_a28_shexEeOaDesjAlqXXw"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2RqaBexEeOaDesjAlqXXw" x="99" y="162"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a2RqaBexEeOaDesjAlqXXw" x="99" y="173"/> </children> <children xmi:type="notation:Shape" xmi:id="_a2RqaRexEeOaDesjAlqXXw" type="2008"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a2RqahexEeOaDesjAlqXXw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqaxexEeOaDesjAlqXXw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqbBexEeOaDesjAlqXXw" key="StereotypeList" value="j2ee::Bean"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqbRexEeOaDesjAlqXXw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqbhexEeOaDesjAlqXXw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2RqbxexEeOaDesjAlqXXw" key="StereotypePropertyLocation" value="Compartment"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSruIKY9EeOyAOqIySP6zQ" key="StereotypeWithQualifiedNameList" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSruIaY9EeOyAOqIySP6zQ" key="StereotypeList" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSsVMKY9EeOyAOqIySP6zQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSsVMaY9EeOyAOqIySP6zQ" key="PropStereoDisplay" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DSsVMqY9EeOyAOqIySP6zQ" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_a2RqcBexEeOaDesjAlqXXw" type="5029"/> <children xmi:type="notation:BasicCompartment" xmi:id="_a2RqcRexEeOaDesjAlqXXw" type="7017"> diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml index c807d542f80..9d0ebe60b4f 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/resources/tracker.uml @@ -1,152 +1,152 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:j2ee="http:///schemas/j2ee/_6PHYYFkiEeK52Llgof0Xvg/0" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> +<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:j2ee="http:///schemas/j2ee/_6PHYYFkiEeK52Llgof0Xvg/0" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <uml:Model xmi:id="_a28_sBexEeOaDesjAlqXXw" name="BugTracker"> - <packageImport xmi:id="_a28_sRexEeOaDesjAlqXXw"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_a28_sRexEeOaDesjAlqXXw"> <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> </packageImport> - <packagedElement xmi:type="uml:Class" xmi:id="_a28_shexEeOaDesjAlqXXw" clientDependency="_a28_uhexEeOaDesjAlqXXw" name="Bug" classifierBehavior="_a28_uxexEeOaDesjAlqXXw"> - <ownedAttribute xmi:id="_a28_sxexEeOaDesjAlqXXw" name="id"> + <packagedElement xmi:type="uml:Class" xmi:id="_a28_shexEeOaDesjAlqXXw" name="Bug" classifierBehavior="_a28_uxexEeOaDesjAlqXXw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_a28_sxexEeOaDesjAlqXXw" name="id"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> </ownedAttribute> - <ownedAttribute xmi:id="_a28_tBexEeOaDesjAlqXXw" name="reporter" type="_a29AChexEeOaDesjAlqXXw" association="_a29ADhexEeOaDesjAlqXXw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_a28_tBexEeOaDesjAlqXXw" name="reporter" type="_a29AChexEeOaDesjAlqXXw" association="_a29ADhexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a28_tRexEeOaDesjAlqXXw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a28_thexEeOaDesjAlqXXw" value="1"/> </ownedAttribute> - <ownedAttribute xmi:id="_a28_txexEeOaDesjAlqXXw" name="assignee" type="_a29AChexEeOaDesjAlqXXw" association="_a29AEhexEeOaDesjAlqXXw"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_a28_txexEeOaDesjAlqXXw" name="assignee" type="_a29AChexEeOaDesjAlqXXw" association="_a29AEhexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a28_uBexEeOaDesjAlqXXw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a28_uRexEeOaDesjAlqXXw" value="1"/> </ownedAttribute> - <interfaceRealization xmi:id="_a28_uhexEeOaDesjAlqXXw" name="InterfaceRealization1" client="_a28_shexEeOaDesjAlqXXw" supplier="_a29AFxexEeOaDesjAlqXXw" contract="_a29AFxexEeOaDesjAlqXXw"/> - <ownedBehavior xmi:type="uml:Activity" xmi:id="_a28_uxexEeOaDesjAlqXXw" name="Lifecycle" group="_a28_vBexEeOaDesjAlqXXw" node="_a28__BexEeOaDesjAlqXXw _a28__RexEeOaDesjAlqXXw _a28__hexEeOaDesjAlqXXw _a28__xexEeOaDesjAlqXXw _a29AABexEeOaDesjAlqXXw _a29AARexEeOaDesjAlqXXw _a29AAhexEeOaDesjAlqXXw _a29AAxexEeOaDesjAlqXXw _a29ABBexEeOaDesjAlqXXw _a29ABRexEeOaDesjAlqXXw _a29ABhexEeOaDesjAlqXXw _a29ABxexEeOaDesjAlqXXw _a29ACBexEeOaDesjAlqXXw"> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_wBexEeOaDesjAlqXXw" name="ControlFlow1" source="_a28__BexEeOaDesjAlqXXw" target="_a28__hexEeOaDesjAlqXXw"> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_a28_uhexEeOaDesjAlqXXw" name="InterfaceRealization1" client="_a28_shexEeOaDesjAlqXXw" supplier="_a29AFxexEeOaDesjAlqXXw" contract="_a29AFxexEeOaDesjAlqXXw"/> + <ownedBehavior xmi:type="uml:Activity" xmi:id="_a28_uxexEeOaDesjAlqXXw" name="Lifecycle" node="_a28__BexEeOaDesjAlqXXw _a28__RexEeOaDesjAlqXXw _a28__hexEeOaDesjAlqXXw _a28__xexEeOaDesjAlqXXw _a29AABexEeOaDesjAlqXXw _a29AARexEeOaDesjAlqXXw _a29AAhexEeOaDesjAlqXXw _a29AAxexEeOaDesjAlqXXw _a29ABBexEeOaDesjAlqXXw _a29ABRexEeOaDesjAlqXXw _a29ABhexEeOaDesjAlqXXw _a29ABxexEeOaDesjAlqXXw _a29ACBexEeOaDesjAlqXXw" group="_a28_vBexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_wBexEeOaDesjAlqXXw" name="ControlFlow1" target="_a28__hexEeOaDesjAlqXXw" source="_a28__BexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_wRexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_whexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_wxexEeOaDesjAlqXXw" name="ControlFlow2" source="_a28__hexEeOaDesjAlqXXw" target="_a28__xexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_wxexEeOaDesjAlqXXw" name="ControlFlow2" target="_a28__xexEeOaDesjAlqXXw" source="_a28__hexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_xBexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_xRexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_xhexEeOaDesjAlqXXw" name="ControlFlow3" source="_a28__xexEeOaDesjAlqXXw" target="_a29ABBexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_xhexEeOaDesjAlqXXw" name="ControlFlow3" target="_a29ABBexEeOaDesjAlqXXw" source="_a28__xexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_xxexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_yBexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_yRexEeOaDesjAlqXXw" name="ControlFlow4" source="_a29ABBexEeOaDesjAlqXXw" target="_a28_vRexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_yRexEeOaDesjAlqXXw" name="ControlFlow4" target="_a28_vRexEeOaDesjAlqXXw" source="_a29ABBexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_yhexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_yxexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_zBexEeOaDesjAlqXXw" name="ControlFlow5" source="_a29ABBexEeOaDesjAlqXXw" target="_a28_vhexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_zBexEeOaDesjAlqXXw" name="ControlFlow5" target="_a28_vhexEeOaDesjAlqXXw" source="_a29ABBexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_zRexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_zhexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_zxexEeOaDesjAlqXXw" name="ControlFlow6" source="_a29ABBexEeOaDesjAlqXXw" target="_a28_vxexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_zxexEeOaDesjAlqXXw" name="ControlFlow6" target="_a28_vxexEeOaDesjAlqXXw" source="_a29ABBexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_0BexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_0RexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_0hexEeOaDesjAlqXXw" name="ControlFlow7" source="_a28_vhexEeOaDesjAlqXXw" target="_a29AAhexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_0hexEeOaDesjAlqXXw" name="ControlFlow7" target="_a29AAhexEeOaDesjAlqXXw" source="_a28_vhexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_0xexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_1BexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_1RexEeOaDesjAlqXXw" name="ControlFlow8" source="_a28_vxexEeOaDesjAlqXXw" target="_a29AAhexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_1RexEeOaDesjAlqXXw" name="ControlFlow8" target="_a29AAhexEeOaDesjAlqXXw" source="_a28_vxexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_1hexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_1xexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_2BexEeOaDesjAlqXXw" name="ControlFlow9" source="_a28_vRexEeOaDesjAlqXXw" target="_a29ABxexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_2BexEeOaDesjAlqXXw" name="ControlFlow9" target="_a29ABxexEeOaDesjAlqXXw" source="_a28_vRexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_2RexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_2hexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_2xexEeOaDesjAlqXXw" name="ControlFlow10" source="_a29ABxexEeOaDesjAlqXXw" target="_a29ABRexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_2xexEeOaDesjAlqXXw" name="ControlFlow10" target="_a29ABRexEeOaDesjAlqXXw" source="_a29ABxexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_3BexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_3RexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_3hexEeOaDesjAlqXXw" name="ControlFlow11" source="_a29ABRexEeOaDesjAlqXXw" target="_a29AABexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_3hexEeOaDesjAlqXXw" name="ControlFlow11" target="_a29AABexEeOaDesjAlqXXw" source="_a29ABRexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_3xexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_4BexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_4RexEeOaDesjAlqXXw" name="ControlFlow12" source="_a29AABexEeOaDesjAlqXXw" target="_a29AARexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_4RexEeOaDesjAlqXXw" name="ControlFlow12" target="_a29AARexEeOaDesjAlqXXw" source="_a29AABexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_4hexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_4xexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_5BexEeOaDesjAlqXXw" name="ControlFlow13" source="_a29AARexEeOaDesjAlqXXw" target="_a29ABhexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_5BexEeOaDesjAlqXXw" name="ControlFlow13" target="_a29ABhexEeOaDesjAlqXXw" source="_a29AARexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_5RexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_5hexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_5xexEeOaDesjAlqXXw" name="ControlFlow14" source="_a29ABhexEeOaDesjAlqXXw" target="_a29AAxexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_5xexEeOaDesjAlqXXw" name="ControlFlow14" target="_a29AAxexEeOaDesjAlqXXw" source="_a29ABhexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_6BexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_6RexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_6hexEeOaDesjAlqXXw" name="ControlFlow15" source="_a29ABhexEeOaDesjAlqXXw" target="_a28__xexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_6hexEeOaDesjAlqXXw" name="ControlFlow15" target="_a28__xexEeOaDesjAlqXXw" source="_a29ABhexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_6xexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_7BexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_7RexEeOaDesjAlqXXw" name="ControlFlow16" source="_a29AAxexEeOaDesjAlqXXw" target="_a28__RexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_7RexEeOaDesjAlqXXw" name="ControlFlow16" target="_a28__RexEeOaDesjAlqXXw" source="_a29AAxexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_7hexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_7xexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_8BexEeOaDesjAlqXXw" name="ControlFlow17" source="_a29AAhexEeOaDesjAlqXXw" target="_a29ACBexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_8BexEeOaDesjAlqXXw" name="ControlFlow17" target="_a29ACBexEeOaDesjAlqXXw" source="_a29AAhexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_8RexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_8hexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_8xexEeOaDesjAlqXXw" name="ControlFlow18" source="_a29ACBexEeOaDesjAlqXXw" target="_a29AAxexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_8xexEeOaDesjAlqXXw" name="ControlFlow18" target="_a29AAxexEeOaDesjAlqXXw" source="_a29ACBexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_9BexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_9RexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_9hexEeOaDesjAlqXXw" name="ControlFlow19" source="_a29ACBexEeOaDesjAlqXXw" target="_a28__xexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_9hexEeOaDesjAlqXXw" name="ControlFlow19" target="_a28__xexEeOaDesjAlqXXw" source="_a29ACBexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_9xexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_-BexEeOaDesjAlqXXw"/> </edge> - <edge xmi:type="uml:ControlFlow" xmi:id="_a28_-RexEeOaDesjAlqXXw" name="ControlFlow20" source="_a29ABRexEeOaDesjAlqXXw" target="_a28__xexEeOaDesjAlqXXw"> + <edge xmi:type="uml:ControlFlow" xmi:id="_a28_-RexEeOaDesjAlqXXw" name="ControlFlow20" target="_a28__xexEeOaDesjAlqXXw" source="_a29ABRexEeOaDesjAlqXXw"> <guard xmi:type="uml:LiteralBoolean" xmi:id="_a28_-hexEeOaDesjAlqXXw" value="true"/> <weight xmi:type="uml:LiteralInteger" xmi:id="_a28_-xexEeOaDesjAlqXXw"/> </edge> <group xmi:type="uml:StructuredActivityNode" xmi:id="_a28_vBexEeOaDesjAlqXXw" name="Route"> - <node xmi:type="uml:OpaqueAction" xmi:id="_a28_vRexEeOaDesjAlqXXw" name="Assign" outgoing="_a28_2BexEeOaDesjAlqXXw" incoming="_a28_yRexEeOaDesjAlqXXw"/> - <node xmi:type="uml:OpaqueAction" xmi:id="_a28_vhexEeOaDesjAlqXXw" name="Return for Clarification" outgoing="_a28_0hexEeOaDesjAlqXXw" incoming="_a28_zBexEeOaDesjAlqXXw"/> - <node xmi:type="uml:OpaqueAction" xmi:id="_a28_vxexEeOaDesjAlqXXw" name="Reject" outgoing="_a28_1RexEeOaDesjAlqXXw" incoming="_a28_zxexEeOaDesjAlqXXw"/> + <node xmi:type="uml:OpaqueAction" xmi:id="_a28_vRexEeOaDesjAlqXXw" name="Assign" incoming="_a28_yRexEeOaDesjAlqXXw" outgoing="_a28_2BexEeOaDesjAlqXXw"/> + <node xmi:type="uml:OpaqueAction" xmi:id="_a28_vhexEeOaDesjAlqXXw" name="Return for Clarification" incoming="_a28_zBexEeOaDesjAlqXXw" outgoing="_a28_0hexEeOaDesjAlqXXw"/> + <node xmi:type="uml:OpaqueAction" xmi:id="_a28_vxexEeOaDesjAlqXXw" name="Reject" incoming="_a28_zxexEeOaDesjAlqXXw" outgoing="_a28_1RexEeOaDesjAlqXXw"/> </group> <node xmi:type="uml:InitialNode" xmi:id="_a28__BexEeOaDesjAlqXXw" name="InitialNode1" outgoing="_a28_wBexEeOaDesjAlqXXw"/> <node xmi:type="uml:ActivityFinalNode" xmi:id="_a28__RexEeOaDesjAlqXXw" name="ActivityFinalNode1" incoming="_a28_7RexEeOaDesjAlqXXw"/> - <node xmi:type="uml:OpaqueAction" xmi:id="_a28__hexEeOaDesjAlqXXw" name="Raise" outgoing="_a28_wxexEeOaDesjAlqXXw" incoming="_a28_wBexEeOaDesjAlqXXw"/> - <node xmi:type="uml:OpaqueAction" xmi:id="_a28__xexEeOaDesjAlqXXw" name="Triage" outgoing="_a28_xhexEeOaDesjAlqXXw" incoming="_a28_wxexEeOaDesjAlqXXw _a28_6hexEeOaDesjAlqXXw _a28_9hexEeOaDesjAlqXXw _a28_-RexEeOaDesjAlqXXw"/> - <node xmi:type="uml:OpaqueAction" xmi:id="_a29AABexEeOaDesjAlqXXw" name="Resolve" outgoing="_a28_4RexEeOaDesjAlqXXw" incoming="_a28_3hexEeOaDesjAlqXXw"/> - <node xmi:type="uml:OpaqueAction" xmi:id="_a29AARexEeOaDesjAlqXXw" name="Verify" outgoing="_a28_5BexEeOaDesjAlqXXw" incoming="_a28_4RexEeOaDesjAlqXXw"/> - <node xmi:type="uml:OpaqueAction" xmi:id="_a29AAhexEeOaDesjAlqXXw" name="Review" outgoing="_a28_8BexEeOaDesjAlqXXw" incoming="_a28_0hexEeOaDesjAlqXXw _a28_1RexEeOaDesjAlqXXw"/> - <node xmi:type="uml:OpaqueAction" xmi:id="_a29AAxexEeOaDesjAlqXXw" name="Close" outgoing="_a28_7RexEeOaDesjAlqXXw" incoming="_a28_5xexEeOaDesjAlqXXw _a28_8xexEeOaDesjAlqXXw"/> - <node xmi:type="uml:DecisionNode" xmi:id="_a29ABBexEeOaDesjAlqXXw" name="DecisionNode1" outgoing="_a28_yRexEeOaDesjAlqXXw _a28_zBexEeOaDesjAlqXXw _a28_zxexEeOaDesjAlqXXw" incoming="_a28_xhexEeOaDesjAlqXXw"/> - <node xmi:type="uml:DecisionNode" xmi:id="_a29ABRexEeOaDesjAlqXXw" name="DecisionNode2" outgoing="_a28_3hexEeOaDesjAlqXXw _a28_-RexEeOaDesjAlqXXw" incoming="_a28_2xexEeOaDesjAlqXXw"/> - <node xmi:type="uml:DecisionNode" xmi:id="_a29ABhexEeOaDesjAlqXXw" name="DecisionNode3" outgoing="_a28_5xexEeOaDesjAlqXXw _a28_6hexEeOaDesjAlqXXw" incoming="_a28_5BexEeOaDesjAlqXXw"/> - <node xmi:type="uml:OpaqueAction" xmi:id="_a29ABxexEeOaDesjAlqXXw" name="Work On" outgoing="_a28_2xexEeOaDesjAlqXXw" incoming="_a28_2BexEeOaDesjAlqXXw"/> - <node xmi:type="uml:DecisionNode" xmi:id="_a29ACBexEeOaDesjAlqXXw" name="DecisionNode4" outgoing="_a28_8xexEeOaDesjAlqXXw _a28_9hexEeOaDesjAlqXXw" incoming="_a28_8BexEeOaDesjAlqXXw"/> + <node xmi:type="uml:OpaqueAction" xmi:id="_a28__hexEeOaDesjAlqXXw" name="Raise" incoming="_a28_wBexEeOaDesjAlqXXw" outgoing="_a28_wxexEeOaDesjAlqXXw"/> + <node xmi:type="uml:OpaqueAction" xmi:id="_a28__xexEeOaDesjAlqXXw" name="Triage" incoming="_a28_wxexEeOaDesjAlqXXw _a28_6hexEeOaDesjAlqXXw _a28_9hexEeOaDesjAlqXXw _a28_-RexEeOaDesjAlqXXw" outgoing="_a28_xhexEeOaDesjAlqXXw"/> + <node xmi:type="uml:OpaqueAction" xmi:id="_a29AABexEeOaDesjAlqXXw" name="Resolve" incoming="_a28_3hexEeOaDesjAlqXXw" outgoing="_a28_4RexEeOaDesjAlqXXw"/> + <node xmi:type="uml:OpaqueAction" xmi:id="_a29AARexEeOaDesjAlqXXw" name="Verify" incoming="_a28_4RexEeOaDesjAlqXXw" outgoing="_a28_5BexEeOaDesjAlqXXw"/> + <node xmi:type="uml:OpaqueAction" xmi:id="_a29AAhexEeOaDesjAlqXXw" name="Review" incoming="_a28_0hexEeOaDesjAlqXXw _a28_1RexEeOaDesjAlqXXw" outgoing="_a28_8BexEeOaDesjAlqXXw"/> + <node xmi:type="uml:OpaqueAction" xmi:id="_a29AAxexEeOaDesjAlqXXw" name="Close" incoming="_a28_5xexEeOaDesjAlqXXw _a28_8xexEeOaDesjAlqXXw" outgoing="_a28_7RexEeOaDesjAlqXXw"/> + <node xmi:type="uml:DecisionNode" xmi:id="_a29ABBexEeOaDesjAlqXXw" name="DecisionNode1" incoming="_a28_xhexEeOaDesjAlqXXw" outgoing="_a28_yRexEeOaDesjAlqXXw _a28_zBexEeOaDesjAlqXXw _a28_zxexEeOaDesjAlqXXw"/> + <node xmi:type="uml:DecisionNode" xmi:id="_a29ABRexEeOaDesjAlqXXw" name="DecisionNode2" incoming="_a28_2xexEeOaDesjAlqXXw" outgoing="_a28_3hexEeOaDesjAlqXXw _a28_-RexEeOaDesjAlqXXw"/> + <node xmi:type="uml:DecisionNode" xmi:id="_a29ABhexEeOaDesjAlqXXw" name="DecisionNode3" incoming="_a28_5BexEeOaDesjAlqXXw" outgoing="_a28_5xexEeOaDesjAlqXXw _a28_6hexEeOaDesjAlqXXw"/> + <node xmi:type="uml:OpaqueAction" xmi:id="_a29ABxexEeOaDesjAlqXXw" name="Work On" incoming="_a28_2BexEeOaDesjAlqXXw" outgoing="_a28_2xexEeOaDesjAlqXXw"/> + <node xmi:type="uml:DecisionNode" xmi:id="_a29ACBexEeOaDesjAlqXXw" name="DecisionNode4" incoming="_a28_8BexEeOaDesjAlqXXw" outgoing="_a28_8xexEeOaDesjAlqXXw _a28_9hexEeOaDesjAlqXXw"/> </ownedBehavior> - <ownedOperation xmi:id="_a29ACRexEeOaDesjAlqXXw" name="lookup"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_a29ACRexEeOaDesjAlqXXw" name="lookup"/> </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_a29AChexEeOaDesjAlqXXw" clientDependency="_a29ADRexEeOaDesjAlqXXw" name="User"> - <ownedAttribute xmi:id="_a29ACxexEeOaDesjAlqXXw" name="realName"> + <packagedElement xmi:type="uml:Class" xmi:id="_a29AChexEeOaDesjAlqXXw" name="User"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_a29ACxexEeOaDesjAlqXXw" name="realName"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> </ownedAttribute> - <ownedAttribute xmi:id="_a29ADBexEeOaDesjAlqXXw" name="email"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_a29ADBexEeOaDesjAlqXXw" name="email"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> </ownedAttribute> - <interfaceRealization xmi:id="_a29ADRexEeOaDesjAlqXXw" name="InterfaceRealization1" client="_a29AChexEeOaDesjAlqXXw" supplier="_a29AFhexEeOaDesjAlqXXw" contract="_a29AFhexEeOaDesjAlqXXw"/> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_a29ADRexEeOaDesjAlqXXw" name="InterfaceRealization1" client="_a29AChexEeOaDesjAlqXXw" supplier="_a29AFhexEeOaDesjAlqXXw" contract="_a29AFhexEeOaDesjAlqXXw"/> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_a29ADhexEeOaDesjAlqXXw" name="bug_reporter" memberEnd="_a29ADxexEeOaDesjAlqXXw _a28_tBexEeOaDesjAlqXXw"> - <ownedEnd xmi:id="_a29ADxexEeOaDesjAlqXXw" name="reported" type="_a28_shexEeOaDesjAlqXXw" association="_a29ADhexEeOaDesjAlqXXw"> + <ownedEnd xmi:type="uml:Property" xmi:id="_a29ADxexEeOaDesjAlqXXw" name="reported" type="_a28_shexEeOaDesjAlqXXw" association="_a29ADhexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a29AEBexEeOaDesjAlqXXw"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a29AERexEeOaDesjAlqXXw" value="*"/> </ownedEnd> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_a29AEhexEeOaDesjAlqXXw" name="bug_assignee" memberEnd="_a29AExexEeOaDesjAlqXXw _a28_txexEeOaDesjAlqXXw"> - <ownedEnd xmi:id="_a29AExexEeOaDesjAlqXXw" name="assigned" type="_a28_shexEeOaDesjAlqXXw" association="_a29AEhexEeOaDesjAlqXXw"> + <ownedEnd xmi:type="uml:Property" xmi:id="_a29AExexEeOaDesjAlqXXw" name="assigned" type="_a28_shexEeOaDesjAlqXXw" association="_a29AEhexEeOaDesjAlqXXw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a29AFBexEeOaDesjAlqXXw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a29AFRexEeOaDesjAlqXXw" value="1"/> </ownedEnd> </packagedElement> <packagedElement xmi:type="uml:Interface" xmi:id="_a29AFhexEeOaDesjAlqXXw" name="IPermissionOwner"/> <packagedElement xmi:type="uml:Interface" xmi:id="_a29AFxexEeOaDesjAlqXXw" name="IPermissionControlled"/> - <profileApplication xmi:id="_a29AGBexEeOaDesjAlqXXw"> - <eAnnotations xmi:id="_a29AGRexEeOaDesjAlqXXw" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_a29AGBexEeOaDesjAlqXXw"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a29AGRexEeOaDesjAlqXXw" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="j2ee.profile.uml#_a8wFshexEeOaDesjAlqXXw"/> </eAnnotations> - <appliedProfile href="j2ee.profile.uml#_a8wFsBexEeOaDesjAlqXXw"/> + <appliedProfile xmi:type="uml:Profile" href="j2ee.profile.uml#_a8wFsBexEeOaDesjAlqXXw"/> </profileApplication> </uml:Model> <j2ee:Bean xmi:id="_a29AGhexEeOaDesjAlqXXw" base_Classifier="_a28_shexEeOaDesjAlqXXw" kind="session" primaryFinder="_a29AGxexEeOaDesjAlqXXw"/> diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/Bug323802.uml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/Bug323802.uml index 61aca0ef7fc..cccdefe7e34 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/Bug323802.uml +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/Bug323802.uml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_-3u4cJW3EeOfoK3RwHm3pQ" name="bug323802"> - <packagedElement xmi:type="uml:Class" xmi:id="_C3c2UJW4EeOfoK3RwHm3pQ" clientDependency="_f_HJAJW4EeOfoK3RwHm3pQ" name="A"/> - <packagedElement xmi:type="uml:Class" xmi:id="_ExBnEJW4EeOfoK3RwHm3pQ" name="B"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_f_HJAJW4EeOfoK3RwHm3pQ" name="A-->B" client="_C3c2UJW4EeOfoK3RwHm3pQ" supplier="_ExBnEJW4EeOfoK3RwHm3pQ"/> + <packagedElement xmi:type="uml:Class" xmi:id="_C3c2UJW4EeOfoK3RwHm3pQ" name="A" useCase="_0S-V8KYuEeO-ZNuEJamMWA"/> + <packagedElement xmi:type="uml:UseCase" xmi:id="_0S-V8KYuEeO-ZNuEJamMWA" name="DoIt" subject="_C3c2UJW4EeOfoK3RwHm3pQ"/> </uml:Model> diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomainTest.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomainTest.java index 54d5d6b1dee..8cd46a7768c 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomainTest.java +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/src/org/eclipse/papyrus/infra/emf/readonly/PapyrusROTransactionalEditingDomainTest.java @@ -13,7 +13,6 @@ package org.eclipse.papyrus.infra.emf.readonly; import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -41,10 +40,11 @@ import org.eclipse.emf.workspace.IWorkspaceCommandStack; import org.eclipse.papyrus.infra.core.resource.IRollbackStatus; import org.eclipse.papyrus.infra.core.resource.RollbackStatus; import org.eclipse.uml2.common.util.UML2Util; -import org.eclipse.uml2.uml.Dependency; +import org.eclipse.uml2.uml.Classifier; import org.eclipse.uml2.uml.Model; import org.eclipse.uml2.uml.Type; import org.eclipse.uml2.uml.UMLPackage; +import org.eclipse.uml2.uml.UseCase; import org.eclipse.uml2.uml.resource.UMLResource; import org.junit.After; import org.junit.Before; @@ -76,14 +76,14 @@ public class PapyrusROTransactionalEditingDomainTest { @Override protected void doExecute() { - Dependency ab = (Dependency)model.getPackagedElement("A-->B"); - assertThat(ab, notNullValue()); + UseCase doIt = (UseCase)model.getOwnedType("DoIt"); + assertThat(doIt, notNullValue()); // can load a read-only resource just fine Model primTypes = UML2Util.load(fixture.getResourceSet(), URI.createURI(UMLResource.UML_PRIMITIVE_TYPES_LIBRARY_URI), UMLPackage.Literals.MODEL); - Type string = primTypes.getOwnedType("String"); + Classifier string = (Classifier)primTypes.getOwnedType("String"); assertThat(string, notNullValue()); - ab.getClients().add(string); + doIt.getSubjects().add(string); } }; @@ -93,9 +93,9 @@ public class PapyrusROTransactionalEditingDomainTest { assertThat(fixture.getCommandStack().canUndo(), is(false)); // The change was rolled back - Dependency ab = (Dependency)model.getPackagedElement("A-->B"); - assertThat(ab.getClients().size(), is(1)); - assertThat(ab.getClients().get(0), instanceOf(org.eclipse.uml2.uml.Class.class)); + UseCase doIt = (UseCase)model.getOwnedType("DoIt"); + assertThat(doIt.getSubjects().size(), is(1)); + assertThat(doIt.getSubjects().get(0).getName(), is("A")); } /** @@ -104,20 +104,20 @@ public class PapyrusROTransactionalEditingDomainTest { */ @Test public void testReferenceToReadOnlyObjectWithOppositeRolledBackOperation() { - final Type string[] = { null }; + final Classifier string[] = { null }; AbstractEMFOperation op = new AbstractEMFOperation(fixture, "Test") { @Override protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - Dependency ab = (Dependency)model.getPackagedElement("A-->B"); - assertThat(ab, notNullValue()); + UseCase doIt = (UseCase)model.getOwnedType("DoIt"); + assertThat(doIt, notNullValue()); // can load a read-only resource just fine Model primTypes = UML2Util.load(fixture.getResourceSet(), URI.createURI(UMLResource.UML_PRIMITIVE_TYPES_LIBRARY_URI), UMLPackage.Literals.MODEL); - string[0] = primTypes.getOwnedType("String"); + string[0] = (Classifier)primTypes.getOwnedType("String"); assertThat(string, notNullValue()); - ab.getClients().add(string[0]); + doIt.getSubjects().add(string[0]); return Status.OK_STATUS; } @@ -150,9 +150,9 @@ public class PapyrusROTransactionalEditingDomainTest { assertThat(history.canUndo(ctx), is(false)); // The change was rolled back - Dependency ab = (Dependency)model.getPackagedElement("A-->B"); - assertThat(ab.getClients().size(), is(1)); - assertThat(ab.getClients().get(0), instanceOf(org.eclipse.uml2.uml.Class.class)); + UseCase doIt = (UseCase)model.getOwnedType("DoIt"); + assertThat(doIt.getSubjects().size(), is(1)); + assertThat(doIt.getSubjects().get(0).getName(), is("A")); assertThat(status[0], notNullValue()); assertThat(status[0].getCode(), is(IRollbackStatus.READ_ONLY_OBJECT)); diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/resources/writable.uml b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/resources/writable.uml index e7f94ac844b..3d7fc9e5296 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/resources/writable.uml +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/resources/writable.uml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_h2dxAJo-EeOW4qDSrI_zog" name="writable"> - <packagedElement xmi:type="uml:Class" xmi:id="_lqVrQJo-EeOW4qDSrI_zog" clientDependency="_KFjrIJo_EeOW4qDSrI_zog" name="A"/> - <packagedElement xmi:type="uml:Class" xmi:id="_IX7rsJo_EeOW4qDSrI_zog" name="D"/> - <packagedElement xmi:type="uml:Dependency" xmi:id="_KFjrIJo_EeOW4qDSrI_zog" name="A-->D" client="_lqVrQJo-EeOW4qDSrI_zog" supplier="_IX7rsJo_EeOW4qDSrI_zog"/> + <packagedElement xmi:type="uml:Class" xmi:id="_lqVrQJo-EeOW4qDSrI_zog" clientDependency="_wxpSUKYwEeO-ZNuEJamMWA" name="A" useCase="_1HV8sKYvEeO-ZNuEJamMWA"/> + <packagedElement xmi:type="uml:Class" xmi:id="_uqtbAKYwEeO-ZNuEJamMWA" name="D"/> + <packagedElement xmi:type="uml:Dependency" xmi:id="_wxpSUKYwEeO-ZNuEJamMWA" name="A-->D" client="_lqVrQJo-EeOW4qDSrI_zog" supplier="_uqtbAKYwEeO-ZNuEJamMWA"/> + <packagedElement xmi:type="uml:UseCase" xmi:id="_1HV8sKYvEeO-ZNuEJamMWA" name="DoIt" subject="_lqVrQJo-EeOW4qDSrI_zog"/> </uml:Model> diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/advice/ReadOnlyObjectEditAdviceTest.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/advice/ReadOnlyObjectEditAdviceTest.java index f5e1a0e25aa..2d5d4270a7e 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/advice/ReadOnlyObjectEditAdviceTest.java +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/advice/ReadOnlyObjectEditAdviceTest.java @@ -75,6 +75,7 @@ import org.eclipse.uml2.uml.Package; import org.eclipse.uml2.uml.Type; import org.eclipse.uml2.uml.UMLPackage; import org.eclipse.uml2.uml.Usage; +import org.eclipse.uml2.uml.UseCase; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -141,8 +142,8 @@ public class ReadOnlyObjectEditAdviceTest { */ @Test public void testSetCommand_referenceOppositeAdd() { - Dependency dep = classA.getClientDependency("A-->D"); //$NON-NLS-1$ - ICommand command = getEditCommand(dep, new SetRequest(dep, UMLPackage.Literals.DEPENDENCY__CLIENT, classB)); //$NON-NLS-1$ + UseCase doIt = classA.getUseCase("DoIt"); //$NON-NLS-1$ + ICommand command = getEditCommand(doIt, new SetRequest(doIt, UMLPackage.Literals.USE_CASE__SUBJECT, classB)); //$NON-NLS-1$ assertExecutability(command); } @@ -151,20 +152,19 @@ public class ReadOnlyObjectEditAdviceTest { */ @Test public void testSetCommand_referenceOppositeRemove() { - final Dependency dep = classA.getClientDependency("A-->D"); //$NON-NLS-1$ + final UseCase doIt = classA.getUseCase("DoIt"); //$NON-NLS-1$ // By-pass edit-helpers to set up the dependency executeUnprotected(new RecordingCommand(domain) { @Override protected void doExecute() { - dep.getClients().clear(); - dep.getClients().add(classB); // the read-only object + doIt.getSubjects().clear(); + doIt.getSubjects().add(classB); // the read-only object } }); - Type classD = writablePackage.getOwnedType("D"); //$NON-NLS-1$ - ICommand command = getEditCommand(dep, new SetRequest(dep, UMLPackage.Literals.DEPENDENCY__CLIENT, ImmutableList.of(classD))); //$NON-NLS-1$ + ICommand command = getEditCommand(doIt, new SetRequest(doIt, UMLPackage.Literals.USE_CASE__SUBJECT, ImmutableList.of(classA))); //$NON-NLS-1$ assertExecutability(command); } @@ -233,18 +233,18 @@ public class ReadOnlyObjectEditAdviceTest { @Test public void testDestroyReferenceCommand_referencedOpposite() { - final Dependency dep = classA.getClientDependency("A-->D"); //$NON-NLS-1$ + final UseCase doIt = classA.getUseCase("DoIt"); //$NON-NLS-1$ // By-pass edit-helpers to set up the relationship executeUnprotected(new RecordingCommand(domain) { @Override protected void doExecute() { - dep.getClients().add(classB); + doIt.getSubjects().add(classB); } }); - ICommand command = getEditCommand(writablePackage, new DestroyReferenceRequest(dep, UMLPackage.Literals.DEPENDENCY__CLIENT, classB, false)); //$NON-NLS-1$ + ICommand command = getEditCommand(doIt, new DestroyReferenceRequest(doIt, UMLPackage.Literals.USE_CASE__SUBJECT, classB, false)); //$NON-NLS-1$ assertExecutability(command); } |