diff options
author | Ed Willink | 2019-04-28 07:33:10 +0000 |
---|---|---|
committer | Ed Willink | 2019-04-28 07:33:32 +0000 |
commit | 2cc1bc0add0f84ce0846cb187fd080afb331a8ec (patch) | |
tree | bed1da7f8f7ec49d21eb02a858c25e8dda23d8ab | |
parent | 7a0ee6876301275942e9ef52bf268b524dfef24e (diff) | |
download | org.eclipse.qvtd-2cc1bc0add0f84ce0846cb187fd080afb331a8ec.tar.gz org.eclipse.qvtd-2cc1bc0add0f84ce0846cb187fd080afb331a8ec.tar.xz org.eclipse.qvtd-2cc1bc0add0f84ce0846cb187fd080afb331a8ec.zip |
[unrelated] Trim surious console output0.19.0M2
4 files changed, 9 insertions, 11 deletions
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/common/AbstractQVTc2QVTc.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/common/AbstractQVTc2QVTc.java index b6f821ac0..899f61492 100644 --- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/common/AbstractQVTc2QVTc.java +++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/common/AbstractQVTc2QVTc.java @@ -909,7 +909,7 @@ public abstract class AbstractQVTc2QVTc extends QVTcoreHelper // FIXME the following lines should go obsolete List<OperationCallExp> missingOperationCallSources = QVTbaseUtil.rewriteMissingOperationCallSources(environmentFactory, target); if (missingOperationCallSources != null) { - QVTruntimeUtil.errPrintln("Missing OperationCallExp sources were fixed up for '" + target.getURI() + "'"); + QVTruntimeUtil.errPrintln("Missing OperationCallExp sources were fixed up for '" + target.getURI() + "'"); } } diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtr/AbstractQVTr2QVTr.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtr/AbstractQVTr2QVTr.java index 7f2ac8bfe..ce6aaccb3 100644 --- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtr/AbstractQVTr2QVTr.java +++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtr/AbstractQVTr2QVTr.java @@ -912,7 +912,7 @@ public abstract class AbstractQVTr2QVTr extends QVTrelationHelper // F I X M E the following lines should go obsolete // List<OperationCallExp> missingOperationCallSources = QVTbaseUtil.rewriteMissingOperationCallSources(environmentFactory, target); // if (missingOperationCallSources != null) { - // QVTruntimeUtil.errPrintln("Missing OperationCallExp sources were fixed up for '" + target.getURI() + "'"); + // QVTruntimeUtil.errPrintln("Missing OperationCallExp sources were fixed up for '" + target.getURI() + "'"); // } } diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/models/misc/uml2rdbms.qvtu.qvtc b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/models/misc/uml2rdbms.qvtu.qvtc index 335b85d89..27f5ae619 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/models/misc/uml2rdbms.qvtu.qvtc +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/models/misc/uml2rdbms.qvtu.qvtc @@ -246,8 +246,8 @@ map packageToSchema in umlRdbms { else if ass.destination=dstCls and ass.source<>srcCls then ass.name+'_'+srcCls.name else dstCls.name+'_'+ass.name+'_'+srcCls.name endif endif endif; -- ass2fKey.name := name; - ass.name := if ass.destination=dstCls and ass.source=srcCls then name - else ass.name endif; +-- ass.name := if ass.destination=dstCls and ass.source=srcCls then name +-- else ass.name endif; fKey.name := ass.name; fCol.name := ass.name+'_tid'; -- diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java index beba91a18..a286e0311 100644 --- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java +++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java @@ -31,9 +31,7 @@ import org.eclipse.qvtd.compiler.CompilerOptions; import org.eclipse.qvtd.compiler.DefaultCompilerOptions; import org.eclipse.qvtd.compiler.QVTcCompilerChain; import org.eclipse.qvtd.compiler.internal.qvtb2qvts.ScheduleManager; -import org.eclipse.qvtd.compiler.internal.qvti.analysis.QVTiProductionConsumption; import org.eclipse.qvtd.compiler.internal.qvtm2qvts.QVTm2QVTs; -import org.eclipse.qvtd.compiler.internal.qvts2qvts.partitioner.TransformationPartitioner; import org.eclipse.qvtd.compiler.internal.qvts2qvts.splitter.Splitter; import org.eclipse.qvtd.pivot.qvtcore.utilities.QVTcore; import org.eclipse.qvtd.pivot.qvtimperative.ImperativeTransformation; @@ -431,11 +429,11 @@ public class QVTcCompilerTests extends LoadTestCase TransformationPartitioner.ROOT_SCHEDULE.setState(true); TransformationPartitioner.CYCLE_SCHEDULE_PREDECESSORS.setState(true); TransformationPartitioner.CYCLE_SCHEDULE.setState(true); */ - TransformationPartitioner.PARALLEL_SCHEDULE.setState(true); - TransformationPartitioner.PROPERTY_NOTIFY.setState(true); - TransformationPartitioner.PROPERTY_OBSERVE.setState(true); + // TransformationPartitioner.PARALLEL_SCHEDULE.setState(true); + // TransformationPartitioner.PROPERTY_NOTIFY.setState(true); + // TransformationPartitioner.PROPERTY_OBSERVE.setState(true); // TransformationPartitioner.MERGE_SEQUENTIAL.setState(true); - QVTiProductionConsumption.SUMMARY.setState(true); + // QVTiProductionConsumption.SUMMARY.setState(true); // OperationDependencyAnalysis.CALL.setState(true); // OperationDependencyAnalysis.CREATE.setState(true); @@ -562,7 +560,7 @@ public class QVTcCompilerTests extends LoadTestCase // AbstractMerger.EARLY.setState(true); // AbstractMerger.FAILURE.setState(true); // AbstractMerger.LATE.setState(true); - QVTiProductionConsumption.SUMMARY.setState(true); + // QVTiProductionConsumption.SUMMARY.setState(true); MyQVT myQVT = createQVT("upper2lower", getModelsURI("upper2lower/Upper2Lower.qvtcas")); // myQVT.getEnvironmentFactory().setEvaluationTracingEnabled(true); try { |