diff options
author | 2017-07-17 14:46:02 +0200 | |
---|---|---|
committer | 2017-07-18 09:47:36 +0200 | |
commit | 90ed84c0d9b48b7474b7cba3994561ecec9fe858 (patch) | |
tree | 7a602ea9291503c5a2cc05a4912067d783353428 /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java | |
parent | 88518522a18df5788736be6151fc67992efe2aad (diff) |
Remove ParseFailureListener in favor of posting to EventBus directly
We now have the ExtendedEventHandler, which is available in all the relevant
code paths, so we just post the event directly.
PiperOrigin-RevId: 162200923
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java index af3450e765..dccc1eff74 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java @@ -24,7 +24,7 @@ import com.google.devtools.build.lib.events.ExtendedEventHandler; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.pkgcache.FilteringPolicies; import com.google.devtools.build.lib.pkgcache.FilteringPolicy; -import com.google.devtools.build.lib.pkgcache.ParseFailureListener; +import com.google.devtools.build.lib.pkgcache.ParsingFailedEvent; import com.google.devtools.build.lib.pkgcache.TargetPatternEvaluator; import com.google.devtools.build.lib.skyframe.TargetPatternValue.TargetPatternSkyKeyOrException; import com.google.devtools.build.lib.util.Preconditions; @@ -115,9 +115,7 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator { } String pattern = skyKeyOrException.getOriginalPattern(); eventHandler.handle(Event.error("Skipping '" + pattern + "': " + e.getMessage())); - if (eventHandler instanceof ParseFailureListener) { - ((ParseFailureListener) eventHandler).parsingError(pattern, e.getMessage()); - } + eventHandler.post(new ParsingFailedEvent(pattern, e.getMessage())); } } ImmutableList<SkyKey> skyKeys = builder.build(); @@ -188,10 +186,7 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator { } finalTargetSetEvaluator.setError(); - if (eventHandler instanceof ParseFailureListener) { - ParseFailureListener parseListener = (ParseFailureListener) eventHandler; - parseListener.parsingError(rawPattern, errorMessage); - } + eventHandler.post(new ParsingFailedEvent(rawPattern, errorMessage)); } } |