diff options
author | Thomas Guiu | 2017-07-06 07:21:34 +0000 |
---|---|---|
committer | Thomas Guiu | 2017-07-06 07:23:47 +0000 |
commit | 0c7fc1d5fef02046d8356290682e689de32d6e58 (patch) | |
tree | 409b6ec200af02e05ead5d2a65558064d4f1c69d | |
parent | a859a0181edfc6435b8502a542bef9e2a09b6a74 (diff) | |
download | org.eclipse.emf.egf-0c7fc1d5fef02046d8356290682e689de32d6e58.tar.gz org.eclipse.emf.egf-0c7fc1d5fef02046d8356290682e689de32d6e58.tar.xz org.eclipse.emf.egf-0c7fc1d5fef02046d8356290682e689de32d6e58.zip |
[519279] Update to ecoretools 3.3
Bug: 519279
Change-Id: I990b8e4bd261a519a07784d2bd911f8bbeac9978
Signed-off-by: Thomas Guiu <thomas.guiu@soyatec.com>
3 files changed, 5 insertions, 4 deletions
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java index 192876869..52dcd29cb 100644 --- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java +++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2014 Thales Corporate Services S.A.S. + * Copyright (c) 2014, 2017 Thales Corporate Services S.A.S. * 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 @@ -108,7 +108,8 @@ public class CreateEdgeCommand extends RecordingCommand { /* create the mapping to edge targets map */ DDiagramElementSynchronizer elementSynchronizer = diagramSynchronizer.getElementSynchronizer(); Map<DiagramElementMapping, Collection<EdgeTarget>> mappingsToEdgeTargets = elementSynchronizer.computeMappingsToEdgeTargets(_session.getSelectedViewpoints(false)); - diagramSynchronizer.computeDecorations(mappingsToEdgeTargets, edgeToSemanticBasedDecoration, edgeToMappingBasedDecoration); +// TODO Fix me + //diagramSynchronizer.computeDecorations(mappingsToEdgeTargets, edgeToSemanticBasedDecoration, edgeToMappingBasedDecoration); final DiagramMappingsManager diagramMappingsManager = DiagramMappingsManagerRegistryImpl.INSTANCE.getDiagramMappingsManager(_session, _diagram); diff --git a/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/build.properties b/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/build.properties index 22b40feec..07bc0476b 100644 --- a/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/build.properties +++ b/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/build.properties @@ -45,7 +45,7 @@ workspace=${result}/workspace timestamp=${myTimestamp}
releaseName=oxygen
updateSiteURL=${eclipse.download.prefix}/releases/${releaseName}
-ecoretoolsSiteURL=${eclipse.download.prefix}/ecoretools/updates/milestones/3.3.0M6/oxygen/
+ecoretoolsSiteURL=${eclipse.download.prefix}/ecoretools/updates/milestones/3.3.0RC4/oxygen
siriusSiteURL=${eclipse.download.prefix}/sirius/updates/stable/5.0.0-S20170314-082819/oxygen/
eclipse.download.prefix=file:/home/data/httpd/download.eclipse.org
eclipse.staging.area=/shared/download-staging.priv/modeling/egf/
diff --git a/releng/org.eclipse.egf.releng2/model/buckminster-egf-oxygen.egfbuild b/releng/org.eclipse.egf.releng2/model/buckminster-egf-oxygen.egfbuild index 8e0fbd62c..d3096b540 100644 --- a/releng/org.eclipse.egf.releng2/model/buckminster-egf-oxygen.egfbuild +++ b/releng/org.eclipse.egf.releng2/model/buckminster-egf-oxygen.egfbuild @@ -2,7 +2,7 @@ <buildcore:Job xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:buildcore="http://www.eclipse.org/egf/1.0.1/buildcore" xmlns:builddeploy="http://www.eclipse.org/egf/1.0.0/builddeploy" xmlns:buildscm="http://www.eclipse.org/egf/1.0.0/buildscm" xmlns:buildstep="http://www.eclipse.org/egf/1.0.2/buildstep" xmi:id="_YKxagJY3Ed-1d-ajyQS7wg" name="buckminster-egf-oxygen">
<properties xmi:id="_Ba608JDeEeCFnfwF9_Ni3Q" key="releaseName" value="oxygen"/>
<properties xmi:id="_4KzZsQU3EeGaseR7kNQ8hw" key="updateSiteURL" value="${eclipse.download.prefix}/releases/${releaseName}"/>
- <properties xmi:id="_MGxhAOdwEeSQjKFw76jQug" key="ecoretoolsSiteURL" value="${eclipse.download.prefix}/ecoretools/updates/milestones/3.3.0M6/oxygen/"/>
+ <properties xmi:id="_MGxhAOdwEeSQjKFw76jQug" key="ecoretoolsSiteURL" value="${eclipse.download.prefix}/ecoretools/updates/milestones/3.3.0RC4/oxygen"/>
<properties xmi:id="_8pX3gOdyEeSQjKFw76jQug" key="siriusSiteURL" value="${eclipse.download.prefix}/sirius/updates/stable/5.0.0-S20170314-082819/oxygen/"/>
<properties xmi:id="_tGJ_cAYGEeGKhYHYG0ajnw" key="eclipse.download.prefix" value="file:/home/data/httpd/download.eclipse.org"/>
<properties xmi:id="_tgE7UAYGEeGKhYHYG0ajnw" key="eclipse.staging.area" value="/shared/download-staging.priv/modeling/egf/"/>
|