[547247] Trim debugewillink/547263

6 files changed, 36 insertions, 64 deletions

diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtb2qvts/trace/TracedHeadAnalysis.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtb2qvts/trace/TracedHeadAnalysis.java
index da4985d0f..80decd42c 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtb2qvts/trace/TracedHeadAnalysis.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtb2qvts/trace/TracedHeadAnalysis.java
@@ -50,10 +50,7 @@ public class TracedHeadAnalysis extends HeadAnalysis
 	 * This computation has no side effects.
 	 */
 	public static @NonNull List<@NonNull HeadNodeGroup> computeTraceHeadGroupNodes(@NonNull ScheduleManager scheduleManager, @NonNull MappingRegion mappingRegion) {
-		String name = mappingRegion.getName();
-		if ("mapInPattern_qvtr".equals(name)) {
-			scheduleManager.getClass();
-		}
+		//	String name = mappingRegion.getName();
 		TracedHeadAnalysis mappingRegionAnalysis = new TracedHeadAnalysis(mappingRegion);
 		Map<@NonNull Node, @NonNull Set<@NonNull Node>> targetFromSources = mappingRegionAnalysis.computeTracedTargetFromSources();
 		if (TRACED_HEAD_IMMEDIATE_SOURCES.isActive()) {
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/RelationAnalysis.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/RelationAnalysis.java
index a78764528..938991ebe 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/RelationAnalysis.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/RelationAnalysis.java
@@ -473,10 +473,7 @@ public class RelationAnalysis extends RuleAnalysis
 			if (eObject instanceof RelationCallExp) {
 				RelationCallExp relationInvocation = (RelationCallExp) eObject;
 				RelationAnalysis invokedRelationAnalysis = (RelationAnalysis) transformationAnalysis.getRuleAnalysis(QVTrelationUtil.getReferredRelation(relationInvocation));
-				String name= invokedRelationAnalysis.getName();
-				if ("mapVariable_qvtr".equals(name)) {
-					getClass();
-				}
+				//	String name= invokedRelationAnalysis.getName();
 				Pattern pattern = QVTrelationUtil.basicGetContainingPattern(eObject);
 				if ((pattern != null) && (pattern.eContainmentFeature() == QVTrelationPackage.Literals.RELATION__WHERE)) {
 					invokedRelationAnalysis.addIncomingWhereRelation(relationInvocation);
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/trace/RelationAnalysis2TraceClass.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/trace/RelationAnalysis2TraceClass.java
index 05394542b..512375abe 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/trace/RelationAnalysis2TraceClass.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/trace/RelationAnalysis2TraceClass.java
@@ -126,10 +126,7 @@ public class RelationAnalysis2TraceClass extends AbstractRelationAnalysis2Middle
 	} */
 
 	protected void analyzePatternNodes(@NonNull List<@NonNull HeadNodeGroup> headNodeGroups) {
-		String name = relation.getName();
-		if ("mapInPattern_filter".equals(name)) {
-			getClass();
-		}
+		//	String name = relation.getName();
 		boolean manyTracesPerHead = headNodeGroups.size() > 2;
 		Set<@NonNull Node> allHeadGroupNodes = new HashSet<>();
 		for (@NonNull HeadNodeGroup headNodeGroup : headNodeGroups) {
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/EdgeConnectionImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/EdgeConnectionImpl.java
index 341e741e7..73408874b 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/EdgeConnectionImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/EdgeConnectionImpl.java
@@ -230,7 +230,7 @@ public class EdgeConnectionImpl extends ConnectionImpl implements EdgeConnection
 		switch (featureID) {
 			case ElementImpl.ELEMENT_FEATURE_COUNT + 7:
 				if (resolve) return getReferredProperty();
-				return basicGetReferredProperty();
+			return basicGetReferredProperty();
 			case ElementImpl.ELEMENT_FEATURE_COUNT + 8:
 				return getMandatoryTargetEdges();
 			case ElementImpl.ELEMENT_FEATURE_COUNT + 9:
@@ -250,15 +250,15 @@ public class EdgeConnectionImpl extends ConnectionImpl implements EdgeConnection
 		switch (featureID) {
 			case ElementImpl.ELEMENT_FEATURE_COUNT + 7:
 				setReferredProperty((Property)newValue);
-				return;
+			return;
 			case ElementImpl.ELEMENT_FEATURE_COUNT + 8:
 				getMandatoryTargetEdges().clear();
-				getMandatoryTargetEdges().addAll((Collection<? extends NavigableEdge>)newValue);
-				return;
+			getMandatoryTargetEdges().addAll((Collection<? extends NavigableEdge>)newValue);
+			return;
 			case ElementImpl.ELEMENT_FEATURE_COUNT + 9:
 				getPreferredTargetEdges().clear();
-				getPreferredTargetEdges().addAll((Collection<? extends NavigableEdge>)newValue);
-				return;
+			getPreferredTargetEdges().addAll((Collection<? extends NavigableEdge>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -273,13 +273,13 @@ public class EdgeConnectionImpl extends ConnectionImpl implements EdgeConnection
 		switch (featureID) {
 			case ElementImpl.ELEMENT_FEATURE_COUNT + 7:
 				setReferredProperty((Property)null);
-				return;
+			return;
 			case ElementImpl.ELEMENT_FEATURE_COUNT + 8:
 				getMandatoryTargetEdges().clear();
-				return;
+			return;
 			case ElementImpl.ELEMENT_FEATURE_COUNT + 9:
 				getPreferredTargetEdges().clear();
-				return;
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -322,14 +322,6 @@ public class EdgeConnectionImpl extends ConnectionImpl implements EdgeConnection
 		return false;
 	}
 
-	@Override
-	public void setName(String newName) {
-		if ("je_Telement2element_success_1".equals(newName)) {
-			getClass();
-		}
-		super.setName(newName);
-	}
-
 	private final @NonNull Map<@NonNull NavigableEdge, @NonNull ConnectionRole> targetEnd2role = new HashMap<>();
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PropertyDatumImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PropertyDatumImpl.java
index e098ebf91..2e0369b3c 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PropertyDatumImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PropertyDatumImpl.java
@@ -307,7 +307,7 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetOwningClassDatum((ClassDatum)otherEnd, msgs);
+			return basicSetOwningClassDatum((ClassDatum)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -350,12 +350,12 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu
 		switch (featureID) {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 1:
 				if (resolve) return getOpposite();
-				return basicGetOpposite();
+			return basicGetOpposite();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				return getOwningClassDatum();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 3:
 				if (resolve) return getReferredProperty();
-				return basicGetReferredProperty();
+			return basicGetReferredProperty();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				return getSuperPropertyDatums();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
@@ -375,20 +375,20 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu
 		switch (featureID) {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 1:
 				setOpposite((PropertyDatum)newValue);
-				return;
+			return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				setOwningClassDatum((ClassDatum)newValue);
-				return;
+			return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 3:
 				setReferredProperty((Property)newValue);
-				return;
+			return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				getSuperPropertyDatums().clear();
-				getSuperPropertyDatums().addAll((Collection<? extends PropertyDatum>)newValue);
-				return;
+			getSuperPropertyDatums().addAll((Collection<? extends PropertyDatum>)newValue);
+			return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
 				setKey((Boolean)newValue);
-				return;
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -403,19 +403,19 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu
 		switch (featureID) {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 1:
 				setOpposite((PropertyDatum)null);
-				return;
+			return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				setOwningClassDatum((ClassDatum)null);
-				return;
+			return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 3:
 				setReferredProperty((Property)null);
-				return;
+			return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				getSuperPropertyDatums().clear();
-				return;
+			return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
 				setKey(KEY_EDEFAULT);
-				return;
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -456,13 +456,4 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu
 	public String toString() {
 		return String.valueOf(getOwningClassDatum()) + "::" + (referredProperty != null ? referredProperty.getName() : "<null>");
 	}
-
-	@Override
-	public void setName(String newName) {
-		if ("oclContainer".equals(newName)) {
-			getClass();
-		}
-		super.setName(newName);
-	}
-
 } //PropertyDatumImpl
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
index 9f716c800..a84312dbc 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
@@ -43,9 +43,7 @@ import org.eclipse.qvtd.compiler.DefaultCompilerOptions;
 import org.eclipse.qvtd.compiler.QVTrCompilerChain;
 import org.eclipse.qvtd.compiler.internal.qvtb2qvts.ConnectivityChecker;
 import org.eclipse.qvtd.compiler.internal.qvtb2qvts.ScheduleManager;
-import org.eclipse.qvtd.compiler.internal.qvtb2qvts.trace.TracedHeadAnalysis;
 import org.eclipse.qvtd.compiler.internal.qvtm2qvts.QVTm2QVTs;
-import org.eclipse.qvtd.compiler.internal.qvts2qvts.partitioner.TransformationPartitioner;
 import org.eclipse.qvtd.pivot.qvtbase.utilities.QVTbaseUtil;
 import org.eclipse.qvtd.pivot.qvtimperative.ImperativeTransformation;
 import org.eclipse.qvtd.pivot.qvtimperative.evaluation.Execution2GraphVisitor;
@@ -294,8 +292,8 @@ public class QVTrCompilerTests extends LoadTestCase
 		//	TransformationPartitioner.MERGE_SEQUENTIAL.setState(true);
 		//		QVTiProductionConsumption.SUMMARY.setState(true);
 		//		QVTm2QVTs.DUMP_CLASS_TO_CONSUMING_NODES.setState(true);
-		TracedHeadAnalysis.TRACED_HEAD_NODE_GROUPS.setState(true);
-		TracedHeadAnalysis.TRACED_HEAD_IMMEDIATE_SOURCES.setState(true);
+		//	TracedHeadAnalysis.TRACED_HEAD_NODE_GROUPS.setState(true);
+		//	TracedHeadAnalysis.TRACED_HEAD_IMMEDIATE_SOURCES.setState(true);
 		//	RuleHeadAnalysis.RULE_HEAD_NODE_GROUPS.setState(true);
 		//	TransformationPartitioner.PARTITION_IMMEDIATE_PREDECESSORS.setState(true);
 		//	TransformationPartitioner.PARTITION_TRANSITIVE_PREDECESSORS.setState(true);
@@ -1101,15 +1099,15 @@ public class QVTrCompilerTests extends LoadTestCase
 		//		AbstractTransformer.EXCEPTIONS.setState(true);
 		//		AbstractTransformer.INVOCATIONS.setState(true);
 		//   	QVTm2QVTp.PARTITIONING.setState(true);
-		TracedHeadAnalysis.TRACED_HEAD_NODE_GROUPS.setState(true);
-		TransformationPartitioner.PARTITION_IMMEDIATE_PREDECESSORS.setState(true);
-		TransformationPartitioner.PARTITION_TRANSITIVE_PREDECESSORS.setState(true);
-		TransformationPartitioner.PARTITION_TRANSITIVE_SUCCESSORS.setState(true);
-		TransformationPartitioner.REGION_IMMEDIATE_PREDECESSORS.setState(true);
-		TransformationPartitioner.REGION_TRANSITIVE_PREDECESSORS.setState(true);
-		TransformationPartitioner.REGION_TRANSITIVE_SUCCESSORS.setState(true);
+		//	TracedHeadAnalysis.TRACED_HEAD_NODE_GROUPS.setState(true);
+		//	TransformationPartitioner.PARTITION_IMMEDIATE_PREDECESSORS.setState(true);
+		//	TransformationPartitioner.PARTITION_TRANSITIVE_PREDECESSORS.setState(true);
+		//	TransformationPartitioner.PARTITION_TRANSITIVE_SUCCESSORS.setState(true);
+		//	TransformationPartitioner.REGION_IMMEDIATE_PREDECESSORS.setState(true);
+		//	TransformationPartitioner.REGION_TRANSITIVE_PREDECESSORS.setState(true);
+		//	TransformationPartitioner.REGION_TRANSITIVE_SUCCESSORS.setState(true);
 		//	TransformationPartitioner.ROOT_SCHEDULE_PREDECESSORS.setState(true);
-		TransformationPartitioner.ROOT_SCHEDULE.setState(true);
+		//	TransformationPartitioner.ROOT_SCHEDULE.setState(true);
 		Class<? extends Transformer> txClass;
 		MyQVT myQVT1 = createQVT("MiToSiSimpleWithKeys", getModelsURI("mitosi/MiToSiSimpleWithKeys.qvtr"));
 		try {