initial update of plugind for Eclipse Mars release
diff --git a/plugins/org.polarsys.chess.chessmlprofile/.classpath b/plugins/org.polarsys.chess.chessmlprofile/.classpath
index ed0d3c7..3bc2475 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/.classpath
+++ b/plugins/org.polarsys.chess.chessmlprofile/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" 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.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="output" path="bin"/>
</classpath>
diff --git a/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.jdt.core.prefs
index 3f457a0..f42de36 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.chessmlprofile/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Apr 27 11:46:59 CEST 2011
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.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.7
diff --git a/plugins/org.polarsys.chess.chessmlprofile/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.chessmlprofile/META-INF/MANIFEST.MF
index 3fb7448..cab9167 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.chessmlprofile/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-ClassPath: .
Bundle-Vendor: Polarsys CHESS Project
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.workbench,
org.eclipse.emf.common,
diff --git a/plugins/org.polarsys.chess.chessmlprofile/build.properties b/plugins/org.polarsys.chess.chessmlprofile/build.properties
index eaf8120..b58e9f2 100644
--- a/plugins/org.polarsys.chess.chessmlprofile/build.properties
+++ b/plugins/org.polarsys.chess.chessmlprofile/build.properties
@@ -17,16 +17,12 @@
plugin.xml,\
plugin.properties,\
icons/,\
- library/,\
- readme.txt,\
build.properties,\
palettes/,\
- doc/,\
.classpath
jars.compile.order = .
source.. = src/
output.. = bin/
src.includes = icons/,\
- library/,\
- model/,\
- readme.txt
+ model/
+
diff --git a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GenerateInfrastructure.java b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GenerateInfrastructure.java
index 99f41df..fa429d3 100644
--- a/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GenerateInfrastructure.java
+++ b/plugins/org.polarsys.chess.codegen.ada/src/org/polarsys/chess/codegen/ada/main/GenerateInfrastructure.java
@@ -341,9 +341,6 @@
@Override
public void registerPackages(ResourceSet resourceSet) {
super.registerPackages(resourceSet);
- if (!isInWorkspace(org.eclipse.uml2.uml.UMLPackage.class)) {
- resourceSet.getPackageRegistry().put(org.eclipse.uml2.uml.UMLPackage.eINSTANCE.getNsURI(), org.eclipse.uml2.uml.UMLPackage.eINSTANCE);
- }
/*
* If you want to change the content of this method, do NOT forget to change the "@generated"
diff --git a/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml b/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
index b15ab6b..5be8756 100644
--- a/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
+++ b/plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
@@ -1,60 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="generateInfrastructure" name="org.polarsys.chess.codegen.ada">
- <property name="ECLIPSE_HOME" value="../../../../../../../Programs/eclipse-modeling-luna-SR2-win32-x86_64/eclipse"/>
- <property name="ECLIPSE_WORKSPACE" value="../../../../../../01_Concerto/LavoroDiMerge"/>
+ <property name="ECLIPSE_HOME" value="../../../../../../../Programs/eclipse-modeling-mars-R-win32-x86_64/eclipse"/>
+ <property name="ECLIPSE_WORKSPACE" value="../../../../../../01_Concerto/Concerto_workspace_mars"/>
<!-- The classpath with only the dependencies used by the project -->
<path id="org.polarsys.chess.codegen.ada.libraryclasspath">
<pathelement location="${ECLIPSE_WORKSPACE}/org.polarsys.chess.codegen.ada/bin"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.10.0.v20140318-2214.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.11.0.v20150405-1723.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/javax.annotation_1.2.0.v201401042248.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/javax.inject_1.0.0.v20091030.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.10.2.v20150203-1939.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.1.v20140709-1414.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.6.1.v20141014-1248.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime.compatibility.registry_3.5.300.v20140128-0851/runtime_registry_compatibility.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.5.400.v20140428-1507.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.5.200.v20140224-1527.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.4.200.v20140207-1251.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.200.v20130910-1609.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.0.2.v20150202-0947.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.10.2.v20150123-0348.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.10.1.v20150123-0348.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.10.2.v20150123-0348.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.0.1.v20150202-0947.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20150202-0947.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.8.0.v20150123-0452.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.4.2.v20140725-2242.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.10.100.v20150529-1857.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi.compatibility.state_1.0.100.v20150402-1551.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.7.0.v20150402-1709.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.7.0.v20150330-2103.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime.compatibility.registry_3.6.0.v20150318-1505/runtime_registry_compatibility.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.6.0.v20150318-1503.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.5.300.v20150408-1437.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.5.0.v20150421-2214.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.300.v20150423-1356.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_5.1.0.v20150601-0733.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.11.0.v20150512-0501.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.11.0.v20150512-0501.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.11.0.v20150512-0501.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_2.1.0.v20150601-0733.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.types_2.0.0.v20150601-0733.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.mapping.ecore2xml_2.9.0.v20150601-0402.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl_3.5.0.v20150521-1211.jar"/>
<pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.2.0.v20140610-0641.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.3.100.v20140610-0641.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.5.1.201409021433.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.5.1.201409021433.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.5.1.201409021433.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.5.1.201409021433.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.5.1.201409021433.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.10.2.v20150123-0452.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.10.0.v20150123-0452.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.0.2.v201504031223.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.6.100.v20140528-1422.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.9.1.v20140825-1431.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_1.0.2.v201504030953.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_1.0.2.v201504030953.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_1.0.2.v201504030953.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.0.2.v201504030953.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.4.0.v20140306-0649.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.4.0.v20140306-0718.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.106.1.v20141002-1150.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.103.2.v20150203-1313.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.103.2.v20150203-1351.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.10.2.v20141021-1035.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.106.2.v20150204-1030.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.12.0.v20140227-2118.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.10.2.v20141118-1227.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.sysml_1.0.2.v201504030953.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml.profile.standard_1.0.0.v20150202-0947.jar"/>
- <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.7.0.v20140408-0703.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.common_1.3.0.v20150519-0914.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ocl.ecore_3.5.0.v20150525-1635.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.6.0.201506080954.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.parser_3.6.0.201506080954.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.6.0.201506080954.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.6.0.201506080954.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.6.0.201506080954.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.11.0.v20150601-0402.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.11.0.v20150601-0402.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.marte.static.profile_1.1.0.201506101813.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.commands_3.7.0.v20150422-0725.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.10.0.v20150423-0755.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core_1.1.0.201506191540.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor_1.1.0.201506191540.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.infra.core.sasheditor.di_1.1.0.201506191540.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.editor_1.1.0.201506191540.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.common_3.5.0.v20150519-0825.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.m2m.qvt.oml.emf.util_3.5.0.v20150419-1233.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui_3.107.0.v20150507-1945.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt_3.104.0.v20150528-0211.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.swt.win32.win32.x86_64_3.104.0.v20150528-0211.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.jface_3.11.0.v20150602-1400.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.workbench_3.107.0.v20150510-1732.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.e4.ui.workbench3_0.13.0.v20150422-0725.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.ide_3.11.0.v20150510-1749.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.papyrus.sysml_1.1.0.201506191540.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml.profile.standard_1.0.100.v20150601-0733.jar"/>
+ <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.ui.views_3.8.0.v20150422-0725.jar"/>
</path>
<path id="org.polarsys.chess.codegen.ada.classpath">
diff --git a/plugins/org.polarsys.chess.commands/.classpath b/plugins/org.polarsys.chess.commands/.classpath
index ad32c83..098194c 100644
--- a/plugins/org.polarsys.chess.commands/.classpath
+++ b/plugins/org.polarsys.chess.commands/.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.6"/>
+ <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="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.commands/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.commands/.settings/org.eclipse.jdt.core.prefs
index 044ef7a..f42de36 100644
--- a/plugins/org.polarsys.chess.commands/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.commands/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Tue Oct 05 10:28:34 CEST 2010
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.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.7
diff --git a/plugins/org.polarsys.chess.commands/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.commands/META-INF/MANIFEST.MF
index c5c4947..2a8f3e8 100644
--- a/plugins/org.polarsys.chess.commands/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.commands/META-INF/MANIFEST.MF
@@ -35,6 +35,6 @@
org.eclipse.papyrus.uml.tools,
org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
org.polarsys.chess.m2m
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Export-Package: org.polarsys.chess.commands
diff --git a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/BuildInstanceCommand.java b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/BuildInstanceCommand.java
index 7ebd437..ac2b9ae 100644
--- a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/BuildInstanceCommand.java
+++ b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/BuildInstanceCommand.java
@@ -285,7 +285,9 @@
//create port instances for root instance
if (rootcomponent instanceof org.eclipse.uml2.uml.Class)
- buildPortInstances((org.eclipse.uml2.uml.Class) rootcomponent, instanceRoot, (ShapeImpl) compositeEP.getModel() );
+ // LB 20150701: porting to MARS casting to compositeEP (following eclipse's suggestion)
+ //buildPortInstances((org.eclipse.uml2.uml.Class) rootcomponent, instanceRoot, (ShapeImpl) compositeEP.getModel() );
+ buildPortInstances((org.eclipse.uml2.uml.Class) rootcomponent, instanceRoot, (ShapeImpl) ((EditPart) compositeEP).getModel() );
}
@@ -541,7 +543,9 @@
@SuppressWarnings("rawtypes")
@Deprecated
public static PortEditPart getPortEditPart(NamedElementEditPart propertyEP, Port port){
- List listEP = propertyEP.getChildren();
+ // LB 20150701: porting MARS casting to propertyEP (following eclipse's suggestion)
+ //List listEP = propertyEP.getChildren();
+ List listEP = ((EditPart) propertyEP).getChildren();
Object temp = null;
for (int i=0; i<listEP.size(); i++){
temp = listEP.get(i);
diff --git a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/HideRTInformationCommand.java b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/HideRTInformationCommand.java
index 4d67dee..344bd41 100644
--- a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/HideRTInformationCommand.java
+++ b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/HideRTInformationCommand.java
@@ -73,7 +73,9 @@
}
- if (ShowRTInformationCommand.showHideRT((Shape)compositeEP.getModel(), false)){
+ // LB 20150701 porting to MARS added cast to compositeEp (following Eclipse's suggestion)
+ //if (ShowRTInformationCommand.showHideRT((Shape)compositeEP.getModel(), false)){
+ if (ShowRTInformationCommand.showHideRT((Shape)((EditPart) compositeEP).getModel(), false)){
ds.setUserAction(false);
}
}
diff --git a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/ShowRTInformationCommand.java b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/ShowRTInformationCommand.java
index b81f66a..db72f8f 100644
--- a/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/ShowRTInformationCommand.java
+++ b/plugins/org.polarsys.chess.commands/src/org/polarsys/chess/commands/ShowRTInformationCommand.java
@@ -77,11 +77,15 @@
}
- if (showHideRT((Shape)compositeEP.getModel(), true)){
+ // LB 20150701 porting to MARTE added casting to compositeEP (following Eclipse's suggestion)
+ //if (showHideRT((Shape)compositeEP.getModel(), true)){
+ if (showHideRT((Shape)((EditPart) compositeEP).getModel(), true)){
ds.setUserAction(false);
}
- EditPart mainEditPart = (EditPart)(compositeEP.getRoot().getChildren().get(0));
+ // LB 20150701 porting to MARTE added parenthesis around cast and casting to EditPart (following Eclipse's suggestion)
+ //EditPart mainEditPart = (EditPart)(compositeEP.getRoot().getChildren().get(0));
+ EditPart mainEditPart = (EditPart) (((EditPart) compositeEP).getRoot().getChildren().get(0));
CanonicalEditPolicy cep = (CanonicalEditPolicy)mainEditPart.getEditPolicy(EditPolicyRoles.CANONICAL_ROLE);
if (cep!=null)
cep.refresh();
diff --git a/plugins/org.polarsys.chess.core/.classpath b/plugins/org.polarsys.chess.core/.classpath
index a9a4e69..23e0a98 100644
--- a/plugins/org.polarsys.chess.core/.classpath
+++ b/plugins/org.polarsys.chess.core/.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.6"/>
+ <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 excluding="it/unipd/chess/constraint/ExampleConstraintsLib.java" kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.core/.settings/org.eclipse.jdt.core.prefs
index c537b63..f42de36 100644
--- a/plugins/org.polarsys.chess.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.7
diff --git a/plugins/org.polarsys.chess.core/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.core/META-INF/MANIFEST.MF
index f55cfe4..1a7cb41 100644
--- a/plugins/org.polarsys.chess.core/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.core/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
Bundle-Version: 0.9.0.qualifier
Bundle-Activator: org.polarsys.chess.core.Activator
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.polarsys.chess.core,
org.polarsys.chess.core.constraint;uses:="org.eclipse.core.runtime,org.eclipse.emf.common.notify",
org.polarsys.chess.core.extensionpoint,
@@ -66,5 +66,5 @@
org.polarsys.chess.chessmlprofile,
org.eclipse.core.expressions,
org.eclipse.core.filesystem,
- org.eclipse.papyrus.emf.facet.custom.metamodel
-
+ org.eclipse.papyrus.emf.facet.custom.metamodel,
+ org.eclipse.gmf.tooling.runtime;bundle-version="3.3.0"
diff --git a/plugins/org.polarsys.chess.discovery/.classpath b/plugins/org.polarsys.chess.discovery/.classpath
index 64c5e31..098194c 100644
--- a/plugins/org.polarsys.chess.discovery/.classpath
+++ b/plugins/org.polarsys.chess.discovery/.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/J2SE-1.5"/>
+ <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="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.jdt.core.prefs
index af0f20f..f42de36 100644
--- a/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.discovery/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/plugins/org.polarsys.chess.discovery/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.discovery/META-INF/MANIFEST.MF
index 7d1531e..4915776 100644
--- a/plugins/org.polarsys.chess.discovery/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.discovery/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@
Bundle-Activator: org.polarsys.chess.discovery.Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.polarsys.chess.discovery;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/org.polarsys.chess.m2m/.classpath b/plugins/org.polarsys.chess.m2m/.classpath
index ad32c83..098194c 100644
--- a/plugins/org.polarsys.chess.m2m/.classpath
+++ b/plugins/org.polarsys.chess.m2m/.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.6"/>
+ <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="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.jdt.core.prefs
index 7ac39f2..f42de36 100644
--- a/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.m2m/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Aug 24 14:45:58 CEST 2011
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.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.7
diff --git a/plugins/org.polarsys.chess.m2m/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.m2m/META-INF/MANIFEST.MF
index 2cfb085..cc36c62 100644
--- a/plugins/org.polarsys.chess.m2m/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.m2m/META-INF/MANIFEST.MF
@@ -31,7 +31,7 @@
org.eclipse.emf.common,
org.eclipse.jface
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Vendor: Polarsys CHESS Project
Bundle-Name: PIM to PSM model transformations plug-in (Incubation)
Export-Package: org.polarsys.chess.m2m;
diff --git a/plugins/org.polarsys.chess.service/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.service/META-INF/MANIFEST.MF
index cd38f23..aa30db1 100644
--- a/plugins/org.polarsys.chess.service/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.service/META-INF/MANIFEST.MF
@@ -12,8 +12,9 @@
org.eclipse.papyrus.views.modelexplorer,
org.eclipse.papyrus.emf.facet.custom.metamodel,
org.eclipse.uml2.uml,
- org.eclipse.emf.cdo.ui.ide
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ org.eclipse.ui.ide;bundle-version="3.11.0",
+ org.eclipse.emf.common.ui
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.polarsys.chess.service.internal.utils;x-internal:=true,
org.polarsys.chess.service.utils;
uses:="org.eclipse.ui,
diff --git a/plugins/org.polarsys.chess.validator/.classpath b/plugins/org.polarsys.chess.validator/.classpath
index ad32c83..098194c 100644
--- a/plugins/org.polarsys.chess.validator/.classpath
+++ b/plugins/org.polarsys.chess.validator/.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.6"/>
+ <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="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.validator/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.validator/.settings/org.eclipse.jdt.core.prefs
index 8a5c6c7..f42de36 100644
--- a/plugins/org.polarsys.chess.validator/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.validator/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Fri Apr 15 14:43:26 CEST 2011
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.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
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.7
diff --git a/plugins/org.polarsys.chess.validator/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.validator/META-INF/MANIFEST.MF
index f8aae05..f5c6ac2 100644
--- a/plugins/org.polarsys.chess.validator/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.validator/META-INF/MANIFEST.MF
@@ -20,9 +20,10 @@
org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.eclipse.papyrus.infra.services.validation;bundle-version="1.0.0",
- org.polarsys.chess.service
+ org.polarsys.chess.service,
+ org.eclipse.gmf.tooling.runtime;bundle-version="3.3.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Vendor: Polarsys CHESS Project
Export-Package: org.polarsys.chess.validator;
uses:="org.eclipse.core.runtime,
diff --git a/plugins/org.polarsys.chess.wizards/.classpath b/plugins/org.polarsys.chess.wizards/.classpath
index 64c5e31..098194c 100644
--- a/plugins/org.polarsys.chess.wizards/.classpath
+++ b/plugins/org.polarsys.chess.wizards/.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/J2SE-1.5"/>
+ <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="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.jdt.core.prefs b/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.jdt.core.prefs
index d30a554..7341ab1 100644
--- a/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.polarsys.chess.wizards/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,11 @@
-#Wed May 25 16:49:25 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
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.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/plugins/org.polarsys.chess.wizards/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.wizards/META-INF/MANIFEST.MF
index 157c21c..52e3579 100644
--- a/plugins/org.polarsys.chess.wizards/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.wizards/META-INF/MANIFEST.MF
@@ -31,5 +31,5 @@
Bundle-ManifestVersion: 2
Bundle-Activator: org.polarsys.chess.wizards.Activator
Bundle-SymbolicName: org.polarsys.chess.wizards;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CreateCHESSModelWizard.java b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CreateCHESSModelWizard.java
index 1db7e1a..3268fe4 100644
--- a/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CreateCHESSModelWizard.java
+++ b/plugins/org.polarsys.chess.wizards/src/org/polarsys/chess/wizards/wizards/CreateCHESSModelWizard.java
@@ -48,11 +48,11 @@
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.core.utils.EditorUtils;
-import org.eclipse.papyrus.uml.diagram.wizards.SettingsHelper;
import org.eclipse.papyrus.uml.diagram.wizards.category.DiagramCategoryDescriptor;
import org.eclipse.papyrus.uml.diagram.wizards.category.DiagramCategoryRegistry;
import org.eclipse.papyrus.uml.diagram.wizards.category.NewPapyrusModelCommand;
import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
+import org.eclipse.papyrus.uml.diagram.wizards.utils.SettingsHelper;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
