Skip to content

Commit

Permalink
Add @OverRide annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
remram44 committed Apr 21, 2016
1 parent 3ff182b commit 08023dd
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/src/main/java/fr/remram/taquindroid/EndGame.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
public class EndGame extends Activity {

/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/fr/remram/taquindroid/Game.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class Game extends Activity implements GameView.EndGameListener {
private int m_Height;

/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
Expand Down Expand Up @@ -55,6 +56,7 @@ public void onCreate(Bundle savedInstanceState)
setContentView(game);
}

@Override
public void onGameEnded()
{
Intent end_game = new Intent();
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/fr/remram/taquindroid/GameView.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ public void setEndGameListener(EndGameListener listener)
m_EndGameListener = listener;
}

@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh)
{
if(m_TileAspect != 0)
Expand Down Expand Up @@ -136,6 +137,7 @@ private void drawBlock(Canvas canvas, float x, float y, Bitmap bitmap, int borde
canvas.drawLines(points, m_Paint);
}

@Override
public void onDraw(Canvas canvas)
{
super.onDraw(canvas);
Expand Down Expand Up @@ -180,6 +182,7 @@ else if(m_ActiveBlock != -1)
}
}

@Override
public boolean onTouchEvent(MotionEvent event)
{
if(event.getAction() == MotionEvent.ACTION_DOWN)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/fr/remram/taquindroid/Menu.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class Menu extends Activity {
private int m_Height = 3;

/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
Expand Down Expand Up @@ -56,6 +57,7 @@ public void onClick(View v)
});
}

@Override
protected void onActivityResult(int request_code, int result_code, Intent data)
{
super.onActivityResult(request_code, result_code, data);
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/fr/remram/taquindroid/Options.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class Options extends Activity {
public static final int DEFAULT_SIZE = 3;

/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
Expand Down Expand Up @@ -99,6 +100,7 @@ public void onClick(View v)
}

/** Called when the image have been selected. */
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent imageReturnedIntent) {
super.onActivityResult(requestCode, resultCode, imageReturnedIntent);

Expand Down

0 comments on commit 08023dd

Please sign in to comment.