Fix validation issue and the oxygen TP

ObeoNetwork · May 30, 2017 · 450de0a · 450de0a
1 parent 1e8b74d
commit 450de0a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign b/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign
@@ -6335,7 +6335,7 @@
     <categories name="PR_General">
       <pages name="PR_GeneralPage" labelExpression="General" semanticCandidateExpression="var:self" groups="//@extensions.0/@categories.0/@groups.0 //@extensions.0/@categories.0/@groups.1 //@extensions.0/@categories.0/@groups.2 //@extensions.0/@categories.0/@groups.3 //@extensions.0/@categories.0/@groups.4 //@extensions.0/@categories.0/@groups.5 //@extensions.0/@categories.0/@groups.6 //@extensions.0/@categories.0/@groups.7 //@extensions.0/@categories.0/@groups.8"/>
       <groups name="PR_GeneralGroup" labelExpression="General" semanticCandidateExpression="var:self">
-        <controls xsi:type="properties:DynamicMappingForDescription" name="GeneralDynamicMapping" iterator="eStructuralFeature" iterableExpression="aql:self.eClass().eAllStructuralFeatures->select(EStructuralFeature feature | feature.isGeneralFeature(self))">
+        <controls xsi:type="properties:DynamicMappingForDescription" name="GeneralDynamicMapping" iterator="eStructuralFeature" iterableExpression="aql:self.eClass().eAllStructuralFeatures->select(feature | feature.isGeneralFeature(self))">
           <ifs name="general_mono_string_if" predicateExpression="aql:input.emfEditServices(self).needsTextWidget(eStructuralFeature) and not input.emfEditServices(self).isMultiline(eStructuralFeature)">
             <extends href="platform:/plugin/org.eclipse.sirius.properties.defaultrules/model/properties.odesign#//@extensions.0/@categories.0/@groups.0/@controls.0/@ifs.0"/>
           </ifs>

diff --git a/releng/org.obeonetwork.dsl.uml2.target/umldesigner-oxygen.target b/releng/org.obeonetwork.dsl.uml2.target/umldesigner-oxygen.target
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="UML Designer Oxygen" sequenceNumber="1494856177">
+<target name="UML Designer Oxygen" sequenceNumber="1496129542">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.amalgam.discovery.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.amalgam.explorer.activity.feature.group" version="0.0.0"/>
       <repository location="http://download.eclipse.org/modeling/amalgam/updates/nightly/1.8.x/oxygen"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.uml2.uml.feature.group" version="5.2.0.v20160516-0939"/>
-      <unit id="org.eclipse.uml2.uml.edit.feature.group" version="5.2.0.v20160516-0939"/>
-      <unit id="org.eclipse.uml2.feature.group" version="5.2.0.v20160516-0939"/>
+      <unit id="org.eclipse.uml2.uml.feature.group" version="5.3.0.v20170522-1938"/>
+      <unit id="org.eclipse.uml2.uml.edit.feature.group" version="5.3.0.v20170522-1938"/>
+      <unit id="org.eclipse.uml2.feature.group" version="5.3.0.v20170522-1938"/>
       <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.edit.feature.group" version="2.12.0.v20170313-0823"/>
+      <unit id="org.eclipse.emf.edit.feature.group" version="2.12.0.v20170504-0807"/>
       <unit id="org.eclipse.emf.mapping.ecore.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.importer.ecore" version="0.0.0"/>
       <unit id="org.eclipse.core.runtime.feature.feature.group" version="0.0.0"/>

diff --git a/releng/org.obeonetwork.dsl.uml2.target/umldesigner-oxygen.tpd b/releng/org.obeonetwork.dsl.uml2.target/umldesigner-oxygen.tpd
@@ -21,9 +21,9 @@ location "http://download.eclipse.org/modeling/amalgam/updates/nightly/1.8.x/oxy
 // UML
 
 location "http://download.eclipse.org/releases/oxygen/" {
-	org.eclipse.uml2.uml.feature.group [5.2.0,5.3.0)
-	org.eclipse.uml2.uml.edit.feature.group [5.2.0,5.3.0)
-	org.eclipse.uml2.feature.group [5.2.0,5.3.0)
+	org.eclipse.uml2.uml.feature.group [5.3.0,5.4.0)
+	org.eclipse.uml2.uml.edit.feature.group [5.3.0,5.4.0)
+	org.eclipse.uml2.feature.group [5.3.0,5.4.0)
 }
 
 // Orbit