aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAli AKAR2019-04-30 05:43:26 -0400
committerAli AKAR2019-05-14 20:12:14 -0400
commit26a335ee6f2dc59d67c72be75c5ba711fd90ec24 (patch)
treeba990210a87f242bae0e8930bf86808b1ee61724
parent11264e1124a418a2358be8d5c138f6b0e4cb802f (diff)
downloadcapella-sss-transition-26a335ee6f2dc59d67c72be75c5ba711fd90ec24.zip
capella-sss-transition-26a335ee6f2dc59d67c72be75c5ba711fd90ec24.tar.gz
capella-sss-transition-26a335ee6f2dc59d67c72be75c5ba711fd90ec24.tar.bz2
[2491] Issue to transit new sub system with referenced data in libraries
Bug 2491 Change-Id: I00d3163f26f7b0c608f54583eeee6ec19ea42b16 Signed-off-by: Ali AKAR <ali.akar82@gmail.com>
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/.classpath4
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.crossphases/.classpath4
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.crossphases/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.crossphases/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/handlers/traceability/config/SourceConfiguration.java10
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/handlers/traceability/config/TargetConfiguration.java9
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.doc/.classpath2
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.doc/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/.classpath4
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.interphases/.classpath4
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.interphases/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.interphases/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/.classpath2
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.multiphases/.classpath2
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.multiphases/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.multiphases/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.multiphases/src/org/polarsys/capella/transition/system2subsystem/multiphases/handlers/traceability/config/MultiphasesSourceConfiguration.java11
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.multiphases/src/org/polarsys/capella/transition/system2subsystem/multiphases/handlers/traceability/config/MultiphasesTargetConfiguration.java9
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/.settings/org.eclipse.jdt.core.prefs5
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.ui/.classpath4
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.ui/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem/.classpath2
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeDiffMergeActivity.java40
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeTransformationActivity.java36
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeTransitionActivity.java51
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/constants/ITransitionConstants2.java11
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/context/SubSystemContextHelper.java64
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/MergeSourceConfiguration.java63
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/MergeTargetConfiguration.java29
-rw-r--r--plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/TransformationConfiguration.java25
41 files changed, 398 insertions, 120 deletions
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/.classpath b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/.classpath
index de1ef2a..e334ecd 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/.classpath
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/.settings/org.eclipse.jdt.core.prefs
index 11f6e46..ace45ce 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/META-INF/MANIFEST.MF
index 1088c61..3a04f4e 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Bundle-Name: %pluginName
Bundle-Activator: org.polarsys.capella.transition.system2subsystem.crossphases.ui.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.polarsys.capella.transition.system2subsystem.crossphases.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.polarsys.capella.transition.system2subsystem.crossphases.ui,
org.polarsys.capella.transition.system2subsystem.crossphases.ui.actions.tester,
org.polarsys.capella.transition.system2subsystem.crossphases.ui.handlers
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/.classpath b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/.classpath
index d40e4d1..e334ecd 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/.classpath
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/.settings/org.eclipse.jdt.core.prefs
index f287d53..ace45ce 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/META-INF/MANIFEST.MF
index f77d47e..4041fab 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Export-Package: org.polarsys.capella.transition.system2subsystem.crossphases,
org.polarsys.capella.transition.system2subsystem.crossphases.rules.la,
org.polarsys.capella.transition.system2subsystem.crossphases.rules.pa
Require-Bundle: org.eclipse.core.runtime,
+ org.polarsys.capella.common.libraries;visibility:=reexport,
org.polarsys.capella.transition.system2subsystem;visibility:=reexport,
org.polarsys.capella.core.transition.system.topdown
Bundle-Vendor: %providerName
@@ -25,5 +26,5 @@ Bundle-Name: %pluginName
Bundle-Activator: org.polarsys.capella.transition.system2subsystem.crossphases.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.polarsys.capella.transition.system2subsystem.crossphases;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/handlers/traceability/config/SourceConfiguration.java b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/handlers/traceability/config/SourceConfiguration.java
index c37c8f7..acc2def 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/handlers/traceability/config/SourceConfiguration.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/handlers/traceability/config/SourceConfiguration.java
@@ -13,6 +13,7 @@ package org.polarsys.capella.transition.system2subsystem.crossphases.handlers.tr
import java.util.Collection;
import org.eclipse.emf.ecore.EObject;
+import org.polarsys.capella.common.libraries.ModelInformation;
import org.polarsys.capella.core.data.capellamodeller.SystemEngineering;
import org.polarsys.capella.core.data.cs.BlockArchitecture;
import org.polarsys.capella.core.data.epbs.EPBSArchitecture;
@@ -21,6 +22,7 @@ import org.polarsys.capella.core.model.helpers.SystemEngineeringExt;
import org.polarsys.capella.core.transition.common.constants.ITransitionConstants;
import org.polarsys.capella.core.transition.system.handlers.traceability.ReconciliationTraceabilityHandler;
import org.polarsys.capella.core.transition.system.helpers.ContextHelper;
+import org.polarsys.capella.transition.system2subsystem.context.SubSystemContextHelper;
import org.polarsys.capella.transition.system2subsystem.handlers.traceability.config.MergeSourceConfiguration;
import org.polarsys.kitalpha.transposer.rules.handler.rules.api.IContext;
@@ -54,8 +56,14 @@ public class SourceConfiguration extends MergeSourceConfiguration {
super.initializeRootMappings(context);
addMappings(ContextHelper.getSourceProject(context), ContextHelper.getTransformedProject(context), context);
addMappings(ContextHelper.getSourceEngineering(context), ContextHelper.getTransformedEngineering(context), context);
+ ModelInformation srcInfo = SubSystemContextHelper.getSourceModelInformation(context);
+ if(srcInfo != null) {
+ ModelInformation transformedInfo = SubSystemContextHelper.getTransformedModelInformation(context);
+ if(transformedInfo != null) {
+ addMappings(srcInfo, transformedInfo, context);
+ }
+ }
}
-
}
protected BlockArchitecture getSourceArchitecture(SystemEngineering source_p, IContext context_p) {
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/handlers/traceability/config/TargetConfiguration.java b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/handlers/traceability/config/TargetConfiguration.java
index 993d61b..70dfad6 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/handlers/traceability/config/TargetConfiguration.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.crossphases/src/org/polarsys/capella/transition/system2subsystem/crossphases/handlers/traceability/config/TargetConfiguration.java
@@ -13,6 +13,7 @@ package org.polarsys.capella.transition.system2subsystem.crossphases.handlers.tr
import java.util.Collection;
import org.eclipse.emf.ecore.EObject;
+import org.polarsys.capella.common.libraries.ModelInformation;
import org.polarsys.capella.core.data.capellamodeller.SystemEngineering;
import org.polarsys.capella.core.data.cs.BlockArchitecture;
import org.polarsys.capella.core.data.cs.Component;
@@ -26,6 +27,7 @@ import org.polarsys.capella.core.transition.common.constants.ITransitionConstant
import org.polarsys.capella.core.transition.common.handlers.traceability.ITraceabilityHandler;
import org.polarsys.capella.core.transition.system.handlers.traceability.ReconciliationTraceabilityHandler;
import org.polarsys.capella.core.transition.system.helpers.ContextHelper;
+import org.polarsys.capella.transition.system2subsystem.context.SubSystemContextHelper;
import org.polarsys.capella.transition.system2subsystem.handlers.traceability.SIDTraceabilityHandler;
import org.polarsys.capella.transition.system2subsystem.handlers.traceability.config.MergeTargetConfiguration;
import org.polarsys.kitalpha.transposer.rules.handler.rules.api.IContext;
@@ -88,6 +90,13 @@ public class TargetConfiguration extends MergeTargetConfiguration {
super.initializeRootMappings(context);
addMappings(ContextHelper.getSourceProject(context), ContextHelper.getTargetProject(context), context);
addMappings(ContextHelper.getSourceEngineering(context), getTargetEngineering(context), context);
+ ModelInformation srcInfo = SubSystemContextHelper.getSourceModelInformation(context);
+ if(srcInfo != null) {
+ ModelInformation targetInfo = SubSystemContextHelper.getTargetModelInformation(context);
+ if(targetInfo != null) {
+ addMappings(srcInfo, targetInfo, context);
+ }
+ }
}
}
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.doc/.classpath b/plugins/org.polarsys.capella.transition.system2subsystem.doc/.classpath
index b1dabee..e334ecd 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.doc/.classpath
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.doc/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.capella.transition.system2subsystem.doc/.settings/org.eclipse.jdt.core.prefs
index 11f6e46..ace45ce 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.doc/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.doc/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.doc/META-INF/MANIFEST.MF
index 3f2aec1..ec92e86 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.doc/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.3.1.qualifier
Bundle-Activator: org.polarsys.capella.transition.system2subsystem.doc.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/.classpath b/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/.classpath
index de1ef2a..e334ecd 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/.classpath
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/.settings/org.eclipse.jdt.core.prefs
index 11f6e46..ace45ce 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/META-INF/MANIFEST.MF
index 823b0ed..b0a3e63 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.interphases.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Bundle-Name: %pluginName
Bundle-Activator: org.polarsys.capella.transition.system2subsystem.interphases.ui.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.polarsys.capella.transition.system2subsystem.interphases.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.polarsys.capella.transition.system2subsystem.interphases.ui,
org.polarsys.capella.transition.system2subsystem.interphases.ui.actions.tester,
org.polarsys.capella.transition.system2subsystem.interphases.ui.handlers
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.interphases/.classpath b/plugins/org.polarsys.capella.transition.system2subsystem.interphases/.classpath
index de1ef2a..e334ecd 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.interphases/.classpath
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.interphases/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.interphases/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.capella.transition.system2subsystem.interphases/.settings/org.eclipse.jdt.core.prefs
index 11f6e46..ace45ce 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.interphases/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.interphases/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.interphases/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.interphases/META-INF/MANIFEST.MF
index e024101..4685531 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.interphases/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.interphases/META-INF/MANIFEST.MF
@@ -18,5 +18,5 @@ Bundle-Activator: org.polarsys.capella.transition.system2subsystem.interphases.A
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.polarsys.capella.transition.system2subsystem.interphases;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/.classpath b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/.classpath
index b1dabee..e334ecd 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/.classpath
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/.settings/org.eclipse.jdt.core.prefs
index 11f6e46..ace45ce 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/META-INF/MANIFEST.MF
index 0813052..247fb11 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases.ui/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
org.polarsys.capella.transition.system2subsystem.multiphases,
org.polarsys.capella.transition.system2subsystem.ui,
org.eclipse.core.expressions
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.polarsys.capella.transition.system2subsystem.multiphases.ui,
org.polarsys.capella.transition.system2subsystem.multiphases.ui.handlers
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/.classpath b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/.classpath
index b1dabee..e334ecd 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/.classpath
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/.settings/org.eclipse.jdt.core.prefs
index 11f6e46..ace45ce 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/META-INF/MANIFEST.MF
index ce933c8..0e4e437 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/META-INF/MANIFEST.MF
@@ -16,9 +16,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.polarsys.capella.core.model.skeleton,
org.polarsys.capella.core.platform.sirius.ui.project,
org.polarsys.capella.core.compare,
- org.polarsys.capella.core.transition.system.topdown,
- org.polarsys.capella.common.libraries
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.polarsys.capella.core.transition.system.topdown
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.polarsys.capella.transition.system2subsystem.multiphases,
org.polarsys.capella.transition.system2subsystem.multiphases.activities,
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/src/org/polarsys/capella/transition/system2subsystem/multiphases/handlers/traceability/config/MultiphasesSourceConfiguration.java b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/src/org/polarsys/capella/transition/system2subsystem/multiphases/handlers/traceability/config/MultiphasesSourceConfiguration.java
index 57f7d6a..f19fd60 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/src/org/polarsys/capella/transition/system2subsystem/multiphases/handlers/traceability/config/MultiphasesSourceConfiguration.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/src/org/polarsys/capella/transition/system2subsystem/multiphases/handlers/traceability/config/MultiphasesSourceConfiguration.java
@@ -13,6 +13,7 @@ package org.polarsys.capella.transition.system2subsystem.multiphases.handlers.tr
import java.util.Collection;
import org.eclipse.emf.ecore.EObject;
+import org.polarsys.capella.common.libraries.ModelInformation;
import org.polarsys.capella.core.data.capellamodeller.SystemEngineering;
import org.polarsys.capella.core.data.cs.BlockArchitecture;
import org.polarsys.capella.core.data.epbs.EPBSArchitecture;
@@ -52,12 +53,11 @@ public class MultiphasesSourceConfiguration extends MergeSourceConfiguration {
* {@inheritDoc}
*/
@Override
- protected void initializeRootMappings(IContext context_p) {
- super.initializeRootMappings(context_p);
- addMappings(ContextHelper.getSourceProject(context_p), ContextHelper.getTransformedProject(context_p), context_p);
- addMappings(ContextHelper.getSourceEngineering(context_p), ((MultiphasesContext)context_p).getTempSystemEngineering(), context_p);
+ protected void initializeRootMappings(IContext context) {
+ super.initializeRootMappings(context);
+ addMappings(ContextHelper.getSourceProject(context), ContextHelper.getTransformedProject(context), context);
+ addMappings(ContextHelper.getSourceEngineering(context), ((MultiphasesContext)context).getTempSystemEngineering(), context);
}
-
}
protected BlockArchitecture getSourceArchitecture(SystemEngineering source_p, IContext context_p) {
@@ -79,5 +79,4 @@ public class MultiphasesSourceConfiguration extends MergeSourceConfiguration {
addHandler(fContext_p, new MultiPhasesSourceReconciliationTraceabilityHandler(getIdentifier(fContext_p)));
addHandler(fContext_p, new SourceSIDTraceabilityHandler(getIdentifier(fContext_p)));
}
-
}
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/src/org/polarsys/capella/transition/system2subsystem/multiphases/handlers/traceability/config/MultiphasesTargetConfiguration.java b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/src/org/polarsys/capella/transition/system2subsystem/multiphases/handlers/traceability/config/MultiphasesTargetConfiguration.java
index 292d296..8bc0ad0 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/src/org/polarsys/capella/transition/system2subsystem/multiphases/handlers/traceability/config/MultiphasesTargetConfiguration.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.multiphases/src/org/polarsys/capella/transition/system2subsystem/multiphases/handlers/traceability/config/MultiphasesTargetConfiguration.java
@@ -13,6 +13,7 @@ package org.polarsys.capella.transition.system2subsystem.multiphases.handlers.tr
import java.util.Collection;
import org.eclipse.emf.ecore.EObject;
+import org.polarsys.capella.common.libraries.ModelInformation;
import org.polarsys.capella.core.data.capellamodeller.SystemEngineering;
import org.polarsys.capella.core.data.cs.BlockArchitecture;
import org.polarsys.capella.core.data.cs.Component;
@@ -83,10 +84,10 @@ public class MultiphasesTargetConfiguration extends MergeTargetConfiguration {
* {@inheritDoc}
*/
@Override
- protected void initializeRootMappings(IContext context_p) {
- super.initializeRootMappings(context_p);
- addMappings(ContextHelper.getSourceProject(context_p), ContextHelper.getTargetProject(context_p), context_p);
- addMappings(ContextHelper.getSourceEngineering(context_p), getTargetEngineering(context_p), context_p);
+ protected void initializeRootMappings(IContext context) {
+ super.initializeRootMappings(context);
+ addMappings(ContextHelper.getSourceProject(context), ContextHelper.getTargetProject(context), context);
+ addMappings(ContextHelper.getSourceEngineering(context), getTargetEngineering(context), context);
}
}
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/.settings/org.eclipse.jdt.core.prefs
index 295926d..ace45ce 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/META-INF/MANIFEST.MF
index 7dab857..8a00dec 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.tests.ju/META-INF/MANIFEST.MF
@@ -24,6 +24,6 @@ Export-Package: org.polarsys.capella.transition.system2subsystem.tests,
org.polarsys.capella.transition.system2subsystem.tests.multiphases,
org.polarsys.capella.transition.system2subsystem.tests.multiphases.validation,
org.polarsys.capella.transition.system2subsystem.tests.util
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.ui/.classpath b/plugins/org.polarsys.capella.transition.system2subsystem.ui/.classpath
index de1ef2a..e334ecd 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.ui/.classpath
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.ui/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.capella.transition.system2subsystem.ui/.settings/org.eclipse.jdt.core.prefs
index 11f6e46..ace45ce 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem.ui/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem.ui/META-INF/MANIFEST.MF
index 88acda6..5431f68 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.transition.system2subsystem.ui/META-INF/MANIFEST.MF
@@ -15,4 +15,4 @@ Bundle-Name: %pluginName
Bundle-Activator: org.polarsys.capella.transition.system2subsystem.ui.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.polarsys.capella.transition.system2subsystem.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/.classpath b/plugins/org.polarsys.capella.transition.system2subsystem/.classpath
index de1ef2a..f17aee0 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem/.classpath
+++ b/plugins/org.polarsys.capella.transition.system2subsystem/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.capella.transition.system2subsystem/.settings/org.eclipse.jdt.core.prefs
index 11f6e46..ace45ce 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.capella.transition.system2subsystem/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.transition.system2subsystem/META-INF/MANIFEST.MF
index b485051..2dec593 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.capella.transition.system2subsystem/META-INF/MANIFEST.MF
@@ -27,7 +27,9 @@ Require-Bundle: org.eclipse.core.runtime,
org.polarsys.capella.core.model.helpers,
org.polarsys.capella.core.transition.system;visibility:=reexport,
org.polarsys.capella.core.transition.system.topdown,
- org.polarsys.capella.core.model.handler
+ org.polarsys.capella.core.model.handler,
+ org.polarsys.capella.common.libraries,
+ org.polarsys.capella.common.transition
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.3.1.qualifier
@@ -36,5 +38,5 @@ Bundle-Name: %pluginName
Bundle-Activator: org.polarsys.capella.transition.system2subsystem.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.polarsys.capella.transition.system2subsystem;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeDiffMergeActivity.java b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeDiffMergeActivity.java
index 3d9bdbb..3313c50 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeDiffMergeActivity.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeDiffMergeActivity.java
@@ -10,14 +10,22 @@
*******************************************************************************/
package org.polarsys.capella.transition.system2subsystem.activities;
+import java.util.Set;
+
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EObject;
import org.polarsys.capella.core.data.cs.CsPackage;
import org.polarsys.capella.core.data.fa.FaPackage;
import org.polarsys.capella.core.data.interaction.InteractionPackage;
+import org.polarsys.capella.core.transition.common.constants.ITransitionConstants;
import org.polarsys.capella.core.transition.common.handlers.IHandler;
import org.polarsys.capella.core.transition.common.handlers.merge.IMergeHandler;
import org.polarsys.capella.core.transition.common.handlers.traceability.CompoundTraceabilityHandler;
+import org.polarsys.capella.core.transition.common.merge.scope.ReferenceModelScope;
+import org.polarsys.capella.core.transition.common.merge.scope.TargetModelScope;
import org.polarsys.capella.core.transition.system.topdown.handlers.merge.RealizationLinkCategoryFilter;
+import org.polarsys.capella.transition.system2subsystem.constants.ITransitionConstants2;
import org.polarsys.capella.transition.system2subsystem.handlers.filter.UpdateOfCategoryFilter;
import org.polarsys.capella.transition.system2subsystem.handlers.traceability.config.MergeSourceConfiguration;
import org.polarsys.capella.transition.system2subsystem.handlers.traceability.config.MergeTargetConfiguration;
@@ -50,5 +58,37 @@ public class InitializeDiffMergeActivity extends org.polarsys.capella.core.trans
protected IHandler createDefaultTraceabilityTargetHandler(IContext context) {
return new CompoundTraceabilityHandler(new MergeTargetConfiguration());
}
+
+ @Override
+ protected IStatus initializeReferenceScope(IContext context, ActivityParameters activityParams) {
+ super.initializeReferenceScope(context, activityParams);
+
+ ReferenceModelScope sourceScope = (ReferenceModelScope) context.get(ITransitionConstants2.MERGE_REFERENCE_SCOPE);
+ Set libraries = (Set) context.get(ITransitionConstants2.ROOTS_FOR_LIBRARIES_OF_SOURCE_PROJECT);
+ if (libraries != null && !libraries.isEmpty()) {
+ for (Object library : libraries) {
+ sourceScope.add((EObject) library, true);
+ }
+ }
+ sourceScope.build(getReferenceFilter(context));
+
+ return Status.OK_STATUS;
+ }
+
+ @Override
+ protected IStatus initializeTargetScope(IContext context, ActivityParameters activityParams) {
+ super.initializeTargetScope(context, activityParams);
+
+ TargetModelScope targetScope = (TargetModelScope) context.get(ITransitionConstants.MERGE_TARGET_SCOPE);
+ Set libraries = (Set) context.get(ITransitionConstants2.ROOTS_FOR_LIBRARIES_OF_TARGET_PROJECT);
+ if (libraries instanceof Set) {
+ for (Object library : libraries) {
+ targetScope.add((EObject) library, true);
+ }
+ }
+ targetScope.build(getTargetFilter(context));
+
+ return Status.OK_STATUS;
+ }
}
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeTransformationActivity.java b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeTransformationActivity.java
index fbb2567..ea09c0d 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeTransformationActivity.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeTransformationActivity.java
@@ -10,15 +10,27 @@
*******************************************************************************/
package org.polarsys.capella.transition.system2subsystem.activities;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.polarsys.capella.common.libraries.ModelInformation;
+import org.polarsys.capella.core.data.capellamodeller.CapellamodellerFactory;
+import org.polarsys.capella.core.data.capellamodeller.Project;
+import org.polarsys.capella.core.data.capellamodeller.SystemEngineering;
import org.polarsys.capella.core.transition.common.handlers.IHandler;
+import org.polarsys.capella.core.transition.common.handlers.attachment.AttachmentHelper;
import org.polarsys.capella.core.transition.common.handlers.traceability.CompoundTraceabilityHandler;
import org.polarsys.capella.core.transition.common.handlers.traceability.config.ITraceabilityConfiguration;
+import org.polarsys.capella.core.transition.system.helpers.ContextHelper;
import org.polarsys.capella.transition.system2subsystem.handlers.traceability.config.TransformationConfiguration;
+import org.polarsys.kitalpha.emde.model.ElementExtension;
+import org.polarsys.kitalpha.transposer.rules.handler.rules.api.IContext;
/**
*
*/
-public class InitializeTransformationActivity extends org.polarsys.capella.core.transition.system.activities.InitializeTransformationActivity {
+public class InitializeTransformationActivity
+ extends org.polarsys.capella.core.transition.system.activities.InitializeTransformationActivity {
public static final String ID = "org.polarsys.capella.transition.system2subsystem.activities.InitializeTransformationActivity"; //$NON-NLS-1$
@@ -31,4 +43,26 @@ public class InitializeTransformationActivity extends org.polarsys.capella.core.
return new CompoundTraceabilityHandler(configuration);
}
+ @Override
+ protected EObject createTargetTransformationContainer(Resource source, IContext context) {
+
+ Project sourceProject = ContextHelper.getSourceProject(context);
+ SystemEngineering sourceEngineering = ContextHelper.getSourceEngineering(context);
+ Project targetProject = CapellamodellerFactory.eINSTANCE.createProject(sourceProject.getName());
+
+ SystemEngineering targetEngineering = CapellamodellerFactory.eINSTANCE.createSystemEngineering(sourceEngineering.getName());
+ targetEngineering.setId(sourceEngineering.getId());
+ targetProject.getOwnedModelRoots().add(targetEngineering);
+
+ // Copy Library information from source project to target project if any
+ for (ElementExtension extension : sourceProject.getOwnedExtensions()) {
+ if (extension instanceof ModelInformation) {
+ ElementExtension copy = EcoreUtil.copy(extension);
+ targetProject.getOwnedExtensions().add(copy);
+ }
+ }
+
+ AttachmentHelper.getInstance(context).createdElement(null, targetProject, context);
+ return targetProject;
+ }
}
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeTransitionActivity.java b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeTransitionActivity.java
index dacecfa..a07220b 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeTransitionActivity.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/activities/InitializeTransitionActivity.java
@@ -12,6 +12,7 @@ package org.polarsys.capella.transition.system2subsystem.activities;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Set;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -19,6 +20,7 @@ import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.polarsys.capella.core.data.capellamodeller.Project;
import org.polarsys.capella.core.data.cs.Part;
@@ -34,6 +36,8 @@ import org.polarsys.capella.core.transition.common.handlers.scope.IScopeRetrieve
import org.polarsys.capella.core.transition.common.handlers.traceability.CompoundTraceabilityHandler;
import org.polarsys.capella.core.transition.system.handlers.attachment.CapellaDefaultAttachmentHandler;
import org.polarsys.capella.transition.system2subsystem.constants.ISubSystemConstants;
+import org.polarsys.capella.transition.system2subsystem.constants.ITransitionConstants2;
+import org.polarsys.capella.transition.system2subsystem.context.SubSystemContextHelper;
import org.polarsys.capella.transition.system2subsystem.handlers.attachment.FunctionalChainAttachmentHelper;
import org.polarsys.capella.transition.system2subsystem.handlers.attachment.PhysicalPathAttachmentHelper;
import org.polarsys.capella.transition.system2subsystem.handlers.attachment.ScenarioAttachmentHelper;
@@ -43,7 +47,6 @@ import org.polarsys.capella.transition.system2subsystem.handlers.scope.PropertyV
import org.polarsys.capella.transition.system2subsystem.handlers.scope.RequirementsScopeFilter;
import org.polarsys.capella.transition.system2subsystem.handlers.scope.RequirementsScopeRetriever;
import org.polarsys.capella.transition.system2subsystem.handlers.session.SubSystemSessionHandler;
-import org.polarsys.capella.transition.system2subsystem.handlers.traceability.config.MergeSourceConfiguration;
import org.polarsys.capella.transition.system2subsystem.handlers.traceability.config.TransformationConfiguration;
import org.polarsys.kitalpha.cadence.core.api.parameter.ActivityParameters;
import org.polarsys.kitalpha.transposer.rules.handler.rules.api.IContext;
@@ -122,23 +125,57 @@ public class InitializeTransitionActivity extends org.polarsys.capella.core.tran
}
@Override
+ protected IStatus initializeSource(IContext context, ActivityParameters activityParams) {
+ super.initializeSource(context, activityParams);
+
+ Object sourceProject = context.get(ITransitionConstants.TRANSITION_SOURCE_ROOT);
+ if (sourceProject instanceof Project) {
+ Set<Resource> libraryResources = SubSystemContextHelper.getLibraryResources((Project) sourceProject);
+ if (libraryResources != null && !libraryResources.isEmpty()) {
+ context.put(ITransitionConstants2.RESOURCES_FOR_LIBRARIES_OF_SOURCE_PROJECT, libraryResources);
+ context.put(ITransitionConstants2.ROOTS_FOR_LIBRARIES_OF_SOURCE_PROJECT,
+ SubSystemContextHelper.getLibraryRoots(libraryResources));
+ }
+ }
+ return Status.OK_STATUS;
+ }
+
+ @Override
protected IStatus initializeTarget(IContext context, ActivityParameters activityParams) {
- String outputproject =
+ String outputModelUriString =
OptionsHandlerHelper.getInstance(context).getStringValue(context, IOptionsConstants.TRANSITION_PREFERENCES, IOptionsConstants.OUTPUT_PROJECT,
IOptionsConstants.OUTPUT_PROJECT_DEFAULT_VALUE);
- Resource outputResource = null;
- URI fileUri = URI.createPlatformResourceURI(outputproject, true);
+ URI outputModelUri = URI.createPlatformResourceURI(outputModelUriString, true);
// we must use a single editing domain throughout the entire operation
EditingDomain targetDomain = (EditingDomain) context.get(ITransitionConstants.TRANSITION_SOURCE_EDITING_DOMAIN);
context.put(ITransitionConstants.TRANSITION_TARGET_EDITING_DOMAIN, targetDomain);
- outputResource = targetDomain.getResourceSet().getResource(fileUri, true);
+
+ ResourceSet resourceSet = targetDomain.getResourceSet();
+ Resource outputResource = resourceSet.getResource(outputModelUri, true);
context.put(ITransitionConstants.TRANSITION_TARGET_RESOURCE, outputResource);
- context.put(ITransitionConstants.TRANSITION_TARGET_ROOT, outputResource.getContents().get(0));
-
+ EObject outputProject = outputResource.getContents().get(0);
+ if (outputProject instanceof Project) {
+ context.put(ITransitionConstants.TRANSITION_TARGET_ROOT, outputProject);
+ Set<Resource> libraryResources = SubSystemContextHelper.getLibraryResources((Project) outputProject);
+ if (libraryResources != null && !libraryResources.isEmpty()) {
+ context.put(ITransitionConstants2.RESOURCES_FOR_LIBRARIES_OF_TARGET_PROJECT, libraryResources);
+ context.put(ITransitionConstants2.ROOTS_FOR_LIBRARIES_OF_TARGET_PROJECT,
+ SubSystemContextHelper.getLibraryRoots(libraryResources));
+ } else {
+ Object sourceProject = context.get(ITransitionConstants.TRANSITION_SOURCE_ROOT);
+ if (sourceProject instanceof Project) {
+ libraryResources = SubSystemContextHelper.getLibraryResources((Project) sourceProject);
+ context.put(ITransitionConstants2.RESOURCES_FOR_LIBRARIES_OF_TARGET_PROJECT, libraryResources);
+ context.put(ITransitionConstants2.ROOTS_FOR_LIBRARIES_OF_TARGET_PROJECT,
+ SubSystemContextHelper.getLibraryRoots(libraryResources));
+ }
+ }
+ }
+
return Status.OK_STATUS;
}
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/constants/ITransitionConstants2.java b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/constants/ITransitionConstants2.java
new file mode 100644
index 0000000..18226a4
--- /dev/null
+++ b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/constants/ITransitionConstants2.java
@@ -0,0 +1,11 @@
+package org.polarsys.capella.transition.system2subsystem.constants;
+
+import org.polarsys.capella.core.transition.common.constants.ITransitionConstants;
+
+public interface ITransitionConstants2 extends ITransitionConstants {
+ String RESOURCES_FOR_LIBRARIES_OF_TARGET_PROJECT = "RESOURCES_FOR_LIBRARIES_OF_TARGET_PROJECT";
+ String ROOTS_FOR_LIBRARIES_OF_TARGET_PROJECT = "ROOTS_FOR_LIBRARIES_OF_TARGET_PROJECT";
+
+ String RESOURCES_FOR_LIBRARIES_OF_SOURCE_PROJECT = "RESOURCES_FOR_LIBRARIES_OF_SOURCE_PROJECT";
+ String ROOTS_FOR_LIBRARIES_OF_SOURCE_PROJECT = "ROOTS_FOR_LIBRARIES_OF_SOURCE_PROJECT";
+}
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/context/SubSystemContextHelper.java b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/context/SubSystemContextHelper.java
new file mode 100644
index 0000000..5bddac2
--- /dev/null
+++ b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/context/SubSystemContextHelper.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2019 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Thales - initial API and implementation
+ *******************************************************************************/
+package org.polarsys.capella.transition.system2subsystem.context;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.polarsys.capella.common.libraries.LibraryReference;
+import org.polarsys.capella.common.libraries.ModelInformation;
+import org.polarsys.capella.core.data.capellamodeller.Project;
+import org.polarsys.capella.core.transition.system.helpers.ContextHelper;
+import org.polarsys.kitalpha.emde.model.ElementExtension;
+import org.polarsys.kitalpha.transposer.rules.handler.rules.api.IContext;
+
+/**
+ * A temporary class and to be removed in newer Capella release.
+ * @deprecated use org.polarsys.capella.core.transition.system.helpers.
+ */
+@Deprecated
+public class SubSystemContextHelper {
+
+ public static ModelInformation getSourceModelInformation(IContext context) {
+ return getModelInformation(ContextHelper.getSourceProject(context));
+ }
+
+ public static ModelInformation getTransformedModelInformation(IContext context) {
+ return getModelInformation(ContextHelper.getTransformedProject(context));
+ }
+
+ public static ModelInformation getTargetModelInformation(IContext context) {
+ return getModelInformation(ContextHelper.getTargetProject(context));
+ }
+
+ public static Set<Resource> getLibraryResources(Project project) {
+ return project.getOwnedExtensions().stream().filter(ModelInformation.class::isInstance)
+ .map(ModelInformation.class::cast).flatMap(m -> m.getOwnedReferences().stream())
+ .map(LibraryReference::getLibrary).map(EObject::eContainer).map(EObject::eResource).collect(Collectors.toSet());
+ }
+
+ public static Set<EObject> getLibraryRoots(Set<Resource> libraryResources) {
+ return libraryResources.stream().map(r -> r.getContents().get(0)).collect(Collectors.toSet());
+ }
+
+ private static ModelInformation getModelInformation(Project project) {
+ if (project != null) {
+ for (ElementExtension elt : project.getOwnedExtensions()) {
+ if (elt instanceof ModelInformation) {
+ return (ModelInformation) elt;
+ }
+ }
+ }
+ return null;
+ }
+}
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/MergeSourceConfiguration.java b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/MergeSourceConfiguration.java
index 17eb9f1..250fd67 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/MergeSourceConfiguration.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/MergeSourceConfiguration.java
@@ -10,23 +10,19 @@
*******************************************************************************/
package org.polarsys.capella.transition.system2subsystem.handlers.traceability.config;
-import java.util.Collection;
-
import org.eclipse.emf.ecore.EObject;
-import org.polarsys.capella.core.data.capellacore.CapellaElement;
-import org.polarsys.capella.core.data.capellamodeller.Project;
+import org.polarsys.capella.common.libraries.ModelInformation;
import org.polarsys.capella.core.data.capellamodeller.SystemEngineering;
import org.polarsys.capella.core.data.cs.BlockArchitecture;
import org.polarsys.capella.core.data.cs.Component;
import org.polarsys.capella.core.model.helpers.BlockArchitectureExt;
-import org.polarsys.capella.core.model.helpers.SystemEngineeringExt;
import org.polarsys.capella.core.transition.common.constants.ISchemaConstants;
-import org.polarsys.capella.core.transition.common.constants.ITransitionConstants;
import org.polarsys.capella.core.transition.common.handlers.traceability.ITraceabilityHandler;
import org.polarsys.capella.core.transition.common.handlers.traceability.config.ExtendedTraceabilityConfiguration;
import org.polarsys.capella.core.transition.system.handlers.traceability.RealizationLinkTraceabilityHandler;
import org.polarsys.capella.core.transition.system.handlers.traceability.ReconciliationTraceabilityHandler;
import org.polarsys.capella.core.transition.system.helpers.ContextHelper;
+import org.polarsys.capella.transition.system2subsystem.context.SubSystemContextHelper;
import org.polarsys.capella.transition.system2subsystem.handlers.traceability.SIDTraceabilityHandler;
import org.polarsys.kitalpha.transposer.rules.handler.rules.api.IContext;
@@ -38,25 +34,25 @@ public class MergeSourceConfiguration extends ExtendedTraceabilityConfiguration
protected class SourceReconciliationTraceabilityHandler extends ReconciliationTraceabilityHandler {
/**
- * @param identifier_p
+ * @param identifier
*/
- public SourceReconciliationTraceabilityHandler(String identifier_p) {
- super(identifier_p);
+ public SourceReconciliationTraceabilityHandler(String identifier) {
+ super(identifier);
}
/**
* {@inheritDoc}
*/
@Override
- protected void initializeBlockArchitecture(BlockArchitecture source_p, BlockArchitecture target_p, IContext context_p, LevelMappingTraceability map_p) {
- super.initializeBlockArchitecture(source_p, target_p, context_p, map_p);
+ protected void initializeBlockArchitecture(BlockArchitecture source, BlockArchitecture target, IContext context, LevelMappingTraceability map) {
+ super.initializeBlockArchitecture(source, target, context, map);
//We add a mapping between both root components
- Component sourceComponent = BlockArchitectureExt.getFirstComponent(source_p);
- Component targetComponent = BlockArchitectureExt.getFirstComponent(target_p);
+ Component sourceComponent = BlockArchitectureExt.getFirstComponent(source);
+ Component targetComponent = BlockArchitectureExt.getFirstComponent(target);
if ((sourceComponent != null) && (targetComponent != null)) {
- if ((!map_p.contains(sourceComponent)) && (!map_p.contains(targetComponent))) {
- addMapping(map_p, sourceComponent, targetComponent, context_p);
+ if ((!map.contains(sourceComponent)) && (!map.contains(targetComponent))) {
+ addMapping(map, sourceComponent, targetComponent, context);
}
}
}
@@ -65,45 +61,50 @@ public class MergeSourceConfiguration extends ExtendedTraceabilityConfiguration
* {@inheritDoc}
*/
@Override
- protected void initializeRootMappings(IContext context_p) {
- super.initializeRootMappings(context_p);
- addMappings(ContextHelper.getSourceProject(context_p), ContextHelper.getTransformedProject(context_p), context_p);
- addMappings(ContextHelper.getSourceEngineering(context_p), ContextHelper.getTransformedEngineering(context_p), context_p);
+ protected void initializeRootMappings(IContext context) {
+ super.initializeRootMappings(context);
+ addMappings(ContextHelper.getSourceProject(context), ContextHelper.getTransformedProject(context), context);
+ addMappings(ContextHelper.getSourceEngineering(context), ContextHelper.getTransformedEngineering(context), context);
+ ModelInformation srcInfo = SubSystemContextHelper.getSourceModelInformation(context);
+ if(srcInfo != null) {
+ ModelInformation transformedInfo = SubSystemContextHelper.getTransformedModelInformation(context);
+ if(transformedInfo != null) {
+ addMappings(srcInfo, transformedInfo, context);
+ }
+ }
}
-
}
protected class SourceSIDTraceabilityHandler extends SIDTraceabilityHandler {
/**
- * @param identifier_p
+ * @param identifier
*/
- public SourceSIDTraceabilityHandler(String identifier_p) {
- super(identifier_p);
+ public SourceSIDTraceabilityHandler(String identifier) {
+ super(identifier);
}
/**
* {@inheritDoc}
*/
@Override
- protected void initializeRootMappings(IContext context_p) {
- super.initializeRootMappings(context_p);
- initializeMappings(ContextHelper.getSourceProject(context_p), ContextHelper.getTransformedProject(context_p), context_p);
+ protected void initializeRootMappings(IContext context) {
+ super.initializeRootMappings(context);
+ initializeMappings(ContextHelper.getSourceProject(context), ContextHelper.getTransformedProject(context), context);
}
-
}
/**
* {@inheritDoc}
*/
@Override
- protected String getExtensionIdentifier(IContext context_p) {
+ protected String getExtensionIdentifier(IContext context) {
return ISchemaConstants.SOURCE_TRACEABILITY_CONFIGURATION;
}
@Override
- protected void initHandlers(IContext fContext_p) {
- addHandler(fContext_p, new SourceReconciliationTraceabilityHandler(getIdentifier(fContext_p)));
- addHandler(fContext_p, new SourceSIDTraceabilityHandler(getIdentifier(fContext_p)));
+ protected void initHandlers(IContext context) {
+ addHandler(context, new SourceReconciliationTraceabilityHandler(getIdentifier(context)));
+ addHandler(context, new SourceSIDTraceabilityHandler(getIdentifier(context)));
}
/**
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/MergeTargetConfiguration.java b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/MergeTargetConfiguration.java
index 763bcf2..ffb02e6 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/MergeTargetConfiguration.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/MergeTargetConfiguration.java
@@ -10,13 +10,8 @@
*******************************************************************************/
package org.polarsys.capella.transition.system2subsystem.handlers.traceability.config;
-import java.util.Collection;
-
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.polarsys.capella.core.data.capellacore.CapellaElement;
-import org.polarsys.capella.core.data.capellamodeller.Library;
-import org.polarsys.capella.core.data.capellamodeller.Project;
+import org.polarsys.capella.common.libraries.ModelInformation;
import org.polarsys.capella.core.data.capellamodeller.SystemEngineering;
import org.polarsys.capella.core.data.cs.BlockArchitecture;
import org.polarsys.capella.core.data.cs.Component;
@@ -30,6 +25,7 @@ import org.polarsys.capella.core.transition.common.handlers.traceability.config.
import org.polarsys.capella.core.transition.system.handlers.traceability.RealizationLinkTraceabilityHandler;
import org.polarsys.capella.core.transition.system.handlers.traceability.ReconciliationTraceabilityHandler;
import org.polarsys.capella.core.transition.system.helpers.ContextHelper;
+import org.polarsys.capella.transition.system2subsystem.context.SubSystemContextHelper;
import org.polarsys.capella.transition.system2subsystem.handlers.traceability.SIDTraceabilityHandler;
import org.polarsys.kitalpha.transposer.rules.handler.rules.api.IContext;
@@ -72,20 +68,27 @@ public class MergeTargetConfiguration extends ExtendedTraceabilityConfiguration
* {@inheritDoc}
*/
@Override
- protected void initializeRootMappings(IContext context_p) {
- super.initializeRootMappings(context_p);
- addMappings(ContextHelper.getSourceProject(context_p), ContextHelper.getTargetProject(context_p), context_p);
- addMappings(ContextHelper.getSourceEngineering(context_p), getTargetEngineering(context_p), context_p);
+ protected void initializeRootMappings(IContext context) {
+ super.initializeRootMappings(context);
+ addMappings(ContextHelper.getSourceProject(context), ContextHelper.getTargetProject(context), context);
+ addMappings(ContextHelper.getSourceEngineering(context), getTargetEngineering(context), context);
+ ModelInformation srcInfo = SubSystemContextHelper.getSourceModelInformation(context);
+ if(srcInfo != null) {
+ ModelInformation targetInfo = SubSystemContextHelper.getTargetModelInformation(context);
+ if(targetInfo != null) {
+ addMappings(srcInfo, targetInfo, context);
+ }
+ }
}
}
protected class TargetSIDTraceabilityHandler extends SIDTraceabilityHandler {
/**
- * @param identifier_p
+ * @param identifier
*/
- public TargetSIDTraceabilityHandler(String identifier_p) {
- super(identifier_p);
+ public TargetSIDTraceabilityHandler(String identifier) {
+ super(identifier);
}
/**
diff --git a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/TransformationConfiguration.java b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/TransformationConfiguration.java
index e6aee0e..8654489 100644
--- a/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/TransformationConfiguration.java
+++ b/plugins/org.polarsys.capella.transition.system2subsystem/src/org/polarsys/capella/transition/system2subsystem/handlers/traceability/config/TransformationConfiguration.java
@@ -14,10 +14,7 @@ import java.util.Collection;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
import org.polarsys.capella.core.data.capellacore.CapellaElement;
-import org.polarsys.capella.core.data.capellamodeller.Library;
-import org.polarsys.capella.core.data.capellamodeller.Project;
import org.polarsys.capella.core.data.capellamodeller.SystemEngineering;
import org.polarsys.capella.core.data.cs.Component;
import org.polarsys.capella.core.model.helpers.SystemEngineeringExt;
@@ -25,6 +22,7 @@ import org.polarsys.capella.core.transition.common.constants.ISchemaConstants;
import org.polarsys.capella.core.transition.common.constants.ITransitionConstants;
import org.polarsys.capella.core.transition.common.handlers.traceability.ITraceabilityHandler;
import org.polarsys.capella.core.transition.common.handlers.traceability.config.ExtendedTraceabilityConfiguration;
+import org.polarsys.capella.core.transition.system.handlers.traceability.LibraryTraceabilityHandler;
import org.polarsys.capella.core.transition.system.handlers.traceability.ReconciliationTraceabilityHandler;
import org.polarsys.capella.core.transition.system.helpers.ContextHelper;
import org.polarsys.capella.transition.system2subsystem.handlers.traceability.SIDTraceabilityHandler;
@@ -83,6 +81,8 @@ public class TransformationConfiguration extends ExtendedTraceabilityConfigurati
}
});
+
+ addHandler(fContext_p, new LibraryTraceabilityHandler());
}
@@ -94,6 +94,22 @@ public class TransformationConfiguration extends ExtendedTraceabilityConfigurati
}
return null;
}
+
+ @Override
+ public boolean useHandlerForSourceElements(EObject source, ITraceabilityHandler handler, IContext context) {
+ if (LibraryTraceabilityHandler.isLibraryElement(source, context)) {
+ return handler instanceof LibraryTraceabilityHandler;
+ }
+ return super.useHandlerForSourceElements(source, handler, context);
+ }
+
+ @Override
+ public boolean useHandlerForTracedElements(EObject source, ITraceabilityHandler handler, IContext context) {
+ if (LibraryTraceabilityHandler.isLibraryElement(source, context)) {
+ return handler instanceof LibraryTraceabilityHandler;
+ }
+ return super.useHandlerForTracedElements(source, handler, context);
+ }
/**
@@ -101,6 +117,9 @@ public class TransformationConfiguration extends ExtendedTraceabilityConfigurati
*/
@Override
public boolean useHandlerForAttachment(EObject source_p, EObject target_p, ITraceabilityHandler handler_p, IContext context_p) {
+ if (LibraryTraceabilityHandler.isLibraryElement(source_p, context_p)) {
+ return handler_p instanceof LibraryTraceabilityHandler;
+ }
boolean result = super.useHandlerForAttachment(source_p, target_p, handler_p, context_p);
if (result) {