Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2020-06-28 20:23:14 +0000
committerEd Willink2020-06-28 22:47:00 +0000
commit0a6ee1876bd810fe4c3aa783905cc45889776438 (patch)
treedede8d18b83581e6b60e2d03b06215a11b5f3064
parent3857413ea5e459264c9b6421c7f79bfbdac1f3ef (diff)
downloadorg.eclipse.qvtd-0a6ee1876bd810fe4c3aa783905cc45889776438.tar.gz
org.eclipse.qvtd-0a6ee1876bd810fe4c3aa783905cc45889776438.tar.xz
org.eclipse.qvtd-0a6ee1876bd810fe4c3aa783905cc45889776438.zip
[564671] Fix input/output dialog selections
-rw-r--r--plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTDirectionalMainTab.java4
-rw-r--r--plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbaseUtil.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTDirectionalMainTab.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTDirectionalMainTab.java
index b0a246ee9..4abd3c98a 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTDirectionalMainTab.java
+++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTDirectionalMainTab.java
@@ -63,12 +63,12 @@ public abstract class QVTDirectionalMainTab<TX extends Transformation> extends D
Iterable<@NonNull TypedModel> modelParameters = QVTbaseUtil.getModelParameters(transformation);
TypedModel traceModel = QVTbaseUtil.basicGetTraceTypedModel(modelParameters);
for (@NonNull TypedModel typedModel : modelParameters) {
- if ((typedModel != traceModel) && ClassUtil.safeEquals(typedModel.getName(), directionName)) {
+ if (!typedModel.isIsPrimitive() && !typedModel.isIsThis() && !typedModel.isIsTrace() && (typedModel != traceModel) && ClassUtil.safeEquals(typedModel.getName(), directionName)) {
gatherOutputModels(outputModels, typedModel);
}
}
for (@NonNull TypedModel typedModel : modelParameters) {
- if ((typedModel != traceModel) && !outputModels.contains(typedModel)) {
+ if (!typedModel.isIsPrimitive() && !typedModel.isIsThis() && !typedModel.isIsTrace() && (typedModel != traceModel) && !outputModels.contains(typedModel)) {
inputModels.add(typedModel);
}
}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbaseUtil.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbaseUtil.java
index 8021f36f1..292e483c2 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbaseUtil.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/src/org/eclipse/qvtd/pivot/qvtbase/utilities/QVTbaseUtil.java
@@ -476,7 +476,7 @@ public class QVTbaseUtil extends PivotUtil
for (Domain domain : rule.getDomain()) {
TypedModel typedModel = domain.getTypedModel();
assert typedModel != null;
- if (domain.isNotOutput()) {
+ if (domain.isIsEnforceable()) {
enforceableTypedModels.add(typedModel);
}
else {

Back to the top