From 4399849dea9f3cc1c8b1828739a0dd7bedc1f730 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Wed, 30 Jul 2014 00:55:49 +0000 Subject: Revert "[HW6] Split processing and applying the event." This reverts commit 1db3d860ca0d7380c5a6a3a0f95751565f23043b. Reverting due to a few critical bugs and unit test failures. Change-Id: I5e2d02300320438ef9c29577ec5b0860ea91d822 --- java/src/com/android/inputmethod/event/CombinerChain.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'java/src/com/android/inputmethod/event/CombinerChain.java') diff --git a/java/src/com/android/inputmethod/event/CombinerChain.java b/java/src/com/android/inputmethod/event/CombinerChain.java index 8c6b3d949..61bc11b39 100644 --- a/java/src/com/android/inputmethod/event/CombinerChain.java +++ b/java/src/com/android/inputmethod/event/CombinerChain.java @@ -81,11 +81,11 @@ public class CombinerChain { } /** - * Process an event through the combining chain, and return a processed event to apply. + * Pass a new event through the whole chain. * @param previousEvents the list of previous events in this composition * @param newEvent the new event to process */ - public Event processEvent(final ArrayList previousEvents, final Event newEvent) { + public void processEvent(final ArrayList previousEvents, final Event newEvent) { final ArrayList modifiablePreviousEvents = new ArrayList<>(previousEvents); Event event = newEvent; for (final Combiner combiner : mCombiners) { @@ -97,14 +97,6 @@ public class CombinerChain { break; } } - return event; - } - - /** - * Apply a processed event. - * @param event the event to be applied - */ - public void applyProcessedEvent(final Event event) { if (null != event) { // TODO: figure out the generic way of doing this if (Constants.CODE_DELETE == event.mKeyCode) { -- cgit v1.2.3-83-g751a