Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2019-12-03 12:50:36 +0000
committerEd Willink2019-12-03 12:50:36 +0000
commit0fc689dbceaf4753720d2f40a612813a270f54c3 (patch)
tree0f61ca34fcf0a21fe5f469e33432e49bae5dec1a
parent4220420df77276bfc5aa40e8ed68ccbd46e67f53 (diff)
downloadorg.eclipse.qvtd-0fc689dbceaf4753720d2f40a612813a270f54c3.tar.gz
org.eclipse.qvtd-0fc689dbceaf4753720d2f40a612813a270f54c3.tar.xz
org.eclipse.qvtd-0fc689dbceaf4753720d2f40a612813a270f54c3.zip
ok
-rw-r--r--plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/Edge.java3
-rw-r--r--plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/Node.java2
-rw-r--r--plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/EdgeImpl.java20
-rw-r--r--plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/NodeImpl.java10
4 files changed, 4 insertions, 31 deletions
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/Edge.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/Edge.java
index 40d599845..ea9c9958c 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/Edge.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/Edge.java
@@ -309,9 +309,6 @@ public interface Edge extends Element, org.eclipse.ocl.pivot.utilities.Nameable,
* *deprecated try to use isUnconditional or getUtility
*/
boolean isMatched();
- boolean isMatchedCtor();
- boolean isMatchedAsMatchedUtility();
- boolean isMatchedAsNonNullMatchedUtility();
/**
* Return true if this edge is for a speculation/realized relationship.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/Node.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/Node.java
index 1f7e79091..52afdae4f 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/Node.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/Node.java
@@ -445,9 +445,7 @@ public interface Node extends Element, ConnectionEnd, org.eclipse.ocl.pivot.util
*/
@Deprecated /* @deprecated use initUtility */
boolean isMatched();
- boolean isMatchedCtor();
boolean isMatchedAsMatchedUtility();
- boolean isMatchedAsNonNullMatchedUtility();
/**
* Return true if this node is for a speculation/realized element.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/EdgeImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/EdgeImpl.java
index d0dd1fd57..10b2c6d0c 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/EdgeImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/EdgeImpl.java
@@ -834,22 +834,10 @@ public abstract class EdgeImpl extends ElementImpl implements Edge {
@Override
public final boolean isMatched() {
- return QVTscheduleUtil.getSourceNode(this).isMatched() && QVTscheduleUtil.getTargetNode(this).isMatched();
- }
-
- @Override
- public boolean isMatchedCtor() {
- return isMatched();
- }
-
- @Override
- public boolean isMatchedAsMatchedUtility() {
- return initUtility.isMatchedAsMatchedUtility();
- }
-
- @Override
- public boolean isMatchedAsNonNullMatchedUtility() {
- return initUtility.isMatchedAsNonNullMatchedUtility();
+ boolean matchedSource = QVTscheduleUtil.getSourceNode(this).isMatched();
+ boolean matchedTarget = QVTscheduleUtil.getTargetNode(this).isMatched();
+ boolean utilityMatched = initUtility.isMatchedAsMatchedUtility();
+ return matchedSource && matchedTarget;
}
@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/NodeImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/NodeImpl.java
index 17c60fbfd..f35bb8dee 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/NodeImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/NodeImpl.java
@@ -1002,21 +1002,11 @@ public abstract class NodeImpl extends ElementImpl implements Node {
}
@Override
- public boolean isMatchedCtor() {
- return isMatched();
- }
-
- @Override
public boolean isMatchedAsMatchedUtility() {
return initUtility.isMatchedAsMatchedUtility();
}
@Override
- public boolean isMatchedAsNonNullMatchedUtility() {
- return initUtility.isMatchedAsNonNullMatchedUtility();
- }
-
- @Override
public boolean isNew() {
assert nodeRole != null;
return nodeRole.isNew();

Back to the top