Changes in / [7f693b4:a0f5455] in advance-wars

Location:

src/com/example

Files:

• advancewars/GameView.java (modified) (4 diffs)
• gui/Window.java (deleted)

src/com/example/advancewars/GameView.java

@@ -59 +59 @@
         private SurfaceHolder mSurfaceHolder;
         
-        private com.example.gui.Window wndMainMenu, wndBattleMap;
+        private Hashtable<String, GUIObject> drawableObjects;
         
         public DrawingThread(SurfaceHolder surfaceHolder, Context context, Handler handler) {
@@ -91 +91 @@
             mTilePaint2.setARGB(255, 0, 0, 255);
             
-            wndMainMenu = new com.example.gui.Window(0, 0, 320, 450);;
-            wndMainMenu.addGUIObject("txtTitle", new Text("Main Menu", 100, 30, 120, 20, mTextPaint));
-            wndMainMenu.addGUIObject("btnNewGame", new Button("New Game", 100, 90, 120, 20, mLinePaint, mButtonPaint));
-            wndMainMenu.addGUIObject("btnLoadGame", new Button("Load Game", 100, 125, 120, 20, mLinePaint, mButtonPaint));
-            wndMainMenu.addGUIObject("btnMapEditor", new Button("Map Editor", 100, 160, 120, 20, mLinePaint, mButtonPaint));
-            wndMainMenu.addGUIObject("btnQuit", new Button("Quit", 100, 195, 120, 20, mLinePaint, mButtonPaint));
+            drawableObjects = new Hashtable<String, GUIObject>();
+            
+            drawableObjects.put("txtTitle", new Text("Main Menu", 100, 30, 120, 20, mTextPaint));
+            drawableObjects.put("btnNewGame", new Button("New Game", 100, 90, 120, 20, mLinePaint, mButtonPaint));
+            drawableObjects.put("btnLoadGame", new Button("Load Game", 100, 125, 120, 20, mLinePaint, mButtonPaint));
+            drawableObjects.put("btnMapEditor", new Button("Map Editor", 100, 160, 120, 20, mLinePaint, mButtonPaint));
+            drawableObjects.put("btnQuit", new Button("Quit", 100, 195, 120, 20, mLinePaint, mButtonPaint));
             
             Tile grassTile = new Tile(mTilePaint1);
@@ -330 +331 @@
                 switch(mGameState) {
                 case MAIN_MENU:
-                wndMainMenu.draw(canvas);
+                for (GUIObject o : drawableObjects.values()) {
+                        o.draw(canvas);
+                }
                         break;
                 case BATTLE_MAP:
@@ -400 +403 @@
                 case MAIN_MENU:
                         Log.i("AdvanceWars", "Switching to battle map");
-                        if(thread.wndMainMenu.getGUIObject("btnNewGame").isClicked(event.getX(), event.getY())) {
+                        if(thread.drawableObjects.get("btnNewGame").isClicked(event.getX(), event.getY())) {
                                 thread.mGameState = GameState.BATTLE_MAP;
-                        }else if(thread.wndMainMenu.getGUIObject("btnLoadGame").isClicked(event.getX(), event.getY())) {
+                        }else if(thread.drawableObjects.get("btnLoadGame").isClicked(event.getX(), event.getY())) {
                                 thread.mGameState = GameState.BATTLE_MAP;
-                        }else if(thread.wndMainMenu.getGUIObject("btnQuit").isClicked(event.getX(), event.getY())) {
+                        }else if(thread.drawableObjects.get("btnQuit").isClicked(event.getX(), event.getY())) {
                                 mGame.finish();
                         }