From cc3c034cf6135cdad8db4760edc043d4fbaa86b7 Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Mon, 18 Jul 2011 09:13:05 +0000
Subject: [PATCH] Android samples: class SampleViewBase which uses native
 camera is renamed.

---
 .../puzzle15/{SampleViewBase.java => SampleCvViewBase.java}   | 4 ++--
 .../src/org/opencv/samples/puzzle15/puzzle15View.java         | 3 +--
 .../src/org/opencv/samples/tutorial2/Sample2View.java         | 2 +-
 .../tutorial2/{SampleViewBase.java => SampleCvViewBase.java}  | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename samples/android/15-puzzle/src/org/opencv/samples/puzzle15/{SampleViewBase.java => SampleCvViewBase.java} (95%)
 rename samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/{SampleViewBase.java => SampleCvViewBase.java} (95%)

diff --git a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/SampleViewBase.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/SampleCvViewBase.java
similarity index 95%
rename from samples/android/15-puzzle/src/org/opencv/samples/puzzle15/SampleViewBase.java
rename to samples/android/15-puzzle/src/org/opencv/samples/puzzle15/SampleCvViewBase.java
index b85325e339..db9e0bb82d 100644
--- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/SampleViewBase.java
+++ b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/SampleCvViewBase.java
@@ -11,13 +11,13 @@ import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-public abstract class SampleViewBase extends SurfaceView implements SurfaceHolder.Callback, Runnable {
+public abstract class SampleCvViewBase extends SurfaceView implements SurfaceHolder.Callback, Runnable {
     private static final String TAG = "Sample::SurfaceView";
 
     private SurfaceHolder       mHolder;
     private VideoCapture        mCamera;
 
-    public SampleViewBase(Context context) {
+    public SampleCvViewBase(Context context) {
         super(context);
         mHolder = getHolder();
         mHolder.addCallback(this);
diff --git a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java
index 1f6abbc273..370d202500 100644
--- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java
+++ b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java
@@ -9,7 +9,7 @@ import android.view.SurfaceHolder;
 import android.view.View;
 import android.view.View.OnTouchListener;
 
-public class puzzle15View extends SampleViewBase implements OnTouchListener {
+public class puzzle15View extends SampleCvViewBase implements OnTouchListener {
     private Mat     mRgba;
     private Mat     mRgba15;
     private Mat[]   mCells;
@@ -171,7 +171,6 @@ public class puzzle15View extends SampleViewBase implements OnTouchListener {
         }
     }
 
-    @Override
     public boolean onTouch(View v, MotionEvent event) {
         int cols = mRgba.cols();
         int rows = mRgba.rows();
diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java
index b7138a24a4..22e77b0f79 100644
--- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java
+++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java
@@ -6,7 +6,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.view.SurfaceHolder;
 
-class Sample2View extends SampleViewBase {
+class Sample2View extends SampleCvViewBase {
     private Mat mRgba;
     private Mat mGray;
     private Mat mIntermediateMat;
diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleViewBase.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleCvViewBase.java
similarity index 95%
rename from samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleViewBase.java
rename to samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleCvViewBase.java
index 4725844538..a9e41d507b 100644
--- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleViewBase.java
+++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleCvViewBase.java
@@ -11,13 +11,13 @@ import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-public abstract class SampleViewBase extends SurfaceView implements SurfaceHolder.Callback, Runnable {
+public abstract class SampleCvViewBase extends SurfaceView implements SurfaceHolder.Callback, Runnable {
     private static final String TAG = "Sample::SurfaceView";
 
     private SurfaceHolder       mHolder;
     private VideoCapture        mCamera;
 
-    public SampleViewBase(Context context) {
+    public SampleCvViewBase(Context context) {
         super(context);
         mHolder = getHolder();
         mHolder.addCallback(this);