From 33345acabd5f36b98f56dc94c54a687676a10f56 Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Mon, 28 Jan 2013 01:25:40 +0100
Subject: [PATCH] Add public visibility for methods used in unit tests.

---
 .../activity/HeroinfoActivity_Skills.java     | 20 +++++++---------
 .../controller/MovementController.java        |  2 +-
 .../controller/SkillController.java           | 24 ++++++++-----------
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity_Skills.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity_Skills.java
index 8fd4da54f..8354a5e53 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity_Skills.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity_Skills.java
@@ -1,22 +1,20 @@
 package com.gpl.rpg.AndorsTrail.activity;
 
-import com.gpl.rpg.AndorsTrail.Dialogs;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.context.ViewContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.controller.SkillController;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.view.SkillListAdapter;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.AdapterView.OnItemClickListener;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ViewContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.view.SkillListAdapter;
 
 public final class HeroinfoActivity_Skills extends Activity {
 	private WorldContext world;
@@ -62,7 +60,7 @@ public final class HeroinfoActivity_Skills extends Activity {
 			if (resultCode != RESULT_OK) break;
 			
 			int skillID = data.getExtras().getInt("skillID");
-			view.skillController.levelUpSkillManually(player, skillID);
+			view.skillController.levelUpSkillManually(player, world.skills.getSkill(skillID));
 			break;
 		}
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
index ea2c9c759..3217350ee 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
@@ -58,7 +58,7 @@ public final class MovementController implements TimedMessageTask.Callback {
 		task.execute();
     }
 	
-	private void placePlayerAt(final Resources res, int objectType, String mapName, String placeName, int offset_x, int offset_y) {
+	public void placePlayerAt(final Resources res, int objectType, String mapName, String placeName, int offset_x, int offset_y) {
     	if (mapName == null || placeName == null) return;
 		PredefinedMap newMap = world.maps.findPredefinedMap(mapName);
 		if (newMap == null) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
index b1aec1777..0d463ea0e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
@@ -23,16 +23,6 @@ public final class SkillController {
 		this.view = view;
 		this.world = world;
 	}
-	
-	public void addSkillLevel(int skillID, boolean requireAvailableSkillpoint) {
-		Player player = world.model.player;
-		if (requireAvailableSkillpoint) {
-			if (!player.hasAvailableSkillpoints()) return;
-			--player.availableSkillIncreases;
-		}
-		player.skillLevels.put(skillID, player.skillLevels.get(skillID) + 1);
-		view.actorStatsController.recalculatePlayerStats(player);
-	}
 
 	public void applySkillEffects(Player player) {
 		player.attackChance += SkillCollection.PER_SKILLPOINT_INCREASE_WEAPON_CHANCE * player.getSkillLevel(SkillCollection.SKILL_WEAPON_CHANCE);
@@ -106,14 +96,20 @@ public final class SkillController {
 		}
 		return true;
 	}
-	public static void levelUpSkillManually(Player player, SkillInfo skill) {
+	public void levelUpSkillManually(Player player, SkillInfo skill) {
 		if (!canLevelupSkillManually(player, skill)) return;
 		player.availableSkillIncreases -= 1;
-		player.addSkillLevel(skill.id);
+		addSkillLevel(skill.id);
 	}
-	public static void levelUpSkillByQuest(Player player, SkillInfo skill) {
+	public void levelUpSkillByQuest(Player player, SkillInfo skill) {
 		if (!canLevelupSkillWithQuest(player, skill)) return;
-		player.addSkillLevel(skill.id);
+		addSkillLevel(skill.id);
+	}
+
+	private void addSkillLevel(int skillID) {
+		Player player = world.model.player;
+		player.skillLevels.put(skillID, player.skillLevels.get(skillID) + 1);
+		view.actorStatsController.recalculatePlayerStats(player);
 	}
 	
 	public static int getActorConditionEffectChanceRollBias(ActorConditionEffect effect, Player player) {