Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOnder Gurcan2015-03-30 08:25:27 -0400
committerAnsgar Radermacher2015-03-30 09:59:59 -0400
commit61022e9c1086401e4244c996845fbe2ae82efb32 (patch)
treea9baf01ba3878557d50512b904eb109add23e72e
parent427a5d8ca43b66287bebcf3f6052dd9f6ab68b7b (diff)
downloadorg.eclipse.papyrus-61022e9c1086401e4244c996845fbe2ae82efb32.tar.gz
org.eclipse.papyrus-61022e9c1086401e4244c996845fbe2ae82efb32.tar.xz
org.eclipse.papyrus-61022e9c1086401e4244c996845fbe2ae82efb32.zip
Bug 462380 - [UML RT] [Model Explorer] Adding "UMLRealTime::Protocol" as
a new child to the model explorer of Papyrus-RT. * <Adding the new "Protocol" item to the model explorer> objective is accomplished. Feedback from Ericsson is taken into account. Change-Id: I96fff7d9fbde558a0b53750bed649da90538a4d7 Signed-off-by: Onder Gurcan <onder.gurcan@cea.fr> Reviewed-on: https://git.eclipse.org/r/44836 Tested-by: Hudson CI Reviewed-by: Ansgar Radermacher <ansgar.radermacher@cea.fr> Tested-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF3
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Capsule.java4
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/CapsulePart.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/PortRegistrationType.java4
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Protocol.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/ProtocolContainer.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTConnector.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageKind.java4
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageSet.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTPort.java10
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTRedefinedElement.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimeFactory.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimePackage.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsuleImpl.java12
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsulePartImpl.java12
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolContainerImpl.java12
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolImpl.java12
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTConnectorImpl.java12
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTMessageSetImpl.java19
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTPortImpl.java31
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTRedefinedElementImpl.java22
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimeFactoryImpl.java12
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimePackageImpl.java18
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeAdapterFactory.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeSwitch.java34
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTPseudostate.java4
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTRegion.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTState.java4
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTStateMachine.java8
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTTrigger.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachFactory.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachPackage.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTPseudostateImpl.java12
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTRegionImpl.java12
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateImpl.java12
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateMachineImpl.java19
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTTriggerImpl.java12
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachFactoryImpl.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachPackageImpl.java18
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachAdapterFactory.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachSwitch.java22
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java2
-rw-r--r--extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java128
43 files changed, 352 insertions, 152 deletions
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
index 861e059f504..66b67df3887 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",
org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0",
org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0",
org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0"
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0"
Export-Package: org.eclipse.papyrus.umlrt.UMLRealTime,
org.eclipse.papyrus.umlrt.UMLRealTime.impl,
org.eclipse.papyrus.umlrt.UMLRealTime.util,
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Capsule.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Capsule.java
index f05d7893e4a..d0f21ee4845 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Capsule.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Capsule.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EObject;
* base_Class.ownedAttribute->forAll(at | at.type->size() = 1)
* base_Class.feature->forAll (f | f.visibility <> UML::VisibilityKind::private)
* base_Class.nestedClassifier->isEmpty()
- * base_Class.ownedOperation->notEmpty() implies
+ * base_Class.ownedOperation->notEmpty() implies
* (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::guarded))
* <!-- end-model-doc -->
*
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/CapsulePart.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/CapsulePart.java
index 96bcad0a405..aba6d219e45 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/CapsulePart.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/CapsulePart.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/PortRegistrationType.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/PortRegistrationType.java
index 0153ca445be..edb4b7bdbc9 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/PortRegistrationType.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/PortRegistrationType.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -246,5 +246,5 @@ public enum PortRegistrationType implements Enumerator {
public String toString() {
return literal;
}
-
+
} //PortRegistrationType
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Protocol.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Protocol.java
index 5f41eaf88ea..654c08b1563 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Protocol.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/Protocol.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/ProtocolContainer.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/ProtocolContainer.java
index 46382e38190..ab553030a03 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/ProtocolContainer.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/ProtocolContainer.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTConnector.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTConnector.java
index 064f37c8721..42b0bf41ac6 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTConnector.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTConnector.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageKind.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageKind.java
index 0d5d8a35e1f..176d081dd35 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageKind.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageKind.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -246,5 +246,5 @@ public enum RTMessageKind implements Enumerator {
public String toString() {
return literal;
}
-
+
} //RTMessageKind
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageSet.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageSet.java
index 870786c96cc..69998b22f10 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageSet.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTMessageSet.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTPort.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTPort.java
index 4f060829355..466e2a6a221 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTPort.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTPort.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -19,11 +19,11 @@ import org.eclipse.uml2.uml.Port;
*
* <!-- begin-model-doc -->
* isWired implies not isPublish
- * (base_Port.visibility = UML::VisibilityKind::public)
- * implies base_Port.isService
- * (not isWired and not isPublish)
+ * (base_Port.visibility = UML::VisibilityKind::public)
+ * implies base_Port.isService
+ * (not isWired and not isPublish)
* implies (base_Port.visibility = UML::VisibilityKind::protected)
- * (not isWired and isPublish) implies
+ * (not isWired and isPublish) implies
* (base_Port.visibility = UML::VisibilityKind::public)
* <!-- end-model-doc -->
*
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTRedefinedElement.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTRedefinedElement.java
index 096da4a04ce..3feea1d6132 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTRedefinedElement.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/RTRedefinedElement.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimeFactory.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimeFactory.java
index 33b0818daae..d4661ea9bf2 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimeFactory.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimeFactory.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimePackage.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimePackage.java
index 70adcb2da2e..aa47657cce2 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimePackage.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/UMLRealTimePackage.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsuleImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsuleImpl.java
index 9ca6c460977..10adb8dec5e 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsuleImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsuleImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -73,8 +73,9 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
InternalEObject oldBase_Class = (InternalEObject)base_Class;
base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
if (base_Class != oldBase_Class) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.CAPSULE__BASE_CLASS, oldBase_Class, base_Class));
+ }
}
}
return base_Class;
@@ -98,8 +99,9 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
base_Class = newBase_Class;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.CAPSULE__BASE_CLASS, oldBase_Class, base_Class));
+ }
}
/**
@@ -111,7 +113,9 @@ public class CapsuleImpl extends MinimalEObjectImpl.Container implements Capsule
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimePackage.CAPSULE__BASE_CLASS:
- if (resolve) return getBase_Class();
+ if (resolve) {
+ return getBase_Class();
+ }
return basicGetBase_Class();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsulePartImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsulePartImpl.java
index 731200a5145..74bd354067c 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsulePartImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/CapsulePartImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -75,8 +75,9 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
InternalEObject oldBase_Property = (InternalEObject)base_Property;
base_Property = (Property)eResolveProxy(oldBase_Property);
if (base_Property != oldBase_Property) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.CAPSULE_PART__BASE_PROPERTY, oldBase_Property, base_Property));
+ }
}
}
return base_Property;
@@ -100,8 +101,9 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
public void setBase_Property(Property newBase_Property) {
Property oldBase_Property = base_Property;
base_Property = newBase_Property;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.CAPSULE_PART__BASE_PROPERTY, oldBase_Property, base_Property));
+ }
}
/**
@@ -113,7 +115,9 @@ public class CapsulePartImpl extends MinimalEObjectImpl.Container implements Cap
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimePackage.CAPSULE_PART__BASE_PROPERTY:
- if (resolve) return getBase_Property();
+ if (resolve) {
+ return getBase_Property();
+ }
return basicGetBase_Property();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolContainerImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolContainerImpl.java
index 57da4f7679c..2002cf9c4f7 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolContainerImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolContainerImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -73,8 +73,9 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
InternalEObject oldBase_Package = (InternalEObject)base_Package;
base_Package = (org.eclipse.uml2.uml.Package)eResolveProxy(oldBase_Package);
if (base_Package != oldBase_Package) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.PROTOCOL_CONTAINER__BASE_PACKAGE, oldBase_Package, base_Package));
+ }
}
}
return base_Package;
@@ -98,8 +99,9 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
public void setBase_Package(org.eclipse.uml2.uml.Package newBase_Package) {
org.eclipse.uml2.uml.Package oldBase_Package = base_Package;
base_Package = newBase_Package;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.PROTOCOL_CONTAINER__BASE_PACKAGE, oldBase_Package, base_Package));
+ }
}
/**
@@ -111,7 +113,9 @@ public class ProtocolContainerImpl extends MinimalEObjectImpl.Container implemen
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimePackage.PROTOCOL_CONTAINER__BASE_PACKAGE:
- if (resolve) return getBase_Package();
+ if (resolve) {
+ return getBase_Package();
+ }
return basicGetBase_Package();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolImpl.java
index 6641573301a..d04f7a6e09f 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/ProtocolImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -75,8 +75,9 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
InternalEObject oldBase_Collaboration = (InternalEObject)base_Collaboration;
base_Collaboration = (Collaboration)eResolveProxy(oldBase_Collaboration);
if (base_Collaboration != oldBase_Collaboration) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.PROTOCOL__BASE_COLLABORATION, oldBase_Collaboration, base_Collaboration));
+ }
}
}
return base_Collaboration;
@@ -100,8 +101,9 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
public void setBase_Collaboration(Collaboration newBase_Collaboration) {
Collaboration oldBase_Collaboration = base_Collaboration;
base_Collaboration = newBase_Collaboration;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.PROTOCOL__BASE_COLLABORATION, oldBase_Collaboration, base_Collaboration));
+ }
}
/**
@@ -113,7 +115,9 @@ public class ProtocolImpl extends MinimalEObjectImpl.Container implements Protoc
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimePackage.PROTOCOL__BASE_COLLABORATION:
- if (resolve) return getBase_Collaboration();
+ if (resolve) {
+ return getBase_Collaboration();
+ }
return basicGetBase_Collaboration();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTConnectorImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTConnectorImpl.java
index 471273dd380..777f924db6f 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTConnectorImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTConnectorImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -75,8 +75,9 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
InternalEObject oldBase_Connector = (InternalEObject)base_Connector;
base_Connector = (Connector)eResolveProxy(oldBase_Connector);
if (base_Connector != oldBase_Connector) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.RT_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));
+ }
}
}
return base_Connector;
@@ -100,8 +101,9 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
public void setBase_Connector(Connector newBase_Connector) {
Connector oldBase_Connector = base_Connector;
base_Connector = newBase_Connector;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_CONNECTOR__BASE_CONNECTOR, oldBase_Connector, base_Connector));
+ }
}
/**
@@ -113,7 +115,9 @@ public class RTConnectorImpl extends MinimalEObjectImpl.Container implements RTC
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimePackage.RT_CONNECTOR__BASE_CONNECTOR:
- if (resolve) return getBase_Connector();
+ if (resolve) {
+ return getBase_Connector();
+ }
return basicGetBase_Connector();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTMessageSetImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTMessageSetImpl.java
index d5b5a21173e..52af2d65ea2 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTMessageSetImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTMessageSetImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -97,8 +97,9 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
InternalEObject oldBase_Interface = (InternalEObject)base_Interface;
base_Interface = (Interface)eResolveProxy(oldBase_Interface);
if (base_Interface != oldBase_Interface) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.RT_MESSAGE_SET__BASE_INTERFACE, oldBase_Interface, base_Interface));
+ }
}
}
return base_Interface;
@@ -122,8 +123,9 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
public void setBase_Interface(Interface newBase_Interface) {
Interface oldBase_Interface = base_Interface;
base_Interface = newBase_Interface;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_MESSAGE_SET__BASE_INTERFACE, oldBase_Interface, base_Interface));
+ }
}
/**
@@ -145,8 +147,9 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
public void setRtMsgKind(RTMessageKind newRtMsgKind) {
RTMessageKind oldRtMsgKind = rtMsgKind;
rtMsgKind = newRtMsgKind == null ? RT_MSG_KIND_EDEFAULT : newRtMsgKind;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_MESSAGE_SET__RT_MSG_KIND, oldRtMsgKind, rtMsgKind));
+ }
}
/**
@@ -158,7 +161,9 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimePackage.RT_MESSAGE_SET__BASE_INTERFACE:
- if (resolve) return getBase_Interface();
+ if (resolve) {
+ return getBase_Interface();
+ }
return basicGetBase_Interface();
case UMLRealTimePackage.RT_MESSAGE_SET__RT_MSG_KIND:
return getRtMsgKind();
@@ -225,7 +230,9 @@ public class RTMessageSetImpl extends MinimalEObjectImpl.Container implements RT
*/
@Override
public String toString() {
- if (eIsProxy()) return super.toString();
+ if (eIsProxy()) {
+ return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (rtMsgKind: "); //$NON-NLS-1$
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTPortImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTPortImpl.java
index 8702b5c0119..18e6a133611 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTPortImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTPortImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -189,8 +189,9 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
public void setIsNotification(boolean newIsNotification) {
boolean oldIsNotification = isNotification;
isNotification = newIsNotification;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__IS_NOTIFICATION, oldIsNotification, isNotification));
+ }
}
/**
@@ -212,8 +213,9 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
public void setIsPublish(boolean newIsPublish) {
boolean oldIsPublish = isPublish;
isPublish = newIsPublish;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__IS_PUBLISH, oldIsPublish, isPublish));
+ }
}
/**
@@ -235,8 +237,9 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
public void setIsWired(boolean newIsWired) {
boolean oldIsWired = isWired;
isWired = newIsWired;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__IS_WIRED, oldIsWired, isWired));
+ }
}
/**
@@ -258,8 +261,9 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
public void setRegistration(PortRegistrationType newRegistration) {
PortRegistrationType oldRegistration = registration;
registration = newRegistration == null ? REGISTRATION_EDEFAULT : newRegistration;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__REGISTRATION, oldRegistration, registration));
+ }
}
/**
@@ -281,8 +285,9 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
public void setRegistrationOverride(String newRegistrationOverride) {
String oldRegistrationOverride = registrationOverride;
registrationOverride = newRegistrationOverride;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__REGISTRATION_OVERRIDE, oldRegistrationOverride, registrationOverride));
+ }
}
/**
@@ -296,8 +301,9 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
InternalEObject oldBase_Port = (InternalEObject)base_Port;
base_Port = (Port)eResolveProxy(oldBase_Port);
if (base_Port != oldBase_Port) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.RT_PORT__BASE_PORT, oldBase_Port, base_Port));
+ }
}
}
return base_Port;
@@ -321,8 +327,9 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
public void setBase_Port(Port newBase_Port) {
Port oldBase_Port = base_Port;
base_Port = newBase_Port;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_PORT__BASE_PORT, oldBase_Port, base_Port));
+ }
}
/**
@@ -344,7 +351,9 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
case UMLRealTimePackage.RT_PORT__REGISTRATION_OVERRIDE:
return getRegistrationOverride();
case UMLRealTimePackage.RT_PORT__BASE_PORT:
- if (resolve) return getBase_Port();
+ if (resolve) {
+ return getBase_Port();
+ }
return basicGetBase_Port();
}
return super.eGet(featureID, resolve, coreType);
@@ -441,7 +450,9 @@ public class RTPortImpl extends MinimalEObjectImpl.Container implements RTPort {
*/
@Override
public String toString() {
- if (eIsProxy()) return super.toString();
+ if (eIsProxy()) {
+ return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (isNotification: "); //$NON-NLS-1$
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTRedefinedElementImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTRedefinedElementImpl.java
index 0fbed8bd37b..24fbbb47459 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTRedefinedElementImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/RTRedefinedElementImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -86,8 +86,9 @@ public class RTRedefinedElementImpl extends MinimalEObjectImpl.Container impleme
InternalEObject oldBase_RedefinableElement = (InternalEObject)base_RedefinableElement;
base_RedefinableElement = (RedefinableElement)eResolveProxy(oldBase_RedefinableElement);
if (base_RedefinableElement != oldBase_RedefinableElement) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.RT_REDEFINED_ELEMENT__BASE_REDEFINABLE_ELEMENT, oldBase_RedefinableElement, base_RedefinableElement));
+ }
}
}
return base_RedefinableElement;
@@ -111,8 +112,9 @@ public class RTRedefinedElementImpl extends MinimalEObjectImpl.Container impleme
public void setBase_RedefinableElement(RedefinableElement newBase_RedefinableElement) {
RedefinableElement oldBase_RedefinableElement = base_RedefinableElement;
base_RedefinableElement = newBase_RedefinableElement;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_REDEFINED_ELEMENT__BASE_REDEFINABLE_ELEMENT, oldBase_RedefinableElement, base_RedefinableElement));
+ }
}
/**
@@ -126,8 +128,9 @@ public class RTRedefinedElementImpl extends MinimalEObjectImpl.Container impleme
InternalEObject oldRootFragment = (InternalEObject)rootFragment;
rootFragment = (RedefinableElement)eResolveProxy(oldRootFragment);
if (rootFragment != oldRootFragment) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.RT_REDEFINED_ELEMENT__ROOT_FRAGMENT, oldRootFragment, rootFragment));
+ }
}
}
return rootFragment;
@@ -151,8 +154,9 @@ public class RTRedefinedElementImpl extends MinimalEObjectImpl.Container impleme
public void setRootFragment(RedefinableElement newRootFragment) {
RedefinableElement oldRootFragment = rootFragment;
rootFragment = newRootFragment;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_REDEFINED_ELEMENT__ROOT_FRAGMENT, oldRootFragment, rootFragment));
+ }
}
/**
@@ -164,10 +168,14 @@ public class RTRedefinedElementImpl extends MinimalEObjectImpl.Container impleme
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimePackage.RT_REDEFINED_ELEMENT__BASE_REDEFINABLE_ELEMENT:
- if (resolve) return getBase_RedefinableElement();
+ if (resolve) {
+ return getBase_RedefinableElement();
+ }
return basicGetBase_RedefinableElement();
case UMLRealTimePackage.RT_REDEFINED_ELEMENT__ROOT_FRAGMENT:
- if (resolve) return getRootFragment();
+ if (resolve) {
+ return getRootFragment();
+ }
return basicGetRootFragment();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimeFactoryImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimeFactoryImpl.java
index 60235d44c97..4dfce7d3d29 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimeFactoryImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimeFactoryImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -205,7 +205,10 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
*/
public PortRegistrationType createPortRegistrationTypeFromString(EDataType eDataType, String initialValue) {
PortRegistrationType result = PortRegistrationType.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (result == null)
+ {
+ throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
return result;
}
@@ -225,7 +228,10 @@ public class UMLRealTimeFactoryImpl extends EFactoryImpl implements UMLRealTimeF
*/
public RTMessageKind createRTMessageKindFromString(EDataType eDataType, String initialValue) {
RTMessageKind result = RTMessageKind.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (result == null)
+ {
+ throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
return result;
}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimePackageImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimePackageImpl.java
index 9417bf9b466..f99091ea7ab 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimePackageImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/impl/UMLRealTimePackageImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -138,7 +138,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
+ *
* <p>This method is used to initialize {@link UMLRealTimePackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
@@ -149,7 +149,9 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
* @generated
*/
public static UMLRealTimePackage init() {
- if (isInited) return (UMLRealTimePackage)EPackage.Registry.INSTANCE.getEPackage(UMLRealTimePackage.eNS_URI);
+ if (isInited) {
+ return (UMLRealTimePackage)EPackage.Registry.INSTANCE.getEPackage(UMLRealTimePackage.eNS_URI);
+ }
// Obtain or create and register package
UMLRealTimePackageImpl theUMLRealTimePackage = (UMLRealTimePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UMLRealTimePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UMLRealTimePackageImpl());
@@ -168,7 +170,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
// Mark meta-data to indicate it can't be changed
theUMLRealTimePackage.freeze();
-
+
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(UMLRealTimePackage.eNS_URI, theUMLRealTimePackage);
return theUMLRealTimePackage;
@@ -449,7 +451,9 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
* @generated
*/
public void createPackageContents() {
- if (isCreated) return;
+ if (isCreated) {
+ return;
+ }
isCreated = true;
// Create classes and their features
@@ -504,7 +508,9 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) return;
+ if (isInitialized) {
+ return;
+ }
isInitialized = true;
// Initialize package
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeAdapterFactory.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeAdapterFactory.java
index 1b78e28e04a..c29125c7feb 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeAdapterFactory.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeAdapterFactory.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeSwitch.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeSwitch.java
index 26c9b7e12a0..e0ece92b60b 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeSwitch.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/UMLRealTime/util/UMLRealTimeSwitch.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -75,49 +75,65 @@ public class UMLRealTimeSwitch<T> extends Switch<T> {
case UMLRealTimePackage.CAPSULE: {
Capsule capsule = (Capsule)theEObject;
T result = caseCapsule(capsule);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
case UMLRealTimePackage.CAPSULE_PART: {
CapsulePart capsulePart = (CapsulePart)theEObject;
T result = caseCapsulePart(capsulePart);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
case UMLRealTimePackage.PROTOCOL: {
Protocol protocol = (Protocol)theEObject;
T result = caseProtocol(protocol);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
case UMLRealTimePackage.RT_PORT: {
RTPort rtPort = (RTPort)theEObject;
T result = caseRTPort(rtPort);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
case UMLRealTimePackage.RT_CONNECTOR: {
RTConnector rtConnector = (RTConnector)theEObject;
T result = caseRTConnector(rtConnector);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
case UMLRealTimePackage.PROTOCOL_CONTAINER: {
ProtocolContainer protocolContainer = (ProtocolContainer)theEObject;
T result = caseProtocolContainer(protocolContainer);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
case UMLRealTimePackage.RT_REDEFINED_ELEMENT: {
RTRedefinedElement rtRedefinedElement = (RTRedefinedElement)theEObject;
T result = caseRTRedefinedElement(rtRedefinedElement);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
case UMLRealTimePackage.RT_MESSAGE_SET: {
RTMessageSet rtMessageSet = (RTMessageSet)theEObject;
T result = caseRTMessageSet(rtMessageSet);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
default: return defaultCase(theEObject);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTPseudostate.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTPseudostate.java
index 954e7acbcbb..2c47d4b1c1f 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTPseudostate.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTPseudostate.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -18,7 +18,7 @@ import org.eclipse.uml2.uml.Pseudostate;
* <!-- end-user-doc -->
*
* <!-- begin-model-doc -->
- * let knd = base_Pseudostate.kind in
+ * let knd = base_Pseudostate.kind in
* (knd <> UML::PseudostateKind::shallowHistory) and
* (knd <> UML::PseudostateKind::fork) and
* (knd <> UML::PseudostateKind::join)
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTRegion.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTRegion.java
index a8a1f988ecb..8e9b0fa354c 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTRegion.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTRegion.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTState.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTState.java
index 4dbadb92835..4a55c13fe14 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTState.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTState.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -18,7 +18,7 @@ import org.eclipse.uml2.uml.State;
* <!-- end-user-doc -->
*
* <!-- begin-model-doc -->
- * base_State.isComposite implies
+ * base_State.isComposite implies
* (base_State.region->size() = 1)
* not base_State.isSubmachineState
* base_State.doActivity->size() = 0
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTStateMachine.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTStateMachine.java
index aa555399af4..fd3a9535c46 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTStateMachine.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTStateMachine.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -20,11 +20,11 @@ import org.eclipse.uml2.uml.StateMachine;
* <!-- begin-model-doc -->
* base_StateMachine.region->size() = 1
* not base_StateMachine.isReentrant
- * (base_StateMachine.ownedParameter->size()=0) and
+ * (base_StateMachine.ownedParameter->size()=0) and
* (base_StateMachine.ownedParameterSet->size() = 0)
- * (base_StateMachine.behavioredClassifier->size()=1)
+ * (base_StateMachine.behavioredClassifier->size()=1)
* and (base_StateMachine.behavioredClassifier.oclIsKindOf(Class))
- * isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive)
+ * isPassive = not (base_StateMachine.behavioredClassifier.oclAsType(Class).isActive)
* isPassive implies not (base_StateMachine.isReentrant)
* <!-- end-model-doc -->
*
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTTrigger.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTTrigger.java
index 95de922b0d8..7325c22fc01 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTTrigger.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/RTTrigger.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachFactory.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachFactory.java
index 87d5d82ac1e..4e4d792dd8c 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachFactory.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachFactory.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachPackage.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachPackage.java
index 121544edfc4..199b72ad10a 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachPackage.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/UMLRealTimeStateMachPackage.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTPseudostateImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTPseudostateImpl.java
index 1cfbe85cf58..335dc7e016f 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTPseudostateImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTPseudostateImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -75,8 +75,9 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
InternalEObject oldBase_Pseudostate = (InternalEObject)base_Pseudostate;
base_Pseudostate = (Pseudostate)eResolveProxy(oldBase_Pseudostate);
if (base_Pseudostate != oldBase_Pseudostate) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimeStateMachPackage.RT_PSEUDOSTATE__BASE_PSEUDOSTATE, oldBase_Pseudostate, base_Pseudostate));
+ }
}
}
return base_Pseudostate;
@@ -100,8 +101,9 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
public void setBase_Pseudostate(Pseudostate newBase_Pseudostate) {
Pseudostate oldBase_Pseudostate = base_Pseudostate;
base_Pseudostate = newBase_Pseudostate;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimeStateMachPackage.RT_PSEUDOSTATE__BASE_PSEUDOSTATE, oldBase_Pseudostate, base_Pseudostate));
+ }
}
/**
@@ -113,7 +115,9 @@ public class RTPseudostateImpl extends MinimalEObjectImpl.Container implements R
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimeStateMachPackage.RT_PSEUDOSTATE__BASE_PSEUDOSTATE:
- if (resolve) return getBase_Pseudostate();
+ if (resolve) {
+ return getBase_Pseudostate();
+ }
return basicGetBase_Pseudostate();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTRegionImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTRegionImpl.java
index 3392c4ff984..12210e1f388 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTRegionImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTRegionImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -75,8 +75,9 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
InternalEObject oldBase_Region = (InternalEObject)base_Region;
base_Region = (Region)eResolveProxy(oldBase_Region);
if (base_Region != oldBase_Region) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimeStateMachPackage.RT_REGION__BASE_REGION, oldBase_Region, base_Region));
+ }
}
}
return base_Region;
@@ -100,8 +101,9 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
public void setBase_Region(Region newBase_Region) {
Region oldBase_Region = base_Region;
base_Region = newBase_Region;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimeStateMachPackage.RT_REGION__BASE_REGION, oldBase_Region, base_Region));
+ }
}
/**
@@ -113,7 +115,9 @@ public class RTRegionImpl extends MinimalEObjectImpl.Container implements RTRegi
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimeStateMachPackage.RT_REGION__BASE_REGION:
- if (resolve) return getBase_Region();
+ if (resolve) {
+ return getBase_Region();
+ }
return basicGetBase_Region();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateImpl.java
index 8faef2f239c..f397c8e1523 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -75,8 +75,9 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
InternalEObject oldBase_State = (InternalEObject)base_State;
base_State = (State)eResolveProxy(oldBase_State);
if (base_State != oldBase_State) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimeStateMachPackage.RT_STATE__BASE_STATE, oldBase_State, base_State));
+ }
}
}
return base_State;
@@ -100,8 +101,9 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
public void setBase_State(State newBase_State) {
State oldBase_State = base_State;
base_State = newBase_State;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimeStateMachPackage.RT_STATE__BASE_STATE, oldBase_State, base_State));
+ }
}
/**
@@ -113,7 +115,9 @@ public class RTStateImpl extends MinimalEObjectImpl.Container implements RTState
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimeStateMachPackage.RT_STATE__BASE_STATE:
- if (resolve) return getBase_State();
+ if (resolve) {
+ return getBase_State();
+ }
return basicGetBase_State();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateMachineImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateMachineImpl.java
index a56edab0fc7..064b9f2bbb5 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateMachineImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTStateMachineImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -96,8 +96,9 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
InternalEObject oldBase_StateMachine = (InternalEObject)base_StateMachine;
base_StateMachine = (StateMachine)eResolveProxy(oldBase_StateMachine);
if (base_StateMachine != oldBase_StateMachine) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimeStateMachPackage.RT_STATE_MACHINE__BASE_STATE_MACHINE, oldBase_StateMachine, base_StateMachine));
+ }
}
}
return base_StateMachine;
@@ -121,8 +122,9 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
public void setBase_StateMachine(StateMachine newBase_StateMachine) {
StateMachine oldBase_StateMachine = base_StateMachine;
base_StateMachine = newBase_StateMachine;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimeStateMachPackage.RT_STATE_MACHINE__BASE_STATE_MACHINE, oldBase_StateMachine, base_StateMachine));
+ }
}
/**
@@ -144,8 +146,9 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
public void setIsPassive(boolean newIsPassive) {
boolean oldIsPassive = isPassive;
isPassive = newIsPassive;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimeStateMachPackage.RT_STATE_MACHINE__IS_PASSIVE, oldIsPassive, isPassive));
+ }
}
/**
@@ -157,7 +160,9 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimeStateMachPackage.RT_STATE_MACHINE__BASE_STATE_MACHINE:
- if (resolve) return getBase_StateMachine();
+ if (resolve) {
+ return getBase_StateMachine();
+ }
return basicGetBase_StateMachine();
case UMLRealTimeStateMachPackage.RT_STATE_MACHINE__IS_PASSIVE:
return isPassive();
@@ -224,7 +229,9 @@ public class RTStateMachineImpl extends MinimalEObjectImpl.Container implements
*/
@Override
public String toString() {
- if (eIsProxy()) return super.toString();
+ if (eIsProxy()) {
+ return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (isPassive: "); //$NON-NLS-1$
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTTriggerImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTTriggerImpl.java
index 1087ea1235a..240fb0497bb 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTTriggerImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/RTTriggerImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -75,8 +75,9 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
InternalEObject oldBase_Operation = (InternalEObject)base_Operation;
base_Operation = (Operation)eResolveProxy(oldBase_Operation);
if (base_Operation != oldBase_Operation) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimeStateMachPackage.RT_TRIGGER__BASE_OPERATION, oldBase_Operation, base_Operation));
+ }
}
}
return base_Operation;
@@ -100,8 +101,9 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
public void setBase_Operation(Operation newBase_Operation) {
Operation oldBase_Operation = base_Operation;
base_Operation = newBase_Operation;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimeStateMachPackage.RT_TRIGGER__BASE_OPERATION, oldBase_Operation, base_Operation));
+ }
}
/**
@@ -113,7 +115,9 @@ public class RTTriggerImpl extends MinimalEObjectImpl.Container implements RTTri
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimeStateMachPackage.RT_TRIGGER__BASE_OPERATION:
- if (resolve) return getBase_Operation();
+ if (resolve) {
+ return getBase_Operation();
+ }
return basicGetBase_Operation();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachFactoryImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachFactoryImpl.java
index 769de459b3a..a9267a11ea0 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachFactoryImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachFactoryImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachPackageImpl.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachPackageImpl.java
index fc128c3c2b8..f056a3cc9f0 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachPackageImpl.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/impl/UMLRealTimeStateMachPackageImpl.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -97,7 +97,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
+ *
* <p>This method is used to initialize {@link UMLRealTimeStateMachPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
@@ -108,7 +108,9 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
* @generated
*/
public static UMLRealTimeStateMachPackage init() {
- if (isInited) return (UMLRealTimeStateMachPackage)EPackage.Registry.INSTANCE.getEPackage(UMLRealTimeStateMachPackage.eNS_URI);
+ if (isInited) {
+ return (UMLRealTimeStateMachPackage)EPackage.Registry.INSTANCE.getEPackage(UMLRealTimeStateMachPackage.eNS_URI);
+ }
// Obtain or create and register package
UMLRealTimeStateMachPackageImpl theUMLRealTimeStateMachPackage = (UMLRealTimeStateMachPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UMLRealTimeStateMachPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UMLRealTimeStateMachPackageImpl());
@@ -127,7 +129,7 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
// Mark meta-data to indicate it can't be changed
theUMLRealTimeStateMachPackage.freeze();
-
+
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(UMLRealTimeStateMachPackage.eNS_URI, theUMLRealTimeStateMachPackage);
return theUMLRealTimeStateMachPackage;
@@ -268,7 +270,9 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
* @generated
*/
public void createPackageContents() {
- if (isCreated) return;
+ if (isCreated) {
+ return;
+ }
isCreated = true;
// Create classes and their features
@@ -304,7 +308,9 @@ public class UMLRealTimeStateMachPackageImpl extends EPackageImpl implements UML
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) return;
+ if (isInitialized) {
+ return;
+ }
isInitialized = true;
// Initialize package
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachAdapterFactory.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachAdapterFactory.java
index 085d0e55ab3..6fedb097550 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachAdapterFactory.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachAdapterFactory.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachSwitch.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachSwitch.java
index 23489527449..7190e26d356 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachSwitch.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src-gen/org/eclipse/papyrus/umlrt/statemachine/UMLRealTimeStateMach/util/UMLRealTimeStateMachSwitch.java
@@ -1,6 +1,6 @@
/**
* Copyright (c) 2014 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
@@ -75,31 +75,41 @@ public class UMLRealTimeStateMachSwitch<T> extends Switch<T> {
case UMLRealTimeStateMachPackage.RT_STATE_MACHINE: {
RTStateMachine rtStateMachine = (RTStateMachine)theEObject;
T result = caseRTStateMachine(rtStateMachine);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
case UMLRealTimeStateMachPackage.RT_REGION: {
RTRegion rtRegion = (RTRegion)theEObject;
T result = caseRTRegion(rtRegion);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
case UMLRealTimeStateMachPackage.RT_STATE: {
RTState rtState = (RTState)theEObject;
T result = caseRTState(rtState);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
case UMLRealTimeStateMachPackage.RT_PSEUDOSTATE: {
RTPseudostate rtPseudostate = (RTPseudostate)theEObject;
T result = caseRTPseudostate(rtPseudostate);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
case UMLRealTimeStateMachPackage.RT_TRIGGER: {
RTTrigger rtTrigger = (RTTrigger)theEObject;
T result = caseRTTrigger(rtTrigger);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
return result;
}
default: return defaultCase(theEObject);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java
index 7f33cc51132..93547e8ab52 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java
@@ -18,7 +18,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
public class UMLRTElementTypesEnumerator extends AbstractElementTypeEnumerator {
public static final IHintedType RT_MESSAGE_SET = (IHintedType) getElementType("org.eclipse.papyrus.umlrt.RTMessageSet"); //$NON-NLS-1$
-
+
public static final IHintedType PROTOCOL_CONTAINER = (IHintedType) getElementType("org.eclipse.papyrus.umlrt.ProtocolContainer"); //$NON-NLS-1$
}
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java
index 653d61c8430..3706fdd6d34 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java
@@ -13,6 +13,12 @@
package org.eclipse.papyrus.umlrt.custom.advice;
+import static org.eclipse.papyrus.uml.service.types.element.UMLElementTypes.ANY_RECEIVE_EVENT;
+import static org.eclipse.papyrus.uml.service.types.element.UMLElementTypes.INTERFACE_REALIZATION;
+import static org.eclipse.papyrus.uml.service.types.element.UMLElementTypes.USAGE;
+import static org.eclipse.papyrus.umlrt.custom.UMLRTElementTypesEnumerator.PROTOCOL_CONTAINER;
+import static org.eclipse.papyrus.umlrt.custom.UMLRTElementTypesEnumerator.RT_MESSAGE_SET;
+
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -26,22 +32,32 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.CreateElementCommand;
import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
+import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind;
+import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet;
import org.eclipse.uml2.uml.Collaboration;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.InterfaceRealization;
+import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.PackageableElement;
import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.Usage;
+import org.eclipse.uml2.uml.util.UMLUtil;
-import static org.eclipse.papyrus.umlrt.custom.UMLRTElementTypesEnumerator.RT_MESSAGE_SET;
-import static org.eclipse.papyrus.umlrt.custom.UMLRTElementTypesEnumerator.PROTOCOL_CONTAINER;;
/**
* The helperadvice class used for UMLRealTime::Protocol.
- *
+ *
* @author Onder Gurcan <onder.gurcan@cea.fr>
*
*/
public class ProtocolEditHelperAdvice extends AbstractEditHelperAdvice {
+ private enum Relation {
+ CHILD, SIBLING, PARENT;
+ }
+
/**
* @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest)
*
@@ -51,6 +67,7 @@ public class ProtocolEditHelperAdvice extends AbstractEditHelperAdvice {
@Override
protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
final Collaboration protocol = (Collaboration) request.getElementToConfigure();
+ final String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("EmptyProtocol", protocol.eContainer().eContents());
return new ConfigureElementCommand(request) {
private IProgressMonitor progressMonitor;
@@ -61,41 +78,110 @@ public class ProtocolEditHelperAdvice extends AbstractEditHelperAdvice {
this.progressMonitor = progressMonitor;
this.info = info;
- // RT InMessages
- createElement("rtInMessages", RT_MESSAGE_SET, true); //$NON-NLS-1$
- createElement("rtOutMessages", RT_MESSAGE_SET, true); //$NON-NLS-1$
- createElement("rtInOutMessages", RT_MESSAGE_SET, true); //$NON-NLS-1$
+ // Create the UMLRealTime::ProtocolContainer package
+ createElement(protocol, name, PROTOCOL_CONTAINER, Relation.PARENT);
- /* Create ProtocolContainer and add protocol as an owned attribute of it */
- createElement("protocolContainer", PROTOCOL_CONTAINER, false); //$NON-NLS-1$
+ // Create the incoming UMLRealTime::RTMessageSet interface
+ String nameIn = name;
+ Interface rtMessageSetInt = (Interface) createElement(protocol, nameIn, RT_MESSAGE_SET, Relation.SIBLING);
+ setRtMsgKind(rtMessageSetInt, RTMessageKind.IN);
+ createInterfaceRealization(protocol, nameIn, rtMessageSetInt);
+
+ // Create the outgoing UMLRealTime::RTMessageSet interface
+ String nameOut = name + "~";
+ Interface rtMessageSetOutInt = (Interface) createElement(protocol, nameOut, RT_MESSAGE_SET, Relation.SIBLING);
+ setRtMsgKind(rtMessageSetOutInt, RTMessageKind.OUT);
+ createUsage(protocol, nameOut, rtMessageSetOutInt);
+
+ createElement(protocol, "*", ANY_RECEIVE_EVENT, Relation.SIBLING); //$NON-NLS-1$
+
+ // Create the in-out UMLRealTime::RTMessageSet interface
+ String nameInOut = name + "IO";
+ Interface rtMessageSetInOutInt = (Interface) createElement(protocol, nameInOut, RT_MESSAGE_SET, Relation.SIBLING);
+ setRtMsgKind(rtMessageSetInOutInt, RTMessageKind.IN_OUT);
+ createInterfaceRealization(protocol, nameInOut, rtMessageSetInOutInt);
+ createUsage(protocol, nameInOut, rtMessageSetInOutInt);
return CommandResult.newOKCommandResult(protocol);
- }
+ }
- private EObject createElement(String name, IElementType elementType, boolean owned) throws ExecutionException {
- if ((protocol == null) || (name == null))
- throw new ExecutionException("Either the protocol or the name parameter is null. ");
+ /**
+ * Creates a UML::Usage relation between protocol and rtMessageSet with given name.
+ *
+ * @param protocol
+ * @param name
+ * @param rtMessageSet
+ * @throws ExecutionException
+ */
+ private void createUsage(final Collaboration protocol, final String name, Interface rtMessageSet) throws ExecutionException {
+ Usage usageOut = (Usage) createElement(protocol, name, USAGE, Relation.SIBLING);
+ usageOut.getClients().add(protocol);
+ usageOut.getSuppliers().add(rtMessageSet);
+ }
+
+ /**
+ * Creates an UML::InterfaceRealization relation between protocol and rtMessageSet with given name.
+ *
+ * @param protocol
+ * @param name
+ * @param rtMessageSet
+ * @throws ExecutionException
+ */
+ private void createInterfaceRealization(final Collaboration protocol, final String name, Interface rtMessageSetInt) throws ExecutionException {
+ InterfaceRealization realization = (InterfaceRealization) createElement(protocol, name, INTERFACE_REALIZATION, Relation.CHILD);
+ realization.getClients().add(protocol);
+ realization.getSuppliers().add(rtMessageSetInt);
+ }
+
+ /**
+ *
+ * @param referenceElement
+ * @param name
+ * @param elementType
+ * @param relation
+ * @return created element as EObject
+ * @throws ExecutionException
+ */
+ private EObject createElement(Collaboration referenceElement, String name, IElementType elementType, Relation relation) throws ExecutionException {
+ if ((referenceElement == null) || (name == null)) {
+ throw new ExecutionException("Either the referenceElement or the name parameter is null. ");
+ }
EObject newElement = null;
- CreateElementRequest createElementRequest = new CreateElementRequest(protocol.getNearestPackage(), elementType);
+ CreateElementRequest createElementRequest = new CreateElementRequest(referenceElement.getNearestPackage(), elementType);
CreateElementCommand command = new CreateElementCommand(createElementRequest);
command.execute(progressMonitor, info);
newElement = command.getNewElement();
-
- if (newElement == null)
+
+ if (newElement == null) {
throw new ExecutionException("Element creation problem for " + elementType.getDisplayName() + ".");
-
- if (owned) { // if newElement is an owned element of protocol
- protocol.createOwnedAttribute(name, (Type) newElement);
- } else { // otherwise newElement is a container element of protocol
+ }
+
+ ((NamedElement)newElement).setName(name);
+
+ if (relation == Relation.CHILD) { // if newElement is an owned element of protocol
+ if (elementType == INTERFACE_REALIZATION) {
+ referenceElement.getInterfaceRealizations().add((InterfaceRealization) newElement);
+ } else {
+ referenceElement.createOwnedAttribute(name, (Type) newElement);
+ }
+ } else if (relation == Relation.SIBLING) { // if newElement is a sibling of protocol
+ Package nearestPackage = referenceElement.getNearestPackage();
+ nearestPackage.getPackagedElements().add((PackageableElement) newElement);
+ } else if (relation == Relation.PARENT) { // otherwise newElement is a container element of protocol
Package container = (Package) newElement;
EList<PackageableElement> packagedElements = container.getPackagedElements();
- packagedElements.add(protocol);
+ packagedElements.add(referenceElement);
}
return newElement;
}
+
+ private void setRtMsgKind(Interface rtMessageSetInt, RTMessageKind kind){
+ RTMessageSet rtMessageSet = UMLUtil.getStereotypeApplication(rtMessageSetInt, RTMessageSet.class);
+ rtMessageSet.setRtMsgKind(kind);
+ }
};
}
}

Back to the top