aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe DUL2018-05-02 05:12:15 -0400
committerPhilippe DUL2018-11-05 11:19:55 -0500
commitea3c6d55eca8f94091fc275d0cb6f89053899d95 (patch)
tree7fb4ba43d576e7ff6096a00971cd40ccaefb5b3d
parent421b6ece84413e4c74cef50f0ed2c7df67ddf064 (diff)
downloadcapella-sss-transition-ea3c6d55eca8f94091fc275d0cb6f89053899d95.zip
capella-sss-transition-ea3c6d55eca8f94091fc275d0cb6f89053899d95.tar.gz
capella-sss-transition-ea3c6d55eca8f94091fc275d0cb6f89053899d95.tar.bz2
[2058] SubSystem transition doesn't complete
Bug: 2058 Change-Id: I1dc6801543e6eea37762fa2c7b6dd8f6876b4c84 Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/launcher/HeadlessCrossPhasesLauncher.java12
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.interphases/src/org/polarsys/capella/transition/system2subsystem/interphases/launcher/HeadlessInterPhasesLauncher.java12
2 files changed, 4 insertions, 20 deletions
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/launcher/HeadlessCrossPhasesLauncher.java b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/launcher/HeadlessCrossPhasesLauncher.java
index 4283e74..e83e075 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/launcher/HeadlessCrossPhasesLauncher.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/launcher/HeadlessCrossPhasesLauncher.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2016 THALES GLOBAL SERVICES.
+ * Copyright (c) 2006, 2018 THALES GLOBAL SERVICES.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,9 +12,7 @@ package org.polarsys.capella.transition.system2subsystem.crossphases.launcher;
import org.polarsys.capella.core.transition.common.activities.DifferencesComputingActivity;
import org.polarsys.capella.core.transition.common.activities.DifferencesMergingActivity;
-import org.polarsys.capella.core.transition.common.activities.FinalizeTransitionActivity;
import org.polarsys.capella.core.transition.common.activities.InitializeScopeActivity;
-import org.polarsys.capella.core.transition.common.activities.PostDiffMergeActivity;
import org.polarsys.capella.core.transition.common.activities.PostTransformationActivity;
import org.polarsys.capella.transition.system2subsystem.activities.FinalizeSubsystemTransitionActivity;
import org.polarsys.capella.transition.system2subsystem.activities.InitializeTransformationActivity;
@@ -70,7 +68,7 @@ public class HeadlessCrossPhasesLauncher extends SubSystemLauncher {
* @return the associated workflow element
*/
@Override
- protected WorkflowActivityParameter buildPostExecutionActivities() {
+ protected WorkflowActivityParameter buildDiffMergeActivities() {
WorkflowActivityParameter parameter = new WorkflowActivityParameter();
if (getTransposer() != null) {
@@ -87,12 +85,6 @@ public class HeadlessCrossPhasesLauncher extends SubSystemLauncher {
// DifferencesMergingActivity
parameter.addActivity(DifferencesMergingActivity.ID);
- // PostDiffMergeActivity
- parameter.addActivity(PostDiffMergeActivity.ID);
-
- // PostDiffMergeActivity
- parameter.addActivity(FinalizeTransitionActivity.ID);
-
}
return parameter;
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.interphases/src/org/polarsys/capella/transition/system2subsystem/interphases/launcher/HeadlessInterPhasesLauncher.java b/plugins/org.polarsys.capella.transition.system2subsystem.interphases/src/org/polarsys/capella/transition/system2subsystem/interphases/launcher/HeadlessInterPhasesLauncher.java
index 4ff9ce3..cf542e1 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.interphases/src/org/polarsys/capella/transition/system2subsystem/interphases/launcher/HeadlessInterPhasesLauncher.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.interphases/src/org/polarsys/capella/transition/system2subsystem/interphases/launcher/HeadlessInterPhasesLauncher.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2016 THALES GLOBAL SERVICES.
+ * Copyright (c) 2006, 2018 THALES GLOBAL SERVICES.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,9 +12,7 @@ package org.polarsys.capella.transition.system2subsystem.interphases.launcher;
import org.polarsys.capella.core.transition.common.activities.DifferencesComputingActivity;
import org.polarsys.capella.core.transition.common.activities.DifferencesMergingActivity;
-import org.polarsys.capella.core.transition.common.activities.FinalizeTransitionActivity;
import org.polarsys.capella.core.transition.common.activities.InitializeScopeActivity;
-import org.polarsys.capella.core.transition.common.activities.PostDiffMergeActivity;
import org.polarsys.capella.core.transition.common.activities.PostTransformationActivity;
import org.polarsys.capella.transition.system2subsystem.activities.FinalizeSubsystemTransitionActivity;
import org.polarsys.capella.transition.system2subsystem.activities.InitializeTransformationActivity;
@@ -71,7 +69,7 @@ public class HeadlessInterPhasesLauncher extends SubSystemLauncher {
* @return the associated workflow element
*/
@Override
- protected WorkflowActivityParameter buildPostExecutionActivities() {
+ protected WorkflowActivityParameter buildDiffMergeActivities() {
WorkflowActivityParameter parameter = new WorkflowActivityParameter();
if (getTransposer() != null) {
@@ -88,12 +86,6 @@ public class HeadlessInterPhasesLauncher extends SubSystemLauncher {
// DifferencesMergingActivity
parameter.addActivity(DifferencesMergingActivity.ID);
- // PostDiffMergeActivity
- parameter.addActivity(PostDiffMergeActivity.ID);
-
- // PostDiffMergeActivity
- parameter.addActivity(FinalizeTransitionActivity.ID);
-
}
return parameter;