Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2018-05-22 23:41:47 -0400
committerEike Stepper2018-05-22 23:41:47 -0400
commit0664b0471e5b12aca1965fabd0b698c57ea42d70 (patch)
treebe127338c06643d80b42ac0e019dbdaf4e33882a
parent68e3bdebbe0028b6535b3f3c79d67fa17e53deaf (diff)
downloadcdo-0664b0471e5b12aca1965fabd0b698c57ea42d70.tar.gz
cdo-0664b0471e5b12aca1965fabd0b698c57ea42d70.tar.xz
cdo-0664b0471e5b12aca1965fabd0b698c57ea42d70.zip
[534791] Natively support GMF Notation instances (GMF4CDO)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=534791
-rw-r--r--plugins/org.eclipse.emf.cdo.gmf.notation/Migrate GMF Notation.launch2
-rw-r--r--plugins/org.eclipse.emf.cdo.gmf.notation/migrate.ant2
-rw-r--r--plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicDecorationNodeImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ViewImpl.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/Migrate GMF Notation.launch b/plugins/org.eclipse.emf.cdo.gmf.notation/Migrate GMF Notation.launch
index 365b66b83a..bfbe626500 100644
--- a/plugins/org.eclipse.emf.cdo.gmf.notation/Migrate GMF Notation.launch
+++ b/plugins/org.eclipse.emf.cdo.gmf.notation/Migrate GMF Notation.launch
@@ -12,6 +12,6 @@
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.gmf.notation"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.emf.cdo.gmf.notation/migrate.ant}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dgit.clone.gmf=C:\develop\gmf-master\git\org.eclipse.gmf.notation&#13;&#10;-DDDgit.clone.gmf=${git.clone.cdo}/../org.eclipse.gmf.notation&#13;&#10;-DDDtp.classpath=${targlet_container_classpath:Modular Target}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dgit.clone.gmf=C:\develop\cdo-master\git\org.eclipse.gmf.notation&#13;&#10;-DDDgit.clone.gmf=${git.clone.cdo}/../org.eclipse.gmf.notation&#13;&#10;-DDDtp.classpath=${targlet_container_classpath:Modular Target}"/>
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/migrate.ant b/plugins/org.eclipse.emf.cdo.gmf.notation/migrate.ant
index a9d697bf8a..3c52fc5884 100644
--- a/plugins/org.eclipse.emf.cdo.gmf.notation/migrate.ant
+++ b/plugins/org.eclipse.emf.cdo.gmf.notation/migrate.ant
@@ -56,7 +56,7 @@
Remove all 'NOT_CDO' markers from the source code to cause regeneration of a
few methods that must be handwritten in pure GMF only.
-->
- <delete failonerror="true" includeemptydirs="true">
+ <delete failonerror="false" includeemptydirs="true">
<fileset dir="${notation.tmp}">
<include name="**" />
</fileset>
diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicDecorationNodeImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicDecorationNodeImpl.java
index b4f4d9c783..95b46eab92 100644
--- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicDecorationNodeImpl.java
+++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/BasicDecorationNodeImpl.java
@@ -499,7 +499,7 @@ public class BasicDecorationNodeImpl extends org.eclipse.emf.cdo.ecore.impl.EMod
boolean persistedChildrenSet = eIsSet(NotationPackage.VIEW__PERSISTED_CHILDREN);
boolean transientChildrenSet = eIsSet(NotationPackage.VIEW__TRANSIENT_CHILDREN);
- if (persistedChildrenSet && transientChildrenSet)
+ if (!persistedChildrenSet && !transientChildrenSet)
{
return ECollections.EMPTY_ELIST;
}
diff --git a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ViewImpl.java b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ViewImpl.java
index 5374eb7b5f..b3ddbd7d4b 100644
--- a/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo.gmf.notation/src/org/eclipse/emf/cdo/gmf/notation/impl/ViewImpl.java
@@ -721,7 +721,7 @@ public abstract class ViewImpl extends org.eclipse.emf.cdo.ecore.impl.EModelElem
boolean persistedChildrenSet = eIsSet(NotationPackage.VIEW__PERSISTED_CHILDREN);
boolean transientChildrenSet = eIsSet(NotationPackage.VIEW__TRANSIENT_CHILDREN);
- if (persistedChildrenSet && transientChildrenSet)
+ if (!persistedChildrenSet && !transientChildrenSet)
{
return ECollections.EMPTY_ELIST;
}

Back to the top