Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2014-02-12 16:12:22 +0000
committerChristian W. Damus2014-02-12 16:12:22 +0000
commitfe2b2e269d08f68bd59418fb516f5a6c817a8da3 (patch)
tree272c18e511dcdc0c87fb0a5ccda115fd92592da7 /extraplugins
parent9cd54a4bc2fe9603dcb4ed23ed9dbb9f6f34036b (diff)
parent74df1a9a52ad683d15a09cd9db1931c95f11b80a (diff)
downloadorg.eclipse.papyrus-fe2b2e269d08f68bd59418fb516f5a6c817a8da3.tar.gz
org.eclipse.papyrus-fe2b2e269d08f68bd59418fb516f5a6c817a8da3.tar.xz
org.eclipse.papyrus-fe2b2e269d08f68bd59418fb516f5a6c817a8da3.zip
Merge branch 'refs/heads/master' into bugs/402525-widgets
Diffstat (limited to 'extraplugins')
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConnectorUtils.java194
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java6
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java35
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java8
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties3
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java6
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java6
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java12
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java1
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java7
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorCallMultiplicity.java9
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InitialEntryPoints.java3
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedPorts.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.gitignore1
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.gitignore1
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.settings/org.eclipse.jdt.core.prefs7
34 files changed, 131 insertions, 293 deletions
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.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/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
index 0cdb04e52f1..fee539f50f8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
@@ -18,7 +18,7 @@
<acceleoCompiler
sourceFolder="${target.folder}"
outputFolder="${target.folder}"
- dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;"
+ dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;"
binaryResource="false"
packagesToRegister="">
</acceleoCompiler>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConnectorUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConnectorUtils.java
deleted file mode 100644
index 10c88411a9f..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConnectorUtils.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ansgar Radermacher ansgar.radermacher@cea.fr
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.qompass.designer.core;
-
-import org.eclipse.core.runtime.Status;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.ConnectableElement;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-
-public class ConnectorUtils {
-
- /**
- * Returns true, is a port of a composite has an internal delegation to
- * another port
- *
- * @param composite
- * @param port
- * @return
- */
- public static boolean isDelegation(Class composite, Port port) {
- return (getDelegation(composite, port) != null);
- }
-
- /**
- * Return the connector end of a delegation originating from a given port
- * or null, if not such delegation exists
- *
- * @param composite
- * the composite component
- * @param port
- * a port (may be inherited) of that implementation
- * @return a connector end to which the port delegates or null
- */
- public static ConnectorEnd getDelegation(Class composite, Port port) {
- for(Connector connector : composite.getOwnedConnectors()) {
- if(connectsPort(connector, port)) {
- ConnectorEnd otherEnd = connEndNotPart(connector, null);
- if(otherEnd != null) {
- return otherEnd;
- }
- }
- }
- return null;
- }
-
- /**
- * check if a connector connects the port that is passed
- * as parameter
- * TODO: why is that name based???
- */
- public static boolean connectsPort(Connector connection, Port port) {
- // check roles of end points
- // String qPortName = port.getQualifiedName();
- for(ConnectorEnd end : connection.getEnds()) {
- if(end.getRole() == port) {
- return true;
- }
- if(end.getRole() != null) {
- if(end.getRole() == port) {
- Log.log(Status.ERROR, Log.TRAFO_CONNECTOR,
- "ConnectorUtls.connectsPort: qualified names match, but not the ID - should not happen"); //$NON-NLS-1$
- return true;
- }
- } else {
- Log.log(Status.ERROR, Log.TRAFO_CONNECTOR,
- "ConnectorUtils.connectsPort: the role of one of the endpoints of connection " + connection.getName() + //$NON-NLS-1$
- " is null - should not happen"); //$NON-NLS-1$
- }
- }
- return false;
- }
-
- /**
- * Simple helper function: return a connector end that is referencing
- * the passed parameter "part" either directly (role) or via a port
- *
- * @param part
- * a property within a composite
- * @param connection
- * @return the first connector end that is referencing a certain part
- * passed as parameter
- */
- public static ConnectorEnd connEndForPart(Connector connection, Property part) {
- // look for the end with same part (connectedPart == part)
- for(ConnectorEnd end : connection.getEnds()) {
- ConnectableElement role = end.getRole();
- Property connectedPart = null;
- if(role instanceof Port) {
- connectedPart = end.getPartWithPort();
- } else if(role instanceof Property) {
- // role is not a Port but also not null => connected directly to a part
- connectedPart = (Property)role;
- }
-
- if(connectedPart == part) {
- return end;
- }
- }
- return null;
- }
-
- /**
- * Simple helper function: return a connector end that is *not* referencing
- * with the passed parameter "part" either directly or via a port
- * (useful, to get the "other" end of a connector).
- *
- * @param part
- * a property within a composite
- * @param connection
- * @return the first connector end that is not referencing to the
- * part passed as parameter.
- */
- public static ConnectorEnd connEndNotPart(Connector connection, Property part) {
- // look for the other end (connectedPart != part)
- for(ConnectorEnd end : connection.getEnds()) {
- ConnectableElement role = end.getRole();
- Property connectedPart = null;
-
- if(role instanceof Port) {
- connectedPart = end.getPartWithPort();
- } else if(role instanceof Property) {
- // role is not a Port but also not null => connected directly to a part
- connectedPart = (Property)role;
- }
-
- if(connectedPart != part) {
- return end;
- }
-
- }
- return null;
- }
-
- /**
- * check if a connector connects the part that is passed
- * as parameter
- */
- public static boolean connectsPart(Connector connection, Property part) {
- return (connEndForPart(connection, part) != null);
- }
-
- /**
- * Return true, if passed connector is an assembly connector
- *
- * @param connection
- * @return true, if assembly connection
- */
- public static boolean isAssembly(Connector connection) {
- // no "null" part found => all ends are parts
- return (connEndForPart(connection, null) == null);
- }
-
- /**
- * @param composite A composite class
- * @param partA A part within the composite
- * @param partB Another part within the composite
- * @return a connector, if it connects the parts A and B could within the passed composite, or null if no
- * such connector exists
- */
- public static Connector getConnector(Class composite, Property partA, Property partB) {
- for (Connector connector : composite.getOwnedConnectors()) {
- if (ConnectorUtils.connectsPart(connector, partA) && ConnectorUtils.connectsPart(connector, partB)) {
- return connector;
- }
- }
- return null;
- }
-
- /**
- * @param composite A composite class
- * @param partA A part within the composite
- * @param partB Another part within the composite
- * @return true, if a connector between the parts A and B could be
- * found within the passed composite
- */
- public static boolean existsConnector(Class composite, Property partA, Property partB) {
- return getConnector(composite, partA, partB) != null;
- }
-}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java
index 181da5511ce..0c0ffb0092f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java
@@ -7,11 +7,15 @@ public class Messages extends NLS {
public static String BootLoaderGen_AtLeastOneBlockingCall;
+ public static String BootLoaderGen_CannotApplyCppInclude;
+
public static String BootLoaderGen_CannotRetrieveTemplate;
public static String CommandSupport_NoEditingDomain;
public static String CommandSupport_ErrorDuringCmdExec;
public static String ConfigUtils_RuleWithoutBaseClass;
+ public static String DepCreation_SingletonExistsAlready;
+
public static String DepCreation_CannotFindImplementation;
public static String DepCreation_CircularReference;
@@ -74,6 +78,8 @@ public class Messages extends NLS {
public static String ContainerTrafo_CannotApplyRule;
public static String ContainerTrafo_CannotFindDelegationConn;
public static String ContainerTrafo_InterceptionRuleButNoInterceptor;
+
+ public static String ContainerTrafo_RecursiveLWnotSupported;
public static String InstanceConfigurator_InvalidPluginExtension;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java
index 43c7a9900fa..e179fb22924 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java
@@ -19,20 +19,16 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Iterator;
-import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.UniqueEList;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.papyrus.FCM.Assembly;
import org.eclipse.papyrus.FCM.ContainerRule;
import org.eclipse.papyrus.FCM.RuleApplication;
import org.eclipse.papyrus.FCM.Singleton;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
import org.eclipse.papyrus.qompass.designer.core.preferences.QompassPreferenceConstants;
import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
import org.eclipse.uml2.uml.AggregationKind;
@@ -46,7 +42,6 @@ import org.eclipse.uml2.uml.Namespace;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Profile;
import org.eclipse.uml2.uml.Property;
import org.eclipse.uml2.uml.Type;
import org.eclipse.uml2.uml.util.UMLUtil;
@@ -364,36 +359,6 @@ public class Utils {
}
/**
- * Return the top element of the model that is currently edited. This function is based on the
- * assumption that the user model is the first resource that is loaded into the model set.
- * Use this function instead of Utils.getTop (or getModel) if you want to avoid navigating to the
- * root of an imported model.
- *
- * @return the top level package of the model currently loaded into an editor.
- */
- public static Package getUserModel(ExecutionEvent event) {
- ServiceUtilsForHandlers serviceUtils = ServiceUtilsForHandlers.getInstance();
- try {
- // IPath fn = serviceUtils.getModelSet().getFilenameWithoutExtension();
- EList<Resource> resources = serviceUtils.getModelSet(event).getResources();
- if(resources.size() >= 3) {
- // check first three resources (di, notation, uml)
- for(int i = 0; i < 3; i++) {
- Resource userResource = resources.get(i);
- if(userResource.getContents().size() > 0) {
- EObject topEObj = userResource.getContents().get(0);
- if((topEObj instanceof Package) && (!(topEObj instanceof Profile))) {
- return (Package)topEObj;
- }
- }
- }
- }
- } catch (ServiceException e) {
- }
- return null;
- }
-
- /**
* @param a
* potential implementation
* @return true, if passed classifier is an implementation (i.e. declared
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java
index fc920081c0f..770c7246a06 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java
@@ -22,9 +22,9 @@ import org.eclipse.emf.common.util.UniqueEList;
import org.eclipse.papyrus.FCM.Fragment;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedulableResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
import org.eclipse.papyrus.qompass.designer.core.Log;
import org.eclipse.papyrus.qompass.designer.core.Utils;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
import org.eclipse.uml2.uml.Abstraction;
import org.eclipse.uml2.uml.Class;
@@ -242,12 +242,12 @@ public class AllocUtils {
for(Connector connection : compositeCL.getOwnedConnectors()) {
// is one connector end targeted at the containedProperty ?
- ConnectorEnd end = ConnectorUtils.connEndForPart(connection, containedProperty);
+ ConnectorEnd end = ConnectorUtil.connEndForPart(connection, containedProperty);
if(end == null)
continue;
// does the connector at the same connect the composite's port?
- if(ConnectorUtils.connectsPort(connection, port)) {
+ if(ConnectorUtil.connectsPort(connection, port)) {
Port containedPort = (Port)end.getRole();
nodeList.addAll(getAllNodesForPort(DepUtils.getInstance(slot), containedPort));
}
@@ -315,11 +315,11 @@ public class AllocUtils {
*/
}
for(Connector connection : compositeCL.getOwnedConnectors()) {
- if(ConnectorUtils.connectsPort(connection, port)) {
+ if(ConnectorUtil.connectsPort(connection, port)) {
Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "connector: " + connection.getName()); //$NON-NLS-1$
Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "end1: " + connection.getEnds().get(0).getPartWithPort()); //$NON-NLS-1$
Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "end2: " + connection.getEnds().get(1).getPartWithPort()); //$NON-NLS-1$
- ConnectorEnd end = ConnectorUtils.connEndForPart(connection, containedProperty);
+ ConnectorEnd end = ConnectorUtil.connEndForPart(connection, containedProperty);
// other connector end targeted at containedProperty?
if(end != null) {
Port containedPort = (Port)end.getRole();
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
index dd8ad1f56a6..70f319beed4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.papyrus.C_Cpp.Include;
import org.eclipse.papyrus.FCM.InitPrecedence;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedulableResource;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.StUtils;
import org.eclipse.papyrus.qompass.designer.core.Utils;
@@ -34,6 +33,7 @@ import org.eclipse.papyrus.qompass.designer.core.transformations.CompImplTrafos;
import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
import org.eclipse.papyrus.qompass.designer.core.transformations.PrefixConstants;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Connector;
@@ -123,7 +123,7 @@ public class BootLoaderGen {
*/
Include cppInclude = StereotypeUtil.applyApp(m_bootLoader, Include.class);
if (cppInclude == null) {
- throw new TransformationException("Cannot apply cppInclude stereotype. Make sure that C/C++ profile is applied to your model");
+ throw new TransformationException(Messages.BootLoaderGen_CannotApplyCppInclude);
}
String existingBody = cppInclude.getBody();
String bodyStr =
@@ -278,7 +278,7 @@ public class BootLoaderGen {
// check, if implementation contains a composite if (implementation.getOwnedOperation ("createConnections", null, null) != null) {
boolean bCreateConn = false;
for(Connector connector : implementation.getOwnedConnectors()) {
- if(ConnectorUtils.isAssembly(connector)) {
+ if(ConnectorUtil.isAssembly(connector)) {
bCreateConn = true;
break;
}
@@ -355,7 +355,7 @@ public class BootLoaderGen {
Class composite = part.getClass_();
for(Connector connector : composite.getOwnedConnectors()) {
// must assure same connector end connects part & port
- ConnectorEnd end = ConnectorUtils.connEndForPart(connector, part);
+ ConnectorEnd end = ConnectorUtil.connEndForPart(connector, part);
if((end != null) && (end.getRole() == port)) {
return true;
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java
index b8fa61274d1..ea21697bf52 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java
@@ -219,7 +219,7 @@ public class DepCreation {
// unlikely case that a packaged element with the name
// <singletonISname> exists already, but is not an instance specification
throw new TransformationException(String.format(
- "singleton instantiation: element with name %s exists already in deployment plan, but is not an instance specification", name));
+ Messages.DepCreation_SingletonExistsAlready, name));
}
}
else {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
index cd509bd37f4..a49c7627a27 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
@@ -16,9 +16,9 @@ package org.eclipse.papyrus.qompass.designer.core.deployment;
import java.util.Stack;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.Connector;
@@ -72,9 +72,7 @@ public class PartialCopy implements InstanceDeployer {
for (Slot slot : is.getSlots()) {
copyPart(smCl, slot);
}
- // since we copied some of its attributes, the copy class created a shallow copy of the class itself
- Class tmCl = (Class) copy.get(smCl);
-
+ // since we copied some of its attributes, the copy class created a shallow copy of the class itself
InstanceSpecification tmIS = (InstanceSpecification) copy.get(is);
return tmIS;
}
@@ -106,8 +104,8 @@ public class PartialCopy implements InstanceDeployer {
for(Connector smConnector : smCl.getOwnedConnectors()) {
// check whether the newly added property enables the addition of connectors
// that connect this port.
- if(ConnectorUtils.connectsPart(smConnector, smPart)) {
- ConnectorEnd otherEnd = ConnectorUtils.connEndNotPart(smConnector, smPart);
+ if(ConnectorUtil.connectsPart(smConnector, smPart)) {
+ ConnectorEnd otherEnd = ConnectorUtil.connEndNotPart(smConnector, smPart);
// check whether the part references by the other end (i.e. that not connected with the part)
// TODO: take connections without port into account
Property otherPart = otherEnd.getPartWithPort();
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties
index 465c8398807..a45464184ef 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties
@@ -1,8 +1,10 @@
BootLoaderGen_AtLeastOneBlockingCall=There must be at most one blocking "run" operation per node. Not adding "run" call for component instance %s. Existing invocations: %s
+BootLoaderGen_CannotApplyCppInclude=Cannot apply cppInclude stereotype. Make sure that C/C++ profile is applied to your model
BootLoaderGen_CannotRetrieveTemplate=Cannot retrieve bootLoader template (should be in %s)
CommandSupport_NoEditingDomain=Can not get editing domain
CommandSupport_ErrorDuringCmdExec=Error during command execution
ConfigUtils_RuleWithoutBaseClass=A container rule has no base class (broken model library?)
+DepCreation_SingletonExistsAlready=singleton instantiation: element with name %s exists already in deployment plan, but is not an instance specification
DepCreation_CannotFindImplementation=cannot find suitable implementation for instance <%s> (given type <%s>)
DepCreation_CircularReference=Class %s is referenced in a circle\! Thus, an infinite number of instance specifications would be required.\nrecursion path:
DepCreation_DefiningFeatureNull=The defining feature of a slot of instance %s is null
@@ -54,6 +56,7 @@ CompTypeTrafos_CannotFindType=Can not find type <%s>. Thus, unable to create sui
ContainerTrafo_CannotApplyRule=Cannot apply container rule <%s>, since the type of one of its parts is undefined. Check for unresolved proxies in imports
ContainerTrafo_CannotFindDelegationConn=(during interceptor transformation for container): cannot find existing delegation connector
ContainerTrafo_InterceptionRuleButNoInterceptor=The part %s in rule %s has an interceptionRule, but is not typed with an interaction component
+ContainerTrafo_RecursiveLWnotSupported=Recursive lightweight container rules currently not supported
InstanceConfigurator_InvalidPluginExtension=InstanceConfigurator: plugin extension for id %s is invalid
InstantiateDepPlan_AcceleoErrors=Acceleo errors occured
InstantiateDepPlan_AcceleoErrorsCheckLog=Acceleo errors occured during code generation. Please check the error log
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java
index 7ca8f25f993..12e185c3dee 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.papyrus.FCM.DerivedElement;
import org.eclipse.papyrus.qompass.designer.core.CommandSupport;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
import org.eclipse.papyrus.qompass.designer.core.Log;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.OperationUtils;
@@ -31,6 +30,7 @@ import org.eclipse.papyrus.qompass.designer.core.PortUtils;
import org.eclipse.papyrus.qompass.designer.core.Utils;
import org.eclipse.papyrus.qompass.designer.core.transformations.PrefixConstants;
import org.eclipse.papyrus.qompass.designer.core.transformations.UpdateUtils;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Class;
@@ -249,7 +249,7 @@ public class CompImplSync {
if (implementation.getOwnedOperation(opName, null, null) != null) {
continue;
}
- ConnectorEnd connEnd = ConnectorUtils.getDelegation(implementation, portInfo.getPort());
+ ConnectorEnd connEnd = ConnectorUtil.getDelegation(implementation, portInfo.getPort());
// check that there is no delegation to a part which in turn has to implement the operations.
if((providedIntf != null) && (connEnd == null)) {
if(providedIntfs.contains(providedIntf)) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java
index 888cb0d89da..9e1fceb0f57 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java
@@ -19,13 +19,13 @@ import java.util.Iterator;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
import org.eclipse.papyrus.qompass.designer.core.CreationUtils;
import org.eclipse.papyrus.qompass.designer.core.Log;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.PortUtils;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.ConnectableElement;
@@ -129,9 +129,9 @@ public class ConnectorBinding {
Messages.ConnectorBinding_InfoMatchOtherEnd, port.getName()));
for(Connector connector : partConnector.getClass_().getOwnedConnectors()) {
- if(ConnectorUtils.connectsPart(connector, partConnector)) {
+ if(ConnectorUtil.connectsPart(connector, partConnector)) {
// the connector end targets a port of a part or the composite (in case of delegation)
- ConnectorEnd connEnd = ConnectorUtils.connEndNotPart(connector, partConnector);
+ ConnectorEnd connEnd = ConnectorUtil.connEndNotPart(connector, partConnector);
ConnectableElement connElem = connEnd.getRole();
if(connElem instanceof Port) {
Port otherPort = (Port)connElem;
@@ -229,9 +229,9 @@ public class ConnectorBinding {
Property partConnector = (Property)partOrConnector;
// iterate over the connectors of the composite containing the part
for(Connector connector : partConnector.getClass_().getOwnedConnectors()) {
- if(ConnectorUtils.connectsPart(connector, partConnector)) {
+ if(ConnectorUtil.connectsPart(connector, partConnector)) {
// the connector end targets a port of a part or the composite (in case of delegation)
- ConnectorEnd connEnd = ConnectorUtils.connEndNotPart(connector, partConnector);
+ ConnectorEnd connEnd = ConnectorUtil.connEndNotPart(connector, partConnector);
actual = matchViaEnd(connEnd, port, partOrConnector, actual);
if(actual != null) {
found = true;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
index 6061217194d..ef8ea120182 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
@@ -19,7 +19,6 @@ import java.util.Iterator;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
import org.eclipse.papyrus.qompass.designer.core.CreationUtils;
import org.eclipse.papyrus.qompass.designer.core.Log;
import org.eclipse.papyrus.qompass.designer.core.Messages;
@@ -27,6 +26,7 @@ import org.eclipse.papyrus.qompass.designer.core.PortUtils;
import org.eclipse.papyrus.qompass.designer.core.Utils;
import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.ConnectableElement;
import org.eclipse.uml2.uml.Connector;
@@ -346,9 +346,9 @@ public class TemplateUtils {
if (partType instanceof EncapsulatedClassifier) {
EncapsulatedClassifier partTypeEC = (EncapsulatedClassifier) partType;
for(Connector connector : composite.getOwnedConnectors()) {
- if(ConnectorUtils.connectsPart(connector, part)) {
+ if(ConnectorUtil.connectsPart(connector, part)) {
// the connector end targets a port of a part or the composite (in case of delegation)
- ConnectorEnd connEnd = ConnectorUtils.connEndForPart(connector, part);
+ ConnectorEnd connEnd = ConnectorUtil.connEndForPart(connector, part);
// redirect role, if pointing to port
if(connEnd.getRole() instanceof Port) {
Port connectedTemplatePort = (Port)connEnd.getRole();
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java
index e68cb8e2e54..95f6cfbf170 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java
@@ -3,9 +3,9 @@ package org.eclipse.papyrus.qompass.designer.core.transformations;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
import org.eclipse.papyrus.qompass.designer.core.Utils;
import org.eclipse.papyrus.qompass.designer.core.deployment.AllocUtils;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Connector;
import org.eclipse.uml2.uml.ConnectorEnd;
@@ -46,7 +46,7 @@ public class AllocTransfo {
// TODO: currently, no support for setting up the priority of the main thread.
// we need to get a cleaner solution for the main thread.
// destroy eventual connector and associated thread => thread as component with unconnected start thread
- Connector conn = ConnectorUtils.getConnector(composite, attribute, thread);
+ Connector conn = ConnectorUtil.getConnector(composite, attribute, thread);
// Connector targetConn = copy.getCopy(conn);
// Property targetThread = copy.getCopy(thread);
if (conn != null) {
@@ -62,7 +62,7 @@ public class AllocTransfo {
thread.destroy();
}
// check, if there is already a connector between the attribute and the thread
- else if (!ConnectorUtils.existsConnector(composite, attribute, thread)) {
+ else if (!ConnectorUtil.existsConnector(composite, attribute, thread)) {
// no connector => create;
Class component = (Class) type;
Connector c = composite.createOwnedConnector("alloc to " + thread.getName()); //$NON-NLS-1$
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java
index f789e2c22f2..da51cfadac2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java
@@ -22,11 +22,11 @@ import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.papyrus.C_Cpp.Ptr;
import org.eclipse.papyrus.FCM.PortKind;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.PortInfo;
import org.eclipse.papyrus.qompass.designer.core.PortUtils;
import org.eclipse.papyrus.qompass.designer.core.Utils;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
import org.eclipse.uml2.uml.AggregationKind;
import org.eclipse.uml2.uml.Association;
@@ -124,7 +124,7 @@ public class CompImplTrafos {
UMLPackage.eINSTANCE.getOpaqueBehavior());
op.getMethods().add(behavior);
- ConnectorEnd ce = ConnectorUtils.getDelegation(implementation, portInfo.getModelPort());
+ ConnectorEnd ce = ConnectorUtil.getDelegation(implementation, portInfo.getModelPort());
// if there is an delegation to an inner property, delegate to it
// Make distinction between delegation to component (with a port) or
// "normal" class (without).
@@ -159,7 +159,7 @@ public class CompImplTrafos {
Interface providedIntfInCopy = (Interface) copy.get(providedIntf);
implementsIntf = implementation.getInterfaceRealization(null, providedIntfInCopy) != null;
}
- if (implementsIntf || true) {
+ if (implementsIntf) {
body = "return this;"; //$NON-NLS-1$
}
else {
@@ -243,7 +243,7 @@ public class CompImplTrafos {
UMLPackage.eINSTANCE.getOpaqueBehavior());
op.getMethods().add(behavior);
- ConnectorEnd ce = ConnectorUtils.getDelegation(implementation, portInfo.getModelPort());
+ ConnectorEnd ce = ConnectorUtil.getDelegation(implementation, portInfo.getModelPort());
// if there is an delegation to an inner property, delegate to it
// Make distinction between delegation to component (with a port) or
// "normal" class (without).
@@ -325,7 +325,7 @@ public class CompImplTrafos {
Map<ConnectorEnd, Integer> indexMap = new HashMap<ConnectorEnd, Integer>();
for(Connector connector : implementation.getOwnedConnectors()) {
- if(ConnectorUtils.isAssembly(connector)) {
+ if(ConnectorUtil.isAssembly(connector)) {
// Boolean associationBased = false;
if (connector.getEnds().size() != 2) {
throw new TransformationException("Connector <" + connector.getName() + "> does not have two ends. This is currently not supported"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java
index 357fd6a34ef..3b46d557aa9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.papyrus.FCM.InteractionComponent;
import org.eclipse.papyrus.infra.core.Activator;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
import org.eclipse.papyrus.qompass.designer.core.Log;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.PortUtils;
@@ -36,6 +35,7 @@ import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
import org.eclipse.papyrus.qompass.designer.core.templates.ConnectorBinding;
import org.eclipse.papyrus.qompass.designer.core.templates.TemplateInstantiation;
import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.ConnectableElement;
import org.eclipse.uml2.uml.Connector;
@@ -342,7 +342,7 @@ public class ConnectorReification {
// reified connector
EList<Connector> connSubset = new BasicEList<Connector>();
for(Connector connector : composite.getOwnedConnectors()) {
- if(ConnectorUtils.connectsPart(connector, reifiedConnector)) {
+ if(ConnectorUtil.connectsPart(connector, reifiedConnector)) {
connSubset.add(connector);
}
}
@@ -354,7 +354,7 @@ public class ConnectorReification {
// check whether a port of the reified connector is not yet
// connected.
for(Connector connector : connSubset) {
- if(ConnectorUtils.connectsPort(connector, port)) {
+ if(ConnectorUtil.connectsPort(connector, port)) {
connected = true;
}
}
@@ -365,7 +365,7 @@ public class ConnectorReification {
// the port is connected, i.e. we do not want to connect the port to
// potentially set of ports (todo: restriction always useful?)
for(Connector connector : connSubset) {
- ConnectorEnd connEnd = ConnectorUtils.connEndNotPart(
+ ConnectorEnd connEnd = ConnectorUtil.connEndNotPart(
connector, reifiedConnector);
Property otherPart = connEnd.getPartWithPort();
// this is a part which is connected with the reified
@@ -434,12 +434,12 @@ public class ConnectorReification {
// loop over connectors of composite that originate from passed part.
for(Connector connector : composite.getOwnedConnectors()) {
- ConnectorEnd myEnd = ConnectorUtils.connEndForPart(connector, part);
+ ConnectorEnd myEnd = ConnectorUtil.connEndForPart(connector, part);
if(myEnd == null) {
// the connector does not connect this part
continue;
}
- ConnectorEnd otherEnd = ConnectorUtils.connEndNotPart(connector,
+ ConnectorEnd otherEnd = ConnectorUtil.connEndNotPart(connector,
part);
Property otherPart = otherEnd.getPartWithPort();
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java
index 41364c8b593..20927702bed 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java
@@ -30,7 +30,6 @@ import org.eclipse.papyrus.FCM.InterceptionRule;
import org.eclipse.papyrus.FCM.Singleton;
import org.eclipse.papyrus.FCM.util.FCMUtil;
import org.eclipse.papyrus.FCM.util.MapUtil;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.PortUtils;
import org.eclipse.papyrus.qompass.designer.core.StUtils;
@@ -40,6 +39,7 @@ import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation;
import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
import org.eclipse.papyrus.qompass.designer.core.templates.TemplateInstantiation;
import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
import org.eclipse.uml2.uml.Association;
import org.eclipse.uml2.uml.Class;
@@ -352,7 +352,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
for(Connector connector : smContainerRule.getBase_Class().getOwnedConnectors()) {
Property ruleInterceptorPart = null;
for(Property part : interceptorPartsMap.keySet()) {
- if(ConnectorUtils.connectsPart(connector, part)) {
+ if(ConnectorUtil.connectsPart(connector, part)) {
// this connector is a connection between an interceptor (and another part which may not
// be an interceptor => TODO: validation rule yet to write
// we need to copy this connector multiple times, once for each associated interceptor part
@@ -438,7 +438,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
// at least one active rule => create container (or get previously instantiated))
if(containerTrafo == null) {
if(rule.getKind() == ContainerRuleKind.LIGHT_WEIGHT_OO_RULE) {
- throw new TransformationException("Recursive lightweight container rules currently not supported");
+ throw new TransformationException(Messages.ContainerTrafo_RecursiveLWnotSupported);
}
else {
containerTrafo = new ContainerTrafo(copy, tmCDP, null);
@@ -526,7 +526,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
Connector interceptionConnector = null;
// get delegation connector
for(Connector connector : tmContainerImpl.getOwnedConnectors()) {
- if(ConnectorUtils.connectsPort(connector, port)) {
+ if(ConnectorUtil.connectsPort(connector, port)) {
interceptionConnector = connector;
break;
}
@@ -628,7 +628,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
// found an association between two parts of the
// container => create connection,
// unless already existing.
- if(!ConnectorUtils.existsConnector(tmContainerImpl, part, checkPart)) {
+ if(!ConnectorUtil.existsConnector(tmContainerImpl, part, checkPart)) {
Connector conn = tmContainerImpl.createOwnedConnector(part.getName() + "_" + checkPart.getName()); //$NON-NLS-1$
conn.setType(association);
conn.createEnd().setRole(part);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java
index 20d0a82461a..92404288324 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java
@@ -20,9 +20,9 @@ import java.util.Map;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.papyrus.FCM.InteractionComponent;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils;
import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.Connector;
@@ -140,10 +140,10 @@ public class FlattenInteractionComponents {
boolean foundConnector = false;
// now redirect connectors: find whether a port delegates to the fragment
for(Connector connector : composite.getOwnedConnectors()) {
- if(ConnectorUtils.connectsPart(connector, fragmentPart)) {
+ if(ConnectorUtil.connectsPart(connector, fragmentPart)) {
foundConnector = true;
// internal connector for the part, check whether delegation
- ConnectorEnd ce = ConnectorUtils.connEndNotPart(connector, fragmentPart);
+ ConnectorEnd ce = ConnectorUtil.connEndNotPart(connector, fragmentPart);
if((ce != null) && (ce.getPartWithPort() == null)) {
// delegation connector, need to re-targed connections to external port
Port port = (Port)ce.getRole();
@@ -203,8 +203,8 @@ public class FlattenInteractionComponents {
*/
public void retargetConnections(Class containingComposite, Port port, Property part, Property subPart) {
for(Connector connector : containingComposite.getOwnedConnectors()) {
- if(ConnectorUtils.connectsPart(connector, part) && ConnectorUtils.connectsPort(connector, port)) {
- ConnectorEnd ce = ConnectorUtils.connEndForPart(connector, part);
+ if(ConnectorUtil.connectsPart(connector, part) && ConnectorUtil.connectsPort(connector, port)) {
+ ConnectorEnd ce = ConnectorUtil.connEndForPart(connector, part);
if(ce != null) {
// TODO: only with with connections targeting a port of a part, not with
// those targeting directly a part
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
index 0936fdeea4c..79dee8f8763 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
@@ -280,7 +280,6 @@ public class MainModelTrafo {
// executor itself does not make much sense, additional operation "createHwContainer"
// obtain property related to node instance
- Slot smNodeSlot = DepUtils.getParentSlot(smNode);
Package smCDP = smIS.getNearestPackage();
DeploymentPlan smFCM_CDP = UMLUtil.getStereotypeApplication(smCDP, DeploymentPlan.class);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.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/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.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/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java
index cb7d43f6274..7784d2c2404 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java
@@ -38,6 +38,7 @@ import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils;
import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
import org.eclipse.papyrus.qompass.designer.core.sync.DepPlanSync;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
+import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.FocusListener;
@@ -117,7 +118,7 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
m_component = component;
m_instance = null;
m_feature = null;
- m_model = Utils.getUserModel(from);
+ m_model = PackageUtil.getUserModel(from);
if(m_model == null) {
return false;
}
@@ -130,14 +131,14 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
m_component = DepUtils.getImplementation(instance);
m_instance = instance;
m_feature = null;
- m_model = Utils.getUserModel(from);
+ m_model = PackageUtil.getUserModel(from);
return checkAndGetInstances();
}
public boolean init(Feature feature, ExecutionEvent from) {
// visitedPackages = new BasicEList<Package> ();
m_feature = feature;
- m_model = Utils.getUserModel(from);
+ m_model = PackageUtil.getUserModel(from);
m_instance = null;
if(feature instanceof Connector) {
org.eclipse.papyrus.FCM.Connector fcmConn = UMLUtil.getStereotypeApplication(feature,
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorCallMultiplicity.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorCallMultiplicity.java
index d298aa04306..e948653f47c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorCallMultiplicity.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/ConnectorCallMultiplicity.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.validation.AbstractModelConstraint;
import org.eclipse.emf.validation.IValidationContext;
import org.eclipse.papyrus.FCM.DerivedElement;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Connector;
@@ -53,7 +53,7 @@ public class ConnectorCallMultiplicity extends AbstractModelConstraint
if (port.getRequireds ().size () > 0) {
int connections = 0;
for (Connector connector : owner.getOwnedConnectors ()) {
- if (ConnectorUtils.connectsPort (connector, port)) {
+ if (ConnectorUtil.connectsPort (connector, port)) {
connections ++;
break;
}
@@ -69,8 +69,9 @@ public class ConnectorCallMultiplicity extends AbstractModelConstraint
}
}
if (portsStr.length () > 0) {
- return ctx.createFailureStatus ("The port(s) '" + portsStr + "' with a required interface of part '" + part.getName () +
- "' have more connections than their multiplicty within composite '" + owner.getQualifiedName () + "'");
+ return ctx.createFailureStatus (String.format(
+ "The port(s) %s with a required interface of part %s have more connections than their multiplicty within composite %s",
+ portsStr, part.getName(), owner.getQualifiedName()));
}
else {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InitialEntryPoints.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InitialEntryPoints.java
index 2088531daf6..a11913f1d2c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InitialEntryPoints.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/InitialEntryPoints.java
@@ -55,7 +55,8 @@ public class InitialEntryPoints extends AbstractModelConstraint {
}
msg += entryPoint;
}
- return ctx.createFailureStatus("The deployment plan '" + pkg.getName() + "' contains more than one start entry point: " + msg); //$NON-NLS-1$
+ return ctx.createFailureStatus(String.format(
+ "The deployment plan '%s' contains more than one start entry point: %s", pkg.getName(), msg)); //$NON-NLS-1$
}
}
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedPorts.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedPorts.java
index f577c77c2f2..55e115c45d8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedPorts.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/src/org/eclipse/papyrus/qompass/designer/validation/constraints/UnconnectedPorts.java
@@ -31,7 +31,7 @@ package org.eclipse.papyrus.qompass.designer.validation.constraints;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.validation.AbstractModelConstraint;
import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
+import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Connector;
import org.eclipse.uml2.uml.Port;
@@ -69,7 +69,7 @@ abstract public class UnconnectedPorts extends AbstractModelConstraint
((fcmPort.getProvidedInterface() != null) && !required)) {{
boolean found = false;
for (Connector connector : owner.getOwnedConnectors ()) {
- if (ConnectorUtils.connectsPort (connector, port)) {
+ if (ConnectorUtil.connectsPort (connector, port)) {
found = true;
break;
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.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/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.gitignore b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.gitignore
new file mode 100644
index 00000000000..5500bf75774
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.gitignore
@@ -0,0 +1 @@
+tmpModel
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.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/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo
index c54d6aa1121..832ffe921d7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo
@@ -18,7 +18,7 @@
<acceleoCompiler
sourceFolder="${target.folder}"
outputFolder="${target.folder}"
- dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;"
+ dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;"
binaryResource="false"
packagesToRegister="">
</acceleoCompiler>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.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/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.gitignore b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.gitignore
new file mode 100644
index 00000000000..5500bf75774
--- /dev/null
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.gitignore
@@ -0,0 +1 @@
+tmpModel
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.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/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
index cfae891d995..3fe5cf5246d 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
@@ -18,7 +18,7 @@
<acceleoCompiler
sourceFolder="${target.folder}"
outputFolder="${target.folder}"
- dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.qompass.modellibs.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.infra.services.tracepoints;${target.folder}/../../org.eclipse.papyrus.qompass.designer.ui;"
+ dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.qompass.modellibs.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.services.tracepoints;${target.folder}/../../org.eclipse.papyrus.qompass.designer.ui;"
binaryResource="false"
packagesToRegister="">
</acceleoCompiler>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.settings/org.eclipse.jdt.core.prefs b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.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

Back to the top