Skip to content

Commit 1b9a97f

Browse files
committed
typo
1 parent cb54310 commit 1b9a97f

File tree

7 files changed

+50
-68
lines changed

7 files changed

+50
-68
lines changed

library/src/main/java/com/pokegoapi/api/PokemonGo.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
import lombok.Getter;
6363
import lombok.Setter;
6464
import okhttp3.OkHttpClient;
65-
6665
import java.io.IOException;
6766
import java.lang.reflect.Method;
6867
import java.util.ArrayList;
@@ -71,9 +70,7 @@
7170
import java.util.Random;
7271
import java.util.UUID;
7372

74-
7573
public class PokemonGo {
76-
7774
private static final java.lang.String TAG = PokemonGo.class.getSimpleName();
7875
private final Time time;
7976
@Getter
@@ -114,29 +111,22 @@ public class PokemonGo {
114111
@Getter
115112
@Setter
116113
public LocationFixes locationFixes;
117-
118114
@Setter
119115
private boolean hasChallenge;
120116
@Getter
121117
private String challengeURL;
122118
private final Object challengeLock = new Object();
123-
124119
@Getter
125120
private List<Listener> listeners = Collections.synchronizedList(new ArrayList<Listener>());
126-
127121
private final Object lock = new Object();
128-
129122
@Getter
130123
public boolean loggingIn;
131124
@Getter
132125
private boolean active;
133-
134126
@Getter
135127
private Heartbeat heartbeat = new Heartbeat(this);
136-
137128
@Getter
138129
public HashProvider hashProvider;
139-
140130
private OkHttpClient client;
141131

142132
/**
@@ -399,9 +389,9 @@ public void setLocation(double latitude, double longitude, double altitude, doub
399389
//setAccuracy(accuracy);
400390
}
401391

402-
public long currentTimeMillis() {
403-
return time.currentTimeMillis();
404-
}
392+
public long currentTimeMillis() {
393+
return time.currentTimeMillis();
394+
}
405395

406396
/**
407397
* Validates and sets a given latitude value

library/src/main/java/com/pokegoapi/api/map/Point.java

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,43 +16,40 @@
1616
package com.pokegoapi.api.map;
1717

1818
import POGOProtos.Map.SpawnPointOuterClass;
19-
2019
import com.pokegoapi.util.MapPoint;
21-
2220
import lombok.Getter;
2321
import lombok.Setter;
2422

2523
public class Point implements MapPoint {
26-
27-
@Setter
28-
public double longitude;
29-
@Setter
30-
public double latitude;
31-
32-
public Point(double latitude, double longitude) {
33-
this.latitude = latitude;
34-
this.longitude = longitude;
35-
}
36-
37-
public Point(SpawnPointOuterClass.SpawnPoint spawnpoint) {
38-
this.latitude = spawnpoint.getLatitude();
39-
this.longitude = spawnpoint.getLongitude();
40-
}
41-
42-
@Override
43-
public String toString() {
44-
StringBuilder builder = new StringBuilder();
45-
builder.append(this.latitude);
46-
builder.append(", ");
47-
builder.append(this.longitude);
48-
return builder.toString();
49-
}
50-
51-
public double getLatitude() {
52-
return this.latitude;
53-
}
54-
55-
public double getLongitude() {
56-
return this.longitude;
57-
}
24+
@Setter
25+
public double longitude;
26+
@Setter
27+
public double latitude;
28+
29+
public Point(double latitude, double longitude) {
30+
this.latitude = latitude;
31+
this.longitude = longitude;
32+
}
33+
34+
public Point(SpawnPointOuterClass.SpawnPoint spawnpoint) {
35+
this.latitude = spawnpoint.getLatitude();
36+
this.longitude = spawnpoint.getLongitude();
37+
}
38+
39+
@Override
40+
public String toString() {
41+
StringBuilder builder = new StringBuilder();
42+
builder.append(this.latitude);
43+
builder.append(", ");
44+
builder.append(this.longitude);
45+
return builder.toString();
46+
}
47+
48+
public double getLatitude() {
49+
return this.latitude;
50+
}
51+
52+
public double getLongitude() {
53+
return this.longitude;
54+
}
5855
}

library/src/main/java/com/pokegoapi/api/map/fort/Pokestop.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import POGOProtos.Map.Fort.FortModifierOuterClass;
2121
import com.pokegoapi.api.PokemonGo;
2222
import com.pokegoapi.exceptions.request.RequestFailedException;
23-
2423
import java.util.List;
2524

2625
/**
@@ -35,9 +34,9 @@ public class Pokestop extends Fort {
3534
* @param fortData the fort data
3635
*/
3736
public Pokestop(PokemonGo api, FortDataOuterClass.FortData fortData) {
38-
super(api, fortData);
37+
super(api, fortData);
3938
}
40-
39+
4140
/**
4241
* Returns whether this pokestop has an active lure.
4342
*
@@ -48,7 +47,7 @@ public boolean hasLurePokemon() {
4847
return fortData.hasLureInfo() && fortData.getLureInfo().getLureExpiresTimestampMs() > api.startTime;
4948
}
5049

51-
/**
50+
/**
5251
* Returns whether this pokestop has an active lure when detected on map.
5352
*
5453
* @return true if this pokestop currently has a lure active
@@ -69,7 +68,7 @@ public boolean hasLure() {
6968
public boolean inRangeForLuredPokemon() {
7069
return getDistance() <= api.settings.mapSettings.pokemonVisibilityRange;
7170
}
72-
71+
7372
/**
7473
* Returns whether this pokestop has an active lure.
7574
*

library/src/main/java/com/pokegoapi/api/map/pokemon/CatchablePokemon.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public class CatchablePokemon implements MapPoint {
4848
private final double longitude;
4949
private final EncounterKind encounterKind;
5050
private Encounter encounter = null;
51-
5251
@Getter
5352
@Setter
5453
public boolean despawned = false;
@@ -199,17 +198,17 @@ public boolean isFromIncense() {
199198
return encounterKind == EncounterKind.INCENSE;
200199
}
201200

202-
private enum EncounterKind {
201+
private enum EncounterKind {
203202
NORMAL,
204203
DISK,
205204
INCENSE
206205
}
207206

208-
public double getLatitude() {
209-
return this.latitude;
210-
}
207+
public double getLatitude() {
208+
return this.latitude;
209+
}
211210

212-
public double getLongitude() {
213-
return this.longitude;
214-
}
211+
public double getLongitude() {
212+
return this.longitude;
213+
}
215214
}

library/src/main/java/com/pokegoapi/auth/PtcAuthError.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import lombok.Setter;
1919

2020
public class PtcAuthError {
21-
2221
@Getter
2322
@Setter
2423
public String[] errors;

library/src/main/java/com/pokegoapi/main/ServerRequestEnvelope.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import lombok.Getter;
2424
import lombok.Setter;
2525
import rx.Observable;
26-
2726
import java.util.ArrayList;
2827
import java.util.Collections;
2928
import java.util.List;
@@ -33,14 +32,13 @@
3332
import java.util.concurrent.TimeoutException;
3433

3534
public class ServerRequestEnvelope {
36-
@Getter
37-
@Setter
38-
public ServerRequest request;
35+
@Getter
36+
@Setter
37+
public ServerRequest request;
3938
@Getter
4039
public List<ServerPlatformRequest> platformRequests = new ArrayList<>();
4140
@Getter
4241
public List<ServerRequest> commons;
43-
4442
private Observable<ServerResponse> observable;
4543
private ServerResponse response;
4644
private final Object responseLock = new Object();
@@ -153,7 +151,7 @@ public void removeCommons(ServerRequest... commons) {
153151
}
154152
}
155153

156-
/**
154+
/**
157155
* Adds a platform request to this envelope
158156
*
159157
* @param request the request to add

library/src/main/java/com/pokegoapi/util/MapPoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public interface MapPoint {
2525
*
2626
* @return the latitude
2727
*/
28-
double getLatitude();
28+
double getLatitude();
2929

3030
/**
3131
* Gets longitude.

0 commit comments

Comments
 (0)