Kaydet (Commit) 912fd109 authored tarafından Christian Lohmaier's avatar Christian Lohmaier

android janitor... convert chained ifs to switch statement

Change-Id: I9929bd077a33349a6e57c3a427df7e77b3007c88
üst bf07813f
...@@ -616,14 +616,18 @@ public class InvalidationHandler implements Document.MessageCallback, Office.Mes ...@@ -616,14 +616,18 @@ public class InvalidationHandler implements Document.MessageCallback, Office.Mes
* Handle a transition to OverlayState.TRANSITION state. * Handle a transition to OverlayState.TRANSITION state.
*/ */
private void handleTransitionState(OverlayState previous) { private void handleTransitionState(OverlayState previous) {
if (previous == OverlayState.SELECTION) { switch (previous) {
mDocumentOverlay.hideHandle(SelectionHandle.HandleType.START); case SELECTION:
mDocumentOverlay.hideHandle(SelectionHandle.HandleType.END); mDocumentOverlay.hideHandle(SelectionHandle.HandleType.START);
mDocumentOverlay.hideSelections(); mDocumentOverlay.hideHandle(SelectionHandle.HandleType.END);
} else if (previous == OverlayState.CURSOR) { mDocumentOverlay.hideSelections();
mDocumentOverlay.hideHandle(SelectionHandle.HandleType.MIDDLE); break;
} else if (previous == OverlayState.GRAPHIC_SELECTION) { case CURSOR:
mDocumentOverlay.hideGraphicSelection(); mDocumentOverlay.hideHandle(SelectionHandle.HandleType.MIDDLE);
break;
case GRAPHIC_SELECTION:
mDocumentOverlay.hideGraphicSelection();
break;
} }
} }
......
...@@ -392,12 +392,16 @@ class LOKitThread extends Thread { ...@@ -392,12 +392,16 @@ class LOKitThread extends Thread {
* Request a change of the handle position. * Request a change of the handle position.
*/ */
private void changeHandlePosition(SelectionHandle.HandleType handleType, PointF documentCoordinate) { private void changeHandlePosition(SelectionHandle.HandleType handleType, PointF documentCoordinate) {
if (handleType == SelectionHandle.HandleType.MIDDLE) { switch (handleType) {
mTileProvider.setTextSelectionReset(documentCoordinate); case MIDDLE:
} else if (handleType == SelectionHandle.HandleType.START) { mTileProvider.setTextSelectionReset(documentCoordinate);
mTileProvider.setTextSelectionStart(documentCoordinate); break;
} else if (handleType == SelectionHandle.HandleType.END) { case START:
mTileProvider.setTextSelectionEnd(documentCoordinate); mTileProvider.setTextSelectionStart(documentCoordinate);
break;
case END:
mTileProvider.setTextSelectionEnd(documentCoordinate);
break;
} }
} }
......
...@@ -540,16 +540,20 @@ class LOKitTileProvider implements TileProvider { ...@@ -540,16 +540,20 @@ class LOKitTileProvider implements TileProvider {
*/ */
@Override @Override
public void sendKeyEvent(KeyEvent keyEvent) { public void sendKeyEvent(KeyEvent keyEvent) {
if (keyEvent.getAction() == KeyEvent.ACTION_MULTIPLE) { switch (keyEvent.getAction()) {
String keyString = keyEvent.getCharacters(); case KeyEvent.ACTION_MULTIPLE:
for (int i = 0; i < keyString.length(); i++) { String keyString = keyEvent.getCharacters();
int codePoint = keyString.codePointAt(i); for (int i = 0; i < keyString.length(); i++) {
mDocument.postKeyEvent(Document.KEY_EVENT_PRESS, codePoint, getKeyCode(keyEvent)); int codePoint = keyString.codePointAt(i);
} mDocument.postKeyEvent(Document.KEY_EVENT_PRESS, codePoint, getKeyCode(keyEvent));
} else if (keyEvent.getAction() == KeyEvent.ACTION_DOWN) { }
mDocument.postKeyEvent(Document.KEY_EVENT_PRESS, getCharCode(keyEvent), getKeyCode(keyEvent)); break;
} else if (keyEvent.getAction() == KeyEvent.ACTION_UP) { case KeyEvent.ACTION_DOWN:
mDocument.postKeyEvent(Document.KEY_EVENT_RELEASE, getCharCode(keyEvent), getKeyCode(keyEvent)); mDocument.postKeyEvent(Document.KEY_EVENT_PRESS, getCharCode(keyEvent), getKeyCode(keyEvent));
break;
case KeyEvent.ACTION_UP:
mDocument.postKeyEvent(Document.KEY_EVENT_RELEASE, getCharCode(keyEvent), getKeyCode(keyEvent));
break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment