From c08a03295ac21dc21febf1265b161f67c3a93ced Mon Sep 17 00:00:00 2001 From: Moritz Eysholdt Date: Thu, 31 Jan 2013 11:10:39 +0100 Subject: [PATCH] [trace] be able to handle multiple associated LocationDatas --- .../generator/trace/AbstractTraceRegion.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java index 1c52492bf..722af8f89 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/AbstractTraceRegion.java @@ -344,10 +344,17 @@ public abstract class AbstractTraceRegion { return result; } } - if (parent != null && getAssociatedLocations().size() == 1) { - return parent.getAssociatedPath(); - } - return null; + if (parent == null) + return null; + boolean uriSeen = false; + for (ILocationData associated : getAssociatedLocations()) + if (associated.getPath() != null) { + if (!uriSeen) + uriSeen = true; + else + return null; + } + return parent.getAssociatedPath(); } @Nullable