1 files changed, 20 insertions, 13 deletions

diff --git a/client/Piztor/src/com/macaroon/piztor/PiztorAct.java b/client/Piztor/src/com/macaroon/piztor/PiztorAct.java
index abfab12..0116273 100644
--- a/client/Piztor/src/com/macaroon/piztor/PiztorAct.java
+++ b/client/Piztor/src/com/macaroon/piztor/PiztorAct.java
@@ -6,59 +6,66 @@ import android.os.Bundle;
 public class PiztorAct extends Activity {
 	String id;
 	ActMgr actMgr;
-
+	AppMgr appMgr;
+	MapInfo mapInfo;
+	Transam transam;
+	myApp app;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		System.out.println(id + " on create");
-		AppMgr.addAct(this);
-		AppMgr.setStatus(AppMgr.ActivityStatus.create);
-		AppMgr.nowAct = this;
+		app = (myApp) getApplication();
+		transam = app.transam;
+		appMgr = app.appMgr;
+		mapInfo = app.mapInfo;
+		appMgr.addAct(this);
+		appMgr.setStatus(AppMgr.ActivityStatus.create);
+		appMgr.nowAct = this;
 	}
 	
 	@Override
 	protected void onStart() {
 		super.onStart();
 		System.out.println(id + " on start");
-		AppMgr.setStatus(AppMgr.ActivityStatus.start);
-		AppMgr.nowAct = this;
+		appMgr.setStatus(AppMgr.ActivityStatus.start);
+		appMgr.nowAct = this;
 	}
 	
 	@Override
 	protected void onStop() {
 		super.onStop();
 		System.out.println(id + " on stop");
-		AppMgr.setStatus(AppMgr.ActivityStatus.stop);
+		appMgr.setStatus(AppMgr.ActivityStatus.stop);
 	}
 
 	@Override
 	protected void onResume() {
 		super.onResume();
 		System.out.println(id + " on resume");
-		AppMgr.setStatus(AppMgr.ActivityStatus.resume);
-		AppMgr.nowAct = this;
+		appMgr.setStatus(AppMgr.ActivityStatus.resume);
+		appMgr.nowAct = this;
 	}
 	
 	@Override
 	protected void onPause() {
 		super.onPause();
 		System.out.println(id + " on pause");
-		AppMgr.setStatus(AppMgr.ActivityStatus.pause);
+		appMgr.setStatus(AppMgr.ActivityStatus.pause);
 	}
 	
 	@Override
 	protected void onRestart() {
 		super.onRestart();
 		System.out.println(id + " on restart");
-		AppMgr.setStatus(AppMgr.ActivityStatus.restart);
+		appMgr.setStatus(AppMgr.ActivityStatus.restart);
 	}
 	
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
-		AppMgr.removeAct(this);
+//		appMgr.removeAct(this);
 		System.out.println(id + " on destroy");
-		AppMgr.setStatus(AppMgr.ActivityStatus.destroy);
+		appMgr.setStatus(AppMgr.ActivityStatus.destroy);
 	}
 	
 }