From 666f2ce478205a91c3a630bac611bf00ba18f2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Latner?= <matyas.latner@nic.cz>
Date: Fri, 19 Jun 2015 15:21:13 +0200
Subject: [PATCH] Refactor of game classes names
---
core/src/cz/nic/tablexia/game/GameDefinition.java | 14 +++++++-------
...eDarknessScreen.java => InTheDarknessGame.java} | 3 +--
.../{PursuitScreen.java => PursuitGame.java} | 3 +--
...tingRangeScreen.java => ShootingRangeGame.java} | 3 +--
4 files changed, 10 insertions(+), 13 deletions(-)
rename core/src/cz/nic/tablexia/game/games/in_the_darkness/{InTheDarknessScreen.java => InTheDarknessGame.java} (54%)
rename core/src/cz/nic/tablexia/game/games/pursuit/{PursuitScreen.java => PursuitGame.java} (54%)
rename core/src/cz/nic/tablexia/game/games/shooting_range/{ShootingRangeScreen.java => ShootingRangeGame.java} (54%)
diff --git a/core/src/cz/nic/tablexia/game/GameDefinition.java b/core/src/cz/nic/tablexia/game/GameDefinition.java
index b572c1896..8cfc09cdb 100644
--- a/core/src/cz/nic/tablexia/game/GameDefinition.java
+++ b/core/src/cz/nic/tablexia/game/GameDefinition.java
@@ -4,12 +4,12 @@ import cz.nic.tablexia.Tablexia.ChangeScreenEvent;
import cz.nic.tablexia.TablexiaApplication.ScreenTransaction;
import cz.nic.tablexia.bus.ApplicationBus;
import cz.nic.tablexia.bus.ApplicationBus.ApplicationEvent;
-import cz.nic.tablexia.game.games.in_the_darkness.InTheDarknessScreen;
+import cz.nic.tablexia.game.games.in_the_darkness.InTheDarknessGame;
import cz.nic.tablexia.game.games.kidnapping.KidnappingGame;
import cz.nic.tablexia.game.games.night_watch.NightWatchGame;
-import cz.nic.tablexia.game.games.pursuit.PursuitScreen;
+import cz.nic.tablexia.game.games.pursuit.PursuitGame;
import cz.nic.tablexia.game.games.robbery.RobberyGame;
-import cz.nic.tablexia.game.games.shooting_range.ShootingRangeScreen;
+import cz.nic.tablexia.game.games.shooting_range.ShootingRangeGame;
import cz.nic.tablexia.loader.application.ApplicationTextManager;
import cz.nic.tablexia.menu.IMenuItem;
@@ -17,11 +17,11 @@ import cz.nic.tablexia.menu.IMenuItem;
public enum GameDefinition implements ApplicationEvent, IMenuItem {
ROBBERY ("game_robbery_title", RobberyGame.class, true),
- PURSUIT ("game_pursuit_title", PursuitScreen.class, true),
+ PURSUIT ("game_pursuit_title", PursuitGame.class, true),
KIDNAPPING ("game_kidnapping_title", KidnappingGame.class, true),
NIGHT_WATCH ("game_night_watch_title", NightWatchGame.class, true),
- SHOOTING_RANGE ("game_shooting_range_title", ShootingRangeScreen.class, true),
- IN_THE_DARKNESS ("game_in_the_darkness_title", InTheDarknessScreen.class, true);
+ SHOOTING_RANGE ("game_shooting_range_title", ShootingRangeGame.class, true),
+ IN_THE_DARKNESS ("game_in_the_darkness_title", InTheDarknessGame.class, true);
private String menuTextKey;
@@ -32,7 +32,7 @@ public enum GameDefinition implements ApplicationEvent, IMenuItem {
return new GameDefinition[]{ROBBERY, PURSUIT, KIDNAPPING, NIGHT_WATCH, SHOOTING_RANGE, IN_THE_DARKNESS};
}
- private GameDefinition(String nameResource, Class<? extends AbstractTablexiaGame<?>> screenClass, boolean isCloseMenu) {
+ GameDefinition(String nameResource, Class<? extends AbstractTablexiaGame<?>> screenClass, boolean isCloseMenu) {
this.menuTextKey = nameResource;
this.screenClass = screenClass;
this.isCloseMenu = isCloseMenu;
diff --git a/core/src/cz/nic/tablexia/game/games/in_the_darkness/InTheDarknessScreen.java b/core/src/cz/nic/tablexia/game/games/in_the_darkness/InTheDarknessGame.java
similarity index 54%
rename from core/src/cz/nic/tablexia/game/games/in_the_darkness/InTheDarknessScreen.java
rename to core/src/cz/nic/tablexia/game/games/in_the_darkness/InTheDarknessGame.java
index 52d9d630c..ee5f40d6a 100644
--- a/core/src/cz/nic/tablexia/game/games/in_the_darkness/InTheDarknessScreen.java
+++ b/core/src/cz/nic/tablexia/game/games/in_the_darkness/InTheDarknessGame.java
@@ -1,10 +1,9 @@
package cz.nic.tablexia.game.games.in_the_darkness;
import cz.nic.tablexia.game.AbstractTablexiaGame;
-import cz.nic.tablexia.game.games.robbery.rules.GameRule;
/**
* Created by Václav TarantĂk on 6.3.15.
*/
-public class InTheDarknessScreen extends AbstractTablexiaGame<GameRule> {
+public class InTheDarknessGame extends AbstractTablexiaGame<Void> {
}
diff --git a/core/src/cz/nic/tablexia/game/games/pursuit/PursuitScreen.java b/core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java
similarity index 54%
rename from core/src/cz/nic/tablexia/game/games/pursuit/PursuitScreen.java
rename to core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java
index 43ccbf1e9..95ec5b385 100644
--- a/core/src/cz/nic/tablexia/game/games/pursuit/PursuitScreen.java
+++ b/core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java
@@ -1,10 +1,9 @@
package cz.nic.tablexia.game.games.pursuit;
import cz.nic.tablexia.game.AbstractTablexiaGame;
-import cz.nic.tablexia.game.games.robbery.rules.GameRule;
/**
* Created by Václav TarantĂk on 6.3.15.
*/
-public class PursuitScreen extends AbstractTablexiaGame<GameRule> {
+public class PursuitGame extends AbstractTablexiaGame<Void> {
}
diff --git a/core/src/cz/nic/tablexia/game/games/shooting_range/ShootingRangeScreen.java b/core/src/cz/nic/tablexia/game/games/shooting_range/ShootingRangeGame.java
similarity index 54%
rename from core/src/cz/nic/tablexia/game/games/shooting_range/ShootingRangeScreen.java
rename to core/src/cz/nic/tablexia/game/games/shooting_range/ShootingRangeGame.java
index 21f844b62..efd52c6ed 100644
--- a/core/src/cz/nic/tablexia/game/games/shooting_range/ShootingRangeScreen.java
+++ b/core/src/cz/nic/tablexia/game/games/shooting_range/ShootingRangeGame.java
@@ -1,10 +1,9 @@
package cz.nic.tablexia.game.games.shooting_range;
import cz.nic.tablexia.game.AbstractTablexiaGame;
-import cz.nic.tablexia.game.games.robbery.rules.GameRule;
/**
* Created by Václav TarantĂk on 6.3.15.
*/
-public class ShootingRangeScreen extends AbstractTablexiaGame<GameRule> {
+public class ShootingRangeGame extends AbstractTablexiaGame<Void> {
}
--
GitLab