Fix merge issue with package rename (Pokemon -> pokemon) and stylecheck errors.

Author: Grover-c13

src/main/java/com/pokegoapi/api/map/Map.java

@@ -12,6 +12,7 @@
  *     You should have received a copy of the GNU General Public License
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 package com.pokegoapi.api.map;
 
 import POGOProtos.Map.Fort.FortDataOuterClass.FortData;
@@ -25,6 +26,7 @@
 import POGOProtos.Networking.Requests.Messages.EncounterMessageOuterClass;
 import POGOProtos.Networking.Requests.Messages.FortDetailsMessageOuterClass.FortDetailsMessage;
 import POGOProtos.Networking.Requests.Messages.FortSearchMessageOuterClass.FortSearchMessage;
+import POGOProtos.Networking.Requests.Messages.GetMapObjectsMessageOuterClass;
 import POGOProtos.Networking.Requests.Messages.GetMapObjectsMessageOuterClass.GetMapObjectsMessage;
 import POGOProtos.Networking.Requests.RequestTypeOuterClass;
 import POGOProtos.Networking.Responses.CatchPokemonResponseOuterClass.CatchPokemonResponse;
@@ -97,7 +99,7 @@ public List<CatchablePokemon> getCatchablePokemon() throws LoginFailedException,
 			catchablePokemons.add(new CatchablePokemon(api, mapPokemon));
 		}
 
-		for(WildPokemonOuterClass.WildPokemon wildPokemon : objects.getWildPokemons()){
+		for (WildPokemonOuterClass.WildPokemon wildPokemon : objects.getWildPokemons()) {
 			catchablePokemons.add(new CatchablePokemon(api, wildPokemon));
 		}
 
@@ -243,24 +245,22 @@ public MapObjects getMapObjects(List<Long> cellIds, double latitude, double long
 	 * @return MapObjects in the given cells
 	 */
 	public MapObjects getMapObjects(List<Long> cellIds) throws LoginFailedException, RemoteServerException {
-		GetMapObjectsMessage.Builder builder = GetMapObjectsMessage.newBuilder()
+		GetMapObjectsMessage.Builder builder = GetMapObjectsMessage.newBuilder();
 
-		if(useCache && (System.currentTimeMillis() - lastMapUpdate > mapObjectsExpiry)){
+		if (useCache && (System.currentTimeMillis() - lastMapUpdate > mapObjectsExpiry)) {
 			lastMapUpdate = 0;
 			cachedMapObjects = new MapObjects(api);
 		}
 
-		GetMapObjectsMessageOuterClass.GetMapObjectsMessage.Builder builder = GetMapObjectsMessageOuterClass.GetMapObjectsMessage.newBuilder()
+		builder = GetMapObjectsMessageOuterClass.GetMapObjectsMessage.newBuilder()
 				.setLatitude(api.getLatitude())
 				.setLongitude(api.getLongitude());
 
 		int index = 0;
 		for (Long cellId : cellIds) {
 			builder.addCellId(cellId);
 			long time = 0;
-			if (trackUpdate) {
-				time = lastMapUpdate;
-			}
+
 			builder.addSinceTimestampMs(lastMapUpdate);
 			index++;
 
@@ -295,7 +295,7 @@ public FortType apply(FortData fortData) {
 			result.addPokestops(groupedForts.get(FortType.CHECKPOINT));
 		}
 
-		if(useCache){
+		if (useCache) {
 			cachedMapObjects.update(result);
 			result = cachedMapObjects;
 			lastMapUpdate = System.currentTimeMillis();
@@ -318,8 +318,7 @@ public List<Long> getCellIds(double latitude, double longitude, int width) {
 
 		MutableInteger index = new MutableInteger(0);
 		MutableInteger jindex = new MutableInteger(0);
-		MutableInteger i = new MutableInteger(0);
-		MutableInteger j = new MutableInteger(0);
+
 
 		int level = cellId.level();
 		int size = 1 << (S2CellId.MAX_LEVEL - level);

src/main/java/com/pokegoapi/api/map/MapObjects.java

@@ -15,6 +15,7 @@
 
 package com.pokegoapi.api.map;
 
+import POGOProtos.Map.Fort.FortDataOuterClass;
 import POGOProtos.Map.Fort.FortDataOuterClass.FortData;
 import POGOProtos.Map.Pokemon.MapPokemonOuterClass.MapPokemon;
 import POGOProtos.Map.Pokemon.NearbyPokemonOuterClass.NearbyPokemon;
@@ -160,7 +161,13 @@ public boolean isComplete() {
 		return complete;
 	}
 
-	public void update(MapObjects other){
+
+	/**
+	 * updates the object.
+	 *
+	 *
+	 */
+	public void update(MapObjects other) {
 
 		nearbyPokemons.clear();
 		addNearbyPokemons(other.getNearbyPokemons());
@@ -177,19 +184,19 @@ public void update(MapObjects other){
 		spawnPoints.clear();
 		addSpawnPoints(other.getSpawnPoints());
 
-		for(FortDataOuterClass.FortData otherGym : other.getGyms()){
-			for(FortDataOuterClass.FortData gym : getGyms()){
-				if(otherGym.getId().equals(gym.getId())){
+		for (FortData otherGym : other.getGyms()) {
+			for (FortData gym : getGyms()) {
+				if (otherGym.getId().equals(gym.getId())) {
 					gyms.remove(gym);
 					break;
 				}
 			}
 			gyms.add(otherGym);
 		}
 
-		for(Pokestop otherPokestop : other.getPokestops()){
-			for(Pokestop pokestop : pokestops){
-				if(otherPokestop.getId().equals(pokestop.getId())){
+		for (Pokestop otherPokestop : other.getPokestops()) {
+			for (Pokestop pokestop : pokestops) {
+				if (otherPokestop.getId().equals(pokestop.getId())) {
 					pokestops.remove(pokestop);
 					break;
 				}

…/api/map/Pokemon/CatchPokemonResult.java …/api/map/pokemon/CatchPokemonResult.javasrc/main/java/com/pokegoapi/api/map/Pokemon/CatchPokemonResult.java renamed to src/main/java/com/pokegoapi/api/map/pokemon/CatchPokemonResult.java src/main/java/com/pokegoapi/api/map/Pokemon/CatchPokemonResult.java renamed to src/main/java/com/pokegoapi/api/map/pokemon/CatchPokemonResult.java

@@ -36,19 +36,19 @@ public boolean wasSuccessful() {
 		return response != null && getStatus() != null && getStatus().equals(EncounterResponse.Status.ENCOUNTER_SUCCESS);
 	}
 
-	public EncounterResponse.Background getBackground(){
+	public EncounterResponse.Background getBackground() {
 		return response.getBackground();
 	}
 
-	public CaptureProbabilityOuterClass.CaptureProbability getCaptureProbability(){
+	public CaptureProbabilityOuterClass.CaptureProbability getCaptureProbability() {
 		return response.getCaptureProbability();
 	}
 
-	public WildPokemonOuterClass.WildPokemon getWildPokemon(){
+	public WildPokemonOuterClass.WildPokemon getWildPokemon() {
 		return response.getWildPokemon();
 	}
 
-	public EncounterResponse toPrimitive(){
+	public EncounterResponse toPrimitive() {
 		return response;
 	}
 }