Use a reset instead of using another instance

rtaylor205 · Jul 24, 2016 · 995313a · 995313a
1 parent a2f3be9
commit 995313a
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 12 deletions.
diff --git a/src/main/java/com/pokegoapi/api/inventory/CandyJar.java b/src/main/java/com/pokegoapi/api/inventory/CandyJar.java
@@ -28,6 +28,10 @@ public class CandyJar {
 	private HashMap<PokemonFamilyId, Integer> candies;
 
 	public CandyJar(PokemonGo pgo) {
+		reset(pgo);
+	}
+
+	public void reset(PokemonGo pgo) {
 		this.pgo = pgo;
 		candies = new HashMap<>();
 	}

diff --git a/src/main/java/com/pokegoapi/api/inventory/Hatchery.java b/src/main/java/com/pokegoapi/api/inventory/Hatchery.java
@@ -31,8 +31,12 @@ public class Hatchery {
 	@Getter
 	PokemonGo instance;
 
-	public Hatchery(PokemonGo instance) {
-		this.instance = instance;
+	public Hatchery(PokemonGo pgo) {
+		reset(pgo);
+	}
+
+	public void reset(PokemonGo pgo) {
+		this.instance = pgo;
 	}
 
 	public void addEgg(EggPokemon egg) {

diff --git a/src/main/java/com/pokegoapi/api/inventory/Inventories.java b/src/main/java/com/pokegoapi/api/inventory/Inventories.java
@@ -94,12 +94,12 @@ public void updateInventories() throws LoginFailedException, RemoteServerExcepti
 	public void updateInventories(boolean forceUpdate) throws LoginFailedException, RemoteServerException {
 		if (forceUpdate) {
 			lastInventoryUpdate = 0;
-			itemBag = new ItemBag(api);
-			pokebank = new PokeBank(api);
-			candyjar = new CandyJar(api);
-			pokedex = new Pokedex(api);
+			itemBag.reset(api);
+			pokebank.reset(api);
+			candyjar.reset(api);
+			pokedex.reset(api);
 			incubators = new ArrayList<>();
-			hatchery = new Hatchery(api);
+			hatchery.reset(api);
 		}
 		GetInventoryMessage invReqMsg = GetInventoryMessage.newBuilder()
 				.setLastTimestampMs(lastInventoryUpdate)

diff --git a/src/main/java/com/pokegoapi/api/inventory/ItemBag.java b/src/main/java/com/pokegoapi/api/inventory/ItemBag.java
@@ -40,6 +40,10 @@ public class ItemBag {
 	private HashMap<ItemId, Item> items;
 
 	public ItemBag(PokemonGo pgo) {
+		reset(pgo);
+	}
+
+	public void reset(PokemonGo pgo) {
 		this.pgo = pgo;
 		items = new HashMap<>();
 	}

diff --git a/src/main/java/com/pokegoapi/api/inventory/PokeBank.java b/src/main/java/com/pokegoapi/api/inventory/PokeBank.java
@@ -33,8 +33,12 @@ public class PokeBank {
 	@Getter
 	PokemonGo instance;
 
-	public PokeBank(PokemonGo instance) {
-		this.instance = instance;
+	public PokeBank(PokemonGo pgo) {
+		reset(pgo);
+	}
+
+	public void reset(PokemonGo pgo) {
+		this.instance = pgo;
 	}
 
 	/**

diff --git a/src/main/java/com/pokegoapi/api/inventory/Pokedex.java b/src/main/java/com/pokegoapi/api/inventory/Pokedex.java
@@ -24,11 +24,15 @@
 
 public class Pokedex {
 
-	private final PokemonGo api;
+	private PokemonGo api;
 	private Map<PokemonId, PokedexEntry> pokedexMap = new HashMap();
 
-	public Pokedex(PokemonGo api) {
-		this.api = api;
+	public Pokedex(PokemonGo pgo) {
+		reset(pgo);
+	}
+
+	public void reset(PokemonGo pgo) {
+		this.api = pgo;
 	}
 
 	/**