From 2015484c24b817b9980d0f59e0cde1a4435cc789 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 13 Aug 2013 09:23:11 -0400 Subject: [PATCH] [Android] Some tiny cleanups in DolphinEmulator.java - Join variable declaration and assignments in function onTouchEvent() - Change a for-loop into a foreach loop in dispatchGenericMotionEvent(). Makes the loop body a single statement. --- .../dolphinemu/dolphinemu/DolphinEmulator.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index 40e5b6e98a..d4177de5a4 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -143,11 +143,9 @@ public class DolphinEmulator extends Activity @Override public boolean onTouchEvent(MotionEvent event) { - float X, Y; - int Action; - X = event.getX(); - Y = event.getY(); - Action = event.getActionMasked(); + float X = event.getX(); + float Y = event.getY(); + int Action = event.getActionMasked(); // Converts button locations 0 - 1 to OGL screen coords -1.0 - 1.0 float ScreenX = ((X / screenWidth) * 2.0f) - 1.0f; @@ -207,14 +205,13 @@ public class DolphinEmulator extends Activity InputDevice input = event.getDevice(); List motions = input.getMotionRanges(); - for (int a = 0; a < motions.size(); ++a) + + for (InputDevice.MotionRange range : motions) { - InputDevice.MotionRange range; - range = motions.get(a); - NativeLibrary.onGamePadMoveEvent(InputConfigFragment.getInputDesc(input), range.getAxis(), event.getAxisValue(range.getAxis())); + NativeLibrary.onGamePadMoveEvent(InputConfigFragment.getInputDesc(input), range.getAxis(), event.getAxisValue(range.getAxis())); } return true; } -} \ No newline at end of file +} \ No newline at end of file