diff options
| author | Ed Willink | 2020-02-25 17:30:18 +0000 |
|---|---|---|
| committer | Ed Willink | 2020-02-25 17:30:18 +0000 |
| commit | 4d7293f535ce0de9d8376171028bb5939cc043ef (patch) | |
| tree | 8bd92bc7487b3d5749b59781ee4d992b83995a06 | |
| parent | ffb6195cf194b8ba6cdac9f5ee333e815bdd4980 (diff) | |
| download | org.eclipse.qvtd-4d7293f535ce0de9d8376171028bb5939cc043ef.tar.gz org.eclipse.qvtd-4d7293f535ce0de9d8376171028bb5939cc043ef.tar.xz org.eclipse.qvtd-4d7293f535ce0de9d8376171028bb5939cc043ef.zip | |
[513375] Re-instate Collection-typed connections
| -rw-r--r-- | plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtb2qvts/OriginalContentsAnalysis.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtb2qvts/OriginalContentsAnalysis.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtb2qvts/OriginalContentsAnalysis.java index df7612563..120af2b22 100644 --- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtb2qvts/OriginalContentsAnalysis.java +++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtb2qvts/OriginalContentsAnalysis.java @@ -27,6 +27,7 @@ import org.eclipse.qvtd.compiler.internal.qvts2qvts.RegionsAnalysis; import org.eclipse.qvtd.compiler.internal.qvts2qvts.analysis.PartialRegionAnalysis; import org.eclipse.qvtd.compiler.internal.qvts2qvts.analysis.PartialRegionClassAnalysis; import org.eclipse.qvtd.pivot.qvtschedule.ClassDatum; +import org.eclipse.qvtd.pivot.qvtschedule.CollectionClassDatum; import org.eclipse.qvtd.pivot.qvtschedule.Edge; import org.eclipse.qvtd.pivot.qvtschedule.NavigableEdge; import org.eclipse.qvtd.pivot.qvtschedule.NavigationEdge; @@ -396,11 +397,11 @@ public class OriginalContentsAnalysis if (QVTscheduleUtil.conformsToClassOrBehavioralClass(realizedClassDatum, elementalTargetClassDatum)) { matches = true; } - // else if (requiredClassDatum.isCollectionType()) { - // if (QVTscheduleUtil.conformsToClassOrBehavioralClass(realizedClassDatum, QVTscheduleUtil.getElementalClassDatum(((CollectionClassDatum)requiredClassDatum)))) { - // matches = true; - // } - // } + else if (realizedClassDatum.isCollectionType()) { + if (QVTscheduleUtil.conformsToClassOrBehavioralClass(QVTscheduleUtil.getElementalClassDatum((CollectionClassDatum)realizedClassDatum), elementalTargetClassDatum)) { + matches = true; + } + } } if (matches) { if (conformantRealizedEdges == null) { |