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 --- .../com/android/inputmethod/latin/WordComposer.java | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/WordComposer.java') diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java index df7958470..cdd782244 100644 --- a/java/src/com/android/inputmethod/latin/WordComposer.java +++ b/java/src/com/android/inputmethod/latin/WordComposer.java @@ -175,30 +175,20 @@ public final class WordComposer { } /** - * Process an event and return an event, and return a processed event to apply. - * @param event the unprocessed event. - * @return the processed event. - */ - public Event processEvent(final Event event) { - final Event processedEvent = mCombinerChain.processEvent(mEvents, event); - mEvents.add(event); - return processedEvent; - } - - /** - * Apply a processed input event. + * Process an input event. * * All input events should be supported, including software/hardware events, characters as well * as deletions, multiple inputs and gestures. * - * @param event the event to apply. + * @param event the event to process. */ - public void applyProcessedEvent(final Event event) { + public void processEvent(final Event event) { final int primaryCode = event.mCodePoint; final int keyX = event.mX; final int keyY = event.mY; final int newIndex = size(); - mCombinerChain.applyProcessedEvent(event); + mCombinerChain.processEvent(mEvents, event); + mEvents.add(event); refreshTypedWordCache(); mCursorPositionWithinWord = mCodePointSize; // We may have deleted the last one. -- cgit v1.2.3-83-g751a