From e8d0162cebc857d3bf4f15b2904fb672d75ff8f7 Mon Sep 17 00:00:00 2001 From: Oskar Wiksten Date: Sun, 3 Nov 2013 15:01:57 +0100 Subject: [PATCH] Refactor: Reduce warnings / reduce scope --- .../rpg/AndorsTrail/activity/ConversationActivity.java | 2 +- .../gpl/rpg/AndorsTrail/activity/StartScreenActivity.java | 2 +- .../AndorsTrail/controller/ConversationController.java | 2 +- .../com/gpl/rpg/AndorsTrail/controller/PathFinder.java | 3 +-- .../src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java | 2 +- .../gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java | 2 +- .../rpg/AndorsTrail/model/map/ReplaceableMapSection.java | 2 +- .../resource/parsers/json/JsonArrayParserFor.java | 7 ++++++- .../gpl/rpg/AndorsTrail/resource/tiles/TileManager.java | 4 ---- .../src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java | 8 +------- 10 files changed, 14 insertions(+), 20 deletions(-) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java index 401239b02..c4edc6532 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java @@ -49,7 +49,7 @@ public final class ConversationActivity private WorldContext world; private Player player; - private ArrayList conversationHistory = new ArrayList(); + private final ArrayList conversationHistory = new ArrayList(); private ConversationController.ConversationStatemachine conversationState; private StatementContainerAdapter listAdapter; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java index 14389c272..e9f0991f5 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java @@ -22,7 +22,7 @@ import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader; public final class StartScreenActivity extends Activity { - public static final int INTENTREQUEST_PREFERENCES = 7; + private static final int INTENTREQUEST_PREFERENCES = 7; public static final int INTENTREQUEST_LOADGAME = 9; private boolean hasExistingGame = false; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java index c56b2c8e9..020d35b1c 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java @@ -283,7 +283,7 @@ public final class ConversationController { private String phraseID; private Phrase currentPhrase; private Monster npc; - public ConversationStateListener listener; + public final ConversationStateListener listener; public ConversationStatemachine(WorldContext world, ControllerContext controllers, ConversationStateListener listener) { this.world = world; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java index be32ef6d3..68f5017b6 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java @@ -11,7 +11,6 @@ public class PathFinder { private final boolean visited[]; private final ListOfCoords visitQueue; private final EvaluateWalkable map; - public int iterations = 0; public PathFinder(int maxWidth, int maxHeight, EvaluateWalkable map) { this.maxWidth = maxWidth; @@ -26,7 +25,7 @@ public class PathFinder { } public boolean findPathBetween(final CoordRect from, final Coord to, CoordRect nextStep) { - iterations = 0; + int iterations = 0; if (from.equals(to)) return false; Coord measureDistanceTo = from.topLeft; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java index b804a5145..24fcb2250 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java @@ -26,7 +26,7 @@ public final class MapObject { public final String id; //placeName on this map or phraseID public final String map; public final String place; - public final String group; + private final String group; public final Requirement enteringRequirement; public final DropList dropList; public final MapObjectEvaluationType evaluateWhen; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java index 7940f1356..c57783698 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java @@ -21,7 +21,7 @@ public final class MonsterSpawnArea { public final String[] monsterTypeIDs; public final ArrayList monsters = new ArrayList(); public final boolean isUnique; // unique == non-respawnable - public final String group; + private final String group; public boolean isSpawning; public final boolean isSpawningForNewGame; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/ReplaceableMapSection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/ReplaceableMapSection.java index 92232584c..2ad5c5fb3 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/ReplaceableMapSection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/ReplaceableMapSection.java @@ -8,7 +8,7 @@ public final class ReplaceableMapSection { public final CoordRect replacementArea; public final MapSection replaceLayersWith; public final QuestProgress requireQuestStage; - public final String group; + private final String group; public ReplaceableMapSection( CoordRect replacementArea diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java index 5887b5ef8..20d9d5e70 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java @@ -19,6 +19,11 @@ public abstract class JsonArrayParserFor extends JsonParserFor { final ArrayList arrayList = new ArrayList(array.length()); parseRows(array, arrayList); if (arrayList.isEmpty()) return null; - return arrayList.toArray((T[]) Array.newInstance(classType, arrayList.size())); + return arrayList.toArray(newArray(arrayList.size())); + } + + @SuppressWarnings("unchecked") + private T[] newArray(int size) { + return (T[]) Array.newInstance(classType, size); } } diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java index 05e141b1d..407047796 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java @@ -163,10 +163,6 @@ public final class TileManager { public void setImageViewTile(ImageView imageView, ActorConditionType conditionType) { imageView.setImageBitmap(preloadedTiles.getBitmap(conditionType.iconID)); } public void setImageViewTileForUIIcon(ImageView imageView, int iconID) { imageView.setImageBitmap(preloadedTiles.getBitmap(iconID)); } - public void setImageViewTileForSingleItemType(Resources res, ImageView imageView, ItemType itemType) { - final Bitmap icon = tileCache.loadSingleTile(itemType.iconID, res); - setImageViewTile(res, imageView, itemType, icon); - } public void setImageViewTile(Resources res, ImageView imageView, ItemType itemType, TileCollection itemTileCollection) { final Bitmap icon = itemTileCollection.getBitmap(itemType.iconID); setImageViewTile(res, imageView, itemType, icon); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java index 1ac070391..a1f9b0451 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java @@ -140,7 +140,7 @@ public final class Savegames { } private static final Pattern savegameFilenamePattern = Pattern.compile(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX + "(\\d+)"); - public static List getUsedSavegameSlots(Context androidContext) { + public static List getUsedSavegameSlots() { try { final List result = new ArrayList(); getSavegameDirectory().listFiles(new FilenameFilter() { @@ -166,12 +166,6 @@ public final class Savegames { public final String playerName; public final String displayInfo; - public FileHeader(String playerName, String displayInfo) { - this.fileversion = AndorsTrailApplication.CURRENT_VERSION; - this.playerName = playerName; - this.displayInfo = displayInfo; - } - public String describe() { return playerName + ", " + displayInfo; }