[Picross-commit] SF.net SVN: picross:[111] branches/engine_split/android/src/picross/ specific
Status: Pre-Alpha
Brought to you by:
yvan_norsa
Menu
▾
▴
[Picross-commit] SF.net SVN: picross:[111] branches/engine_split/android/src/picross/ specific
|
From: <yva...@us...> - 2013-01-11 09:44:01
|
Revision: 111
http://sourceforge.net/p/picross/code/111
Author: yvan_norsa
Date: 2013-01-11 09:43:57 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
cleaning
Modified Paths:
--------------
branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java
branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java
branches/engine_split/android/src/picross/specific/ui/MenuUI.java
branches/engine_split/android/src/picross/specific/ui/PicrossAndroidView.java
branches/engine_split/android/src/picross/specific/ui/PicrossUIHelper.java
Modified: branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java 2013-01-11 09:20:41 UTC (rev 110)
+++ branches/engine_split/android/src/picross/specific/activities/MainMenuActivityUI.java 2013-01-11 09:43:57 UTC (rev 111)
@@ -54,13 +54,10 @@
/** "Play" button Y coordinate. */
private static final int PLAY_BUTTON_Y = 225;
- //private Context context;
-
public MainMenuActivityUI(Context androidContext) {
super(androidContext);
picross.engine.PicrossLogHelper.getLogger().debug("MainMenuActivityUI(" + androidContext + ")");
- //this.context = androidContext;
}
/** {@inheritDoc} */
Modified: branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java 2013-01-11 09:20:41 UTC (rev 110)
+++ branches/engine_split/android/src/picross/specific/activities/PicrossActivityUI.java 2013-01-11 09:43:57 UTC (rev 111)
@@ -47,7 +47,7 @@
*
* @author Y. Norsa
*/
-public final class PicrossActivityUI /*extends android.view.View*/ implements PicrossUI {
+public final class PicrossActivityUI implements PicrossUI {
/*** Constants ***/
/** Main menu class. */
@@ -65,9 +65,6 @@
/** {@inheritDoc} */
@Override
public void setContent(PicrossView content) {
- //this.setContentPane((Container) content);
- //this.pack();
-
PicrossLogHelper.getLogger().debug("setContent(" + content + ")");
this.activity.setContentView((picross.specific.ui.PicrossAndroidView) content);
}
@@ -76,8 +73,6 @@
@Override
public void displayMessage(String msg) {
PicrossLogHelper.getLogger().debug("displayMessage(" + msg + ")");
- //JOptionPane.showMessageDialog(this, msg);
-
AlertDialog.Builder builder = new AlertDialog.Builder(this.activity);
builder.setMessage(msg)
.setTitle("Picross");
Modified: branches/engine_split/android/src/picross/specific/ui/MenuUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/MenuUI.java 2013-01-11 09:20:41 UTC (rev 110)
+++ branches/engine_split/android/src/picross/specific/ui/MenuUI.java 2013-01-11 09:43:57 UTC (rev 111)
@@ -43,8 +43,6 @@
import picross.engine.PicrossLogger;
import picross.engine.PicrossLogHelper;
-//import picross.specific.ui.PicrossUIHelper;
-
import picross.common.ui.MissingImageException;
import android.view.SurfaceView;
@@ -64,7 +62,7 @@
*
* @author Y. Norsa
*/
-public abstract class MenuUI extends PicrossAndroidView implements SurfaceHolder.Callback, Runnable {//SurfaceView implements PicrossView {
+public abstract class MenuUI extends PicrossAndroidView implements SurfaceHolder.Callback, Runnable {
/*** Constants ***/
/** Background image. */
@@ -89,16 +87,13 @@
/** Background image. */
private Bitmap image;
+ protected Context context;
+ private SurfaceHolder surface;
+
/*** Constructor ***/
/** Constructor. */
- protected Context context;
- private SurfaceHolder surface;
-
-
- //private MenuUI thread;
-
public MenuUI(Context context) {
super(context);
@@ -125,87 +120,48 @@
Resources res = context.getResources();
- this.image = PicrossUIHelper.getImage(res, R.drawable.background);//BitmapFactory.decodeResource(res,
- //R.drawable.earthrise);
+ this.image = PicrossUIHelper.getImage(res, R.drawable.background);
MenuUI.log.debug("this.image: " + this.image);
this.surface = this.getHolder();
this.surface.addCallback(this);
-
- //Thread thread = new Thread(this);
- //thread.start();
- //this.start();
}
- /*** Method overloaded from the class JPanel ***/
-
- /** {@inheritDoc} */
- //FIXME
- /*
- protected final void paintComponent(Graphics g) {
- super.paintComponent(g);
-
- g.drawImage(this.image, 0, 0, null);
- }
- */
-
-@Override
+ @Override
public void surfaceCreated(SurfaceHolder holder) {
- MenuUI.log.debug("surfaceCreated()");
+ MenuUI.log.debug("surfaceCreated()");
+ this.setRunning(true);
- //this.surface = holder;
-
-
- /*thread*/this.setRunning(true);
- /*thread*///this.start();
Thread thread = new Thread(this);
thread.start();
+ }
-}
+ @Override
+ public void surfaceChanged(SurfaceHolder holder, int format, int width,
+ int height) {
+ MenuUI.log.debug("surfaceChanged");
+ }
-@Override
-public void surfaceChanged(SurfaceHolder holder, int format, int width,
- int height) {
- MenuUI.log.debug("surfaceChanged");
-
- //thread.setSurfaceSize(width, height);
-
-}
private boolean running;
private void setRunning(boolean run) {
this.running = run;
}
-@Override
-
+ @Override
public void surfaceDestroyed(SurfaceHolder holder) {
- MenuUI.log.debug("surfaceDestroyed");
+ MenuUI.log.debug("surfaceDestroyed");
+ boolean retry = true;
+ this.setRunning(false);
+ }
- boolean retry = true;
- /*thread*/this.setRunning(false);
- /*
- while (retry) {
- try {
- //thread.join();
- retry = false;
- } catch (InterruptedException e) {
- }
- }*/
-}
+ @Override
+ public void run() {
+ MenuUI.log.debug("run()");
-@Override
- public void run() {
- MenuUI.log.debug("run()");
-
- /*
- if (!this.running) {
- return;
- }
- */
Canvas c;
while (this.running) {
c = null;
@@ -224,7 +180,6 @@
}
}
}
-
}
public void onDraw(Canvas canvas) {
@@ -235,14 +190,6 @@
}
canvas.drawBitmap(this.image, 0, 0, null);
-
- /*
- canvas.drawColor(Color.BLACK);
-
- Paint p = new Paint();
- p.setColor(Color.RED);
- canvas.drawCircle(x, 10, 10, p);
- x += 1;*/
}
/*** Methods ***/
Modified: branches/engine_split/android/src/picross/specific/ui/PicrossAndroidView.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/PicrossAndroidView.java 2013-01-11 09:20:41 UTC (rev 110)
+++ branches/engine_split/android/src/picross/specific/ui/PicrossAndroidView.java 2013-01-11 09:43:57 UTC (rev 111)
@@ -7,20 +7,14 @@
import android.content.Context;
-//import android.opengl.GLSurfaceView;
import android.view.SurfaceView;
import picross.common.ui.PicrossView;
-public /*final */class PicrossAndroidView extends SurfaceView implements PicrossView {
+public class PicrossAndroidView extends SurfaceView implements PicrossView {
public PicrossAndroidView(Context context) {
super(context);
picross.engine.PicrossLogHelper.getLogger().debug("PicrossAndroidView(" + context + ")");
-
- //this.setEGLContextClientVersion(2);
- //this.setRenderer(new DroidRenderer());
-
- //this.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
}
}
Modified: branches/engine_split/android/src/picross/specific/ui/PicrossUIHelper.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/PicrossUIHelper.java 2013-01-11 09:20:41 UTC (rev 110)
+++ branches/engine_split/android/src/picross/specific/ui/PicrossUIHelper.java 2013-01-11 09:43:57 UTC (rev 111)
@@ -85,14 +85,7 @@
* @throws MissingImageException if the image file can't be found
*/
private static Bitmap loadImage(String path) {
- //try {
- //return Picross.getFile(path);
- //return Uri.parse(path);
- return BitmapFactory.decodeFile(path);
- /*
- } catch (FileNotFoundException fileEx) {
- throw new MissingImageException(fileEx);
- }*/
+ return BitmapFactory.decodeFile(path);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
