pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added missing @Override annotations in Java source file to reduce warnings.

Browse source
This commit is contained in:
Philipp Wiesemann 2013-04-27 14:13:30 +02:00
parent dc6e420626
commit bdd9df5fd9
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
android-project/src/org/libsdl/app/SDLActivity.java
View file

@ -64,6 +64,7 @@ public class SDLActivity extends Activity {
} }
// Setup // Setup
@Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
//Log.v("SDL", "onCreate()"); //Log.v("SDL", "onCreate()");
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -95,6 +96,7 @@ public class SDLActivity extends Activity {
// Don't call SDLActivity.nativeResume(); here, it will be called via SDLSurface::surfaceChanged->SDLActivity::startApp // Don't call SDLActivity.nativeResume(); here, it will be called via SDLSurface::surfaceChanged->SDLActivity::startApp
}*/ }*/
@Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
Log.v("SDL", "onDestroy()"); Log.v("SDL", "onDestroy()");
@ -220,6 +222,7 @@ public class SDLActivity extends Activity {
this.h = h; this.h = h;
} }
@Override
public void run() { public void run() {
AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams( AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams(
w, h + HEIGHT_PADDING, x, y); w, h + HEIGHT_PADDING, x, y);
@ -372,6 +375,7 @@ public class SDLActivity extends Activity {
public static void audioStartThread() { public static void audioStartThread() {
mAudioThread = new Thread(new Runnable() { mAudioThread = new Thread(new Runnable() {
@Override
public void run() { public void run() {
mAudioTrack.play(); mAudioTrack.play();
nativeRunAudioThread(); nativeRunAudioThread();
@ -442,6 +446,7 @@ public class SDLActivity extends Activity {
Simple nativeInit() runnable Simple nativeInit() runnable
*/ */
class SDLMain implements Runnable { class SDLMain implements Runnable {
@Override
public void run() { public void run() {
// Runs SDL_main() // Runs SDL_main()
SDLActivity.nativeInit(); SDLActivity.nativeInit();
@ -485,6 +490,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} }
// Called when we have a valid drawing surface // Called when we have a valid drawing surface
@Override
public void surfaceCreated(SurfaceHolder holder) { public void surfaceCreated(SurfaceHolder holder) {
Log.v("SDL", "surfaceCreated()"); Log.v("SDL", "surfaceCreated()");
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU); holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
@ -492,6 +498,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} }
// Called when we lose the surface // Called when we lose the surface
@Override
public void surfaceDestroyed(SurfaceHolder holder) { public void surfaceDestroyed(SurfaceHolder holder) {
Log.v("SDL", "surfaceDestroyed()"); Log.v("SDL", "surfaceDestroyed()");
if (!SDLActivity.mIsPaused) { if (!SDLActivity.mIsPaused) {
@ -502,6 +509,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} }
// Called when the surface is resized // Called when the surface is resized
@Override
public void surfaceChanged(SurfaceHolder holder, public void surfaceChanged(SurfaceHolder holder,
int format, int width, int height) { int format, int width, int height) {
Log.v("SDL", "surfaceChanged()"); Log.v("SDL", "surfaceChanged()");
@ -560,12 +568,14 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} }
// unused // unused
@Override
public void onDraw(Canvas canvas) {} public void onDraw(Canvas canvas) {}
// Key events // Key events
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) { public boolean onKey(View v, int keyCode, KeyEvent event) {
if (event.getAction() == KeyEvent.ACTION_DOWN) { if (event.getAction() == KeyEvent.ACTION_DOWN) {
@ -583,6 +593,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} }
// Touch events // Touch events
@Override
public boolean onTouch(View v, MotionEvent event) { public boolean onTouch(View v, MotionEvent event) {
{ {
final int touchDevId = event.getDeviceId(); final int touchDevId = event.getDeviceId();
@ -626,10 +637,12 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} }
} }
@Override
public void onAccuracyChanged(Sensor sensor, int accuracy) { public void onAccuracyChanged(Sensor sensor, int accuracy) {
// TODO // TODO
} }
@Override
public void onSensorChanged(SensorEvent event) { public void onSensorChanged(SensorEvent event) {
if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) { if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
SDLActivity.onNativeAccel(event.values[0] / SensorManager.GRAVITY_EARTH, SDLActivity.onNativeAccel(event.values[0] / SensorManager.GRAVITY_EARTH,
@ -658,6 +671,7 @@ class DummyEdit extends View implements View.OnKeyListener {
return true; return true;
} }
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) { public boolean onKey(View v, int keyCode, KeyEvent event) {
// This handles the hardware keyboard input // This handles the hardware keyboard input