From cddd41ca6c6469491b082ad5076e394fa5944fbe Mon Sep 17 00:00:00 2001
From: James Sanford <jsanford@froop.com>
Date: Fri, 26 Jul 2013 17:44:55 -0700
Subject: [PATCH] Use 'TouchMouse' instead of old KegsTouch name.

---
 src/com/froop/app/kegs/KegsMain.java                   | 10 +++++-----
 .../froop/app/kegs/{KegsTouch.java => TouchMouse.java} |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename src/com/froop/app/kegs/{KegsTouch.java => TouchMouse.java} (99%)

diff --git a/src/com/froop/app/kegs/KegsMain.java b/src/com/froop/app/kegs/KegsMain.java
index 6236a37..64cced7 100644
--- a/src/com/froop/app/kegs/KegsMain.java
+++ b/src/com/froop/app/kegs/KegsMain.java
@@ -43,8 +43,8 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
   private KegsThread mKegsThread;
 
   protected KegsViewGL mKegsView;
-  private KegsTouch mKegsTouch;
   private KegsKeyboard mKegsKeyboard;
+  private TouchMouse mTouchMouse;
   private TouchJoystick mJoystick;
 
   private boolean mModeMouse = true;
@@ -392,7 +392,7 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
     mKegsView.updateScreenSize(bitmapSize);
 
     // Update scale of mouse movements.
-    mKegsTouch.updateScale(bitmapSize.getScaleX(), bitmapSize.getScaleY());
+    mTouchMouse.updateScale(bitmapSize.getScaleX(), bitmapSize.getScaleY());
 
     // Update special click zone that toggles the ActionBar.
     final TouchSpecialZone zone = new TouchSpecialZone(getSpecialActionBarRect(bitmapSize)) {
@@ -401,7 +401,7 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
           updateActionBar(mOverrideActionBar);
         }
       };
-    mKegsTouch.setSpecialZone(zone);
+    mTouchMouse.setSpecialZone(zone);
     mJoystick.setSpecialZone(zone);
 
     // Force another redraw of the bitmap into the canvas.  Bug workaround.
@@ -535,7 +535,7 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
                                  mKegsView.getBitmap());
     mKegsThread.registerUpdateScreenInterface(mKegsView);
 
-    mKegsTouch = new KegsTouch(this, getThread().getEventQueue());
+    mTouchMouse = new TouchMouse(this, getThread().getEventQueue());
     mJoystick = new TouchJoystick(getThread().getEventQueue());
 
     final SpecialRelativeLayout mainView = (SpecialRelativeLayout)findViewById(R.id.mainview);
@@ -545,7 +545,7 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
       public boolean onTouch(View v, MotionEvent event) {
         // TODO: consider using two listeners and setOnTouchListener them
         if (mModeMouse) {
-          return mKegsTouch.onTouchEvent(event);
+          return mTouchMouse.onTouchEvent(event);
         } else {
           return mJoystick.onTouchEvent(event);
         }
diff --git a/src/com/froop/app/kegs/KegsTouch.java b/src/com/froop/app/kegs/TouchMouse.java
similarity index 99%
rename from src/com/froop/app/kegs/KegsTouch.java
rename to src/com/froop/app/kegs/TouchMouse.java
index 7e6cc09..13eda7e 100644
--- a/src/com/froop/app/kegs/KegsTouch.java
+++ b/src/com/froop/app/kegs/TouchMouse.java
@@ -11,7 +11,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 
 // Translate onTouchEvent calls into mouse pointer movement.
 
-class KegsTouch {
+class TouchMouse {
   private ConcurrentLinkedQueue mEventQueue;
   private int mButton1 = 0;
   private int mTouchSlopSquare;
@@ -37,7 +37,7 @@ class KegsTouch {
 
   private TouchSpecialZone mSpecialZone = null;
 
-  public KegsTouch(Context context, ConcurrentLinkedQueue q) {
+  public TouchMouse(Context context, ConcurrentLinkedQueue q) {
     mEventQueue = q;
 
     final ViewConfiguration configuration = ViewConfiguration.get(context);