Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe DUL2019-07-16 07:42:00 -0400
committerOlivier Constant2019-07-16 10:37:27 -0400
commite53126a682570090ceae9bf5fa3282c15c0a7e82 (patch)
treefa7543844039a4e808626d03062f00d4c6d3876e
parentf8dd6cbd83a9f55c75963c02c3c04a0e595ea121 (diff)
downloadorg.eclipse.emf.diffmerge.core-e53126a682570090ceae9bf5fa3282c15c0a7e82.tar.gz
org.eclipse.emf.diffmerge.core-e53126a682570090ceae9bf5fa3282c15c0a7e82.tar.xz
org.eclipse.emf.diffmerge.core-e53126a682570090ceae9bf5fa3282c15c0a7e82.zip
[releng] Update Sirius version to 6.3.0-S20190716-100145
Change-Id: I9939d5cc3fd5023c75105603003406f9a3eece43 Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMatchPolicy.java10
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java31
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target77
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd6
4 files changed, 72 insertions, 52 deletions
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMatchPolicy.java b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMatchPolicy.java
index b17b3dd8..ef8bf85f 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMatchPolicy.java
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusMatchPolicy.java
@@ -62,7 +62,6 @@ public class SiriusMatchPolicy extends GMFMatchPolicy {
org.eclipse.sirius.diagram.description.DescriptionPackage.eINSTANCE
);
-
/**
* Default constructor
*/
@@ -157,8 +156,13 @@ public class SiriusMatchPolicy extends GMFMatchPolicy {
result = viewpoint.getName();
} else if (element_p instanceof DRepresentationDescriptor) {
result = ((DRepresentationDescriptor) element_p).getName();
- } else if (element_p instanceof DRepresentation) {
- result = ((DRepresentation) element_p).getName();
+ } else if (element_p instanceof DRepresentation && scope_p instanceof SiriusScope) {
+ SiriusScope scope = (SiriusScope)scope_p;
+ DRepresentationDescriptor descriptor =
+ scope.getRepresentationDescriptor((DRepresentation) element_p);
+ if (descriptor != null) {
+ result = descriptor.getName();
+ }
} else if (element_p instanceof AnnotationEntry) {
AnnotationEntry annotation = (AnnotationEntry) element_p;
if (annotation.getSource() != null) {
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java
index a19e12ff..44a4d269 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java
@@ -143,16 +143,7 @@ public class SiriusScope extends GMFScope {
}
EObject basicContainer = super.getContainer(element_p);
if (element_p instanceof DRepresentation && basicContainer == null) {
- DRepresentation representation = (DRepresentation)element_p;
- String repID = representation.getUid();
- result = _idToDescriptor.get(repID);
- if (result == null) {
- DRepresentationQuery rep2descQuery = new DRepresentationQuery((DRepresentation)element_p);
- result = rep2descQuery.getRepresentationDescriptor();
- if (result != null) {
- registerRepresentationDescriptor((DRepresentationDescriptor)result);
- }
- }
+ result = getRepresentationDescriptor((DRepresentation)element_p);
} else {
result = basicContainer;
}
@@ -250,6 +241,26 @@ public class SiriusScope extends GMFScope {
}
/**
+ * Return the descriptor of the given representation, if any and known
+ * @param representation_p a non-null representation
+ * @return a potentially null representation descriptor
+ */
+ public DRepresentationDescriptor getRepresentationDescriptor(
+ DRepresentation representation_p) {
+ DRepresentationDescriptor result;
+ String repID = representation_p.getUid();
+ result = _idToDescriptor.get(repID);
+ if (result == null) {
+ DRepresentationQuery rep2descQuery = new DRepresentationQuery(representation_p);
+ result = rep2descQuery.getRepresentationDescriptor();
+ if (result != null) {
+ registerRepresentationDescriptor(result);
+ }
+ }
+ return result;
+ }
+
+ /**
* Return a session resource of the scope, if any
* @return a potentially null resource
*/
diff --git a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
index cdc78198..523de5a2 100644
--- a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
+++ b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
@@ -1,37 +1,40 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="org.eclipse.emf.diffmerge" sequenceNumber="1542096232">
- <locations>
- <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.8"/>
- </location>
- <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
- <repository location="http://download.eclipse.org/cbi/updates/license/"/>
- </location>
- <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.gef" version="0.0.0"/>
- <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.gmf.runtime.notation.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
- <unit id="com.google.guava" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/photon"/>
- </location>
- </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="org.eclipse.emf.diffmerge" sequenceNumber="1563277297">
+ <locations>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.8"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/cbi/updates/license/"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gef" version="0.0.0"/>
+ <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation.feature.group" version="0.0.0"/>
+ <unit id="com.google.guava" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/releases/photon"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/sirius/updates/stable/6.3.0-S20190716-100145/2019-06"/>
+ </location>
+ </locations>
+</target>
diff --git a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd
index 8d52bcca..721058b3 100644
--- a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd
+++ b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.tpd
@@ -7,7 +7,7 @@ location "http://download.eclipse.org/eclipse/updates/4.8" {
}
location "http://download.eclipse.org/cbi/updates/license/" {
- org.eclipse.license.feature.group [1.0.1,1.0.2)
+ org.eclipse.license.feature.group lazy
}
location "http://download.eclipse.org/releases/photon" {
@@ -26,6 +26,8 @@ location "http://download.eclipse.org/releases/photon" {
org.eclipse.emf.validation.sdk.feature.group lazy
org.eclipse.gmf.runtime.sdk.feature.group lazy
org.eclipse.gmf.runtime.notation.feature.group lazy
- org.eclipse.sirius.specifier.feature.group lazy
com.google.guava lazy
}
+location "https://download.eclipse.org/sirius/updates/stable/6.3.0-S20190716-100145/2019-06" {
+ org.eclipse.sirius.specifier.feature.group lazy
+} \ No newline at end of file

Back to the top