www

commit 2e698091787067c57e96e0264bf55521f3ce18ad
parent f03f061d6f1728a409240182a6dba02786fe9ccc
Author: Bertrand BRUN <bertrand0brun@gmail.com>
Date:   Wed,  9 Feb 2011 00:49:21 +0100

Correction mineur dans BaseGame et Network

Diffstat:
M
code/PtiClic/src/org/pticlic/games/BaseGame.java
 | 
55
+++++++++++++++++++++++++++++--------------------------
M
code/PtiClic/src/org/pticlic/model/Network.java
 | 
5
-----

2 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/code/PtiClic/src/org/pticlic/games/BaseGame.java b/code/PtiClic/src/org/pticlic/games/BaseGame.java
@@ -64,8 +64,23 @@ public class BaseGame extends Activity implements OnClickListener {
 
 		// On initialise la classe permettant la communication avec le serveur.
 		network = new Network(serverURL, Mode.SIMPLE_GAME, id, passwd);
+	}
+
+
+
+	/* (non-Javadoc)
+	 * @see android.app.Activity#onStart()
+	 */
+	@Override
+	protected void onStart() {
+		super.onStart();
 
 		game = network.getGames(1);
+		runMatch();
+		start();
+	}
+
+	private void runMatch() {
 		int nbrel = game.getNbRelation();
 		nbWord = game.getNbWord();
 
@@ -106,9 +121,9 @@ public class BaseGame extends Activity implements OnClickListener {
 		if (nbrel > 0) {
 			// TODO : A enlever lorsque l'on aura toutes les images des relations.
 			try {
-			r1.setOnClickListener(this); 
-			rn1.setText(r.getRelationName(game.getCat1()));
-			r1.setImageResource(r.getRelationImage(game.getCat1()));
+				r1.setOnClickListener(this); 
+				rn1.setText(r.getRelationName(game.getCat1()));
+				r1.setImageResource(r.getRelationImage(game.getCat1()));
 			} catch (Exception e) {
 				r1.setImageResource(R.drawable.icon);
 			}
@@ -118,9 +133,9 @@ public class BaseGame extends Activity implements OnClickListener {
 		if (nbrel > 1) {
 			// TODO : A enlever lorsque l'on aura toutes les images des relations.
 			try {
-			r2.setOnClickListener(this); 
-			rn2.setText(r.getRelationName(game.getCat2()));
-			r2.setImageResource(r.getRelationImage(game.getCat2()));
+				r2.setOnClickListener(this); 
+				rn2.setText(r.getRelationName(game.getCat2()));
+				r2.setImageResource(r.getRelationImage(game.getCat2()));
 			} catch (Exception e) {
 				r2.setImageResource(R.drawable.icon);
 			}
@@ -130,9 +145,9 @@ public class BaseGame extends Activity implements OnClickListener {
 		if (nbrel > 2) {
 			// TODO : A enlever lorsque l'on aura toutes les images des relations.
 			try {
-			r3.setOnClickListener(this); 
-			rn3.setText(r.getRelationName(game.getCat3()));
-			r3.setImageResource(r.getRelationImage(game.getCat3()));
+				r3.setOnClickListener(this); 
+				rn3.setText(r.getRelationName(game.getCat3()));
+				r3.setImageResource(r.getRelationImage(game.getCat3()));
 			} catch (Exception e) {
 				r3.setImageResource(R.drawable.icon);
 			}
@@ -142,9 +157,9 @@ public class BaseGame extends Activity implements OnClickListener {
 		if (nbrel > 3) {
 			// TODO : A enlever lorsque l'on aura toutes les images des relations.
 			try {
-			r4.setOnClickListener(this);
-			rn4.setText(r.getRelationName(game.getCat4()));
-			r4.setImageResource(r.getRelationImage(game.getCat4()));
+				r4.setOnClickListener(this);
+				rn4.setText(r.getRelationName(game.getCat4()));
+				r4.setImageResource(r.getRelationImage(game.getCat4()));
 			} catch (Exception e) {
 				r4.setImageResource(R.drawable.icon);
 			}
@@ -153,20 +168,8 @@ public class BaseGame extends Activity implements OnClickListener {
 		}		
 
 		((TextView)findViewById(R.id.mainWord)).setText(DownloadedGame.getName(game.getCentre()));
-
-		//this.helpMode();
 	}
-
-	/* (non-Javadoc)
-	 * @see android.app.Activity#onStart()
-	 */
-	@Override
-	protected void onStart() {
-		super.onStart();
-
-		start();
-	}
-
+	
 	/* (non-Javadoc)
 	 * @see android.app.Activity#onActivityResult(int, int, android.content.Intent)
 	 */
@@ -353,7 +356,7 @@ public class BaseGame extends Activity implements OnClickListener {
 
 			relationName = ((TextView)findViewById(R.id.trashName));
 			relationName.setVisibility(View.GONE);
-			
+
 			// On met le mot courant au bon endroit dans la fenetre
 			// On recupere la largueur de l'ecran.
 			Display display = getWindowManager().getDefaultDisplay(); 
diff --git a/code/PtiClic/src/org/pticlic/model/Network.java b/code/PtiClic/src/org/pticlic/model/Network.java
@@ -1,17 +1,12 @@
 package org.pticlic.model;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
-import android.preference.PreferenceManager;
 
 import com.google.gson.Gson;
 import com.google.gson.stream.JsonReader;