Skip to content

Commit 4e5cbc2

Browse files
shai-almogshai-almog
authored
Fix spotbugs dead stores and parsing warnings (#3983)
1 parent 5c0f525 commit 4e5cbc2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+428
-292
lines changed

‎CodenameOne/src/com/codename1/charts/ChartComponent.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -869,15 +869,14 @@ private void zoomTransition(double minX, double maxX, double minY, double maxY,
869869
} else {
870870
Shape currentViewPort = screenToChartShape(new Rectangle(getAbsoluteX(), getAbsoluteY(), getWidth(), getHeight()));
871871
float[] currentRect = currentViewPort.getBounds2D();
872-
float[] newRect = new float[]{(float) minX, (float) (maxX - minX), (float) minY, (float) (maxY - minY)};
873872

874873
float currentAspect = currentRect[2] / currentRect[3];
875-
float newAspect = 1.0f;
876-
Rectangle newViewPort = new Rectangle((int) newRect[0], (int) newRect[1], (int) newRect[2], (int) newRect[3]);
877-
if (newAspect != currentAspect) {
878-
newViewPort.setHeight((int) (((double) newViewPort.getWidth()) / currentAspect));
879-
newRect = newViewPort.getBounds2D();
880-
newAspect = newRect[2] / newRect[3];
874+
Rectangle newViewPort = new Rectangle((int) minX, (int) (maxX - minX), (int) minY, (int) (maxY - minY));
875+
if (newViewPort.getHeight() != 0) {
876+
float newAspect = (float) newViewPort.getWidth() / (float) newViewPort.getHeight();
877+
if (newAspect != currentAspect) {
878+
newViewPort.setHeight((int) (((double) newViewPort.getWidth()) / currentAspect));
879+
}
881880
}
882881

883882
ZoomTransition zt = new ZoomTransition(currentViewPort.getBounds(), newViewPort, duration);

‎CodenameOne/src/com/codename1/charts/views/XYChart.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,10 @@ public void draw(Canvas canvas, int x, int y, int width, int height, Paint paint
278278
seriesRenderer.isDisplayBoundingPoints());
279279
int startIndex = -1;
280280

281-
for (Double value : range.keySet()) {
282-
double xValue = value;
283-
Double rValue = range.get(value);
281+
for (Map.Entry<Double, Double> entry : range.entrySet()) {
282+
Double value = entry.getKey();
283+
double xValue = value.doubleValue();
284+
Double rValue = entry.getValue();
284285
double yValue = rValue.doubleValue();
285286
if (startIndex < 0 && (!isNullValue(yValue) || isRenderNullValues())) {
286287
startIndex = series.getIndexForKey(xValue);

‎CodenameOne/src/com/codename1/components/Ads.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ public String getAd() {
217217
* @param ad the ad to set
218218
*/
219219
public void setAd(String ad) {
220+
this.ad = ad;
220221
HTMLComponent html = new HTMLComponent(new AsyncDocumentRequestHandlerImpl() {
221222

222223
protected ConnectionRequest createConnectionRequest(DocumentInfo docInfo, IOCallback callback, Object[] response) {

‎CodenameOne/src/com/codename1/components/ButtonList.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ protected void onReady(Runnable r) {
131131
* buttons.
132132
*/
133133
protected void fireReady() {
134+
ready = true;
134135
for (Runnable r : onReady) {
135136
r.run();
136137
}

‎CodenameOne/src/com/codename1/facebook/User.java‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,29 @@ private void init(Hashtable toCopy) {
210210
email = (String) toCopy.get("email");
211211
website = (String) toCopy.get("website");
212212
bio = (String) toCopy.get("bio");
213+
quotes = (String) toCopy.get("quotes");
213214
gender = (String) toCopy.get("gender");
214215
relationship_status = (String) toCopy.get("relationship_status");
215-
//timezone = Long.parseLong((String) toCopy.get("timezone"));
216+
Object tz = toCopy.get("timezone");
217+
if (tz instanceof Integer) {
218+
timezone = ((Integer) tz).longValue();
219+
} else if (tz instanceof Long) {
220+
timezone = ((Long) tz).longValue();
221+
} else if (tz instanceof Short) {
222+
timezone = ((Short) tz).shortValue();
223+
} else if (tz instanceof Byte) {
224+
timezone = ((Byte) tz).byteValue();
225+
} else if (tz instanceof Double) {
226+
timezone = (long) ((Double) tz).doubleValue();
227+
} else if (tz instanceof Float) {
228+
timezone = (long) ((Float) tz).floatValue();
229+
} else if (tz instanceof String) {
230+
try {
231+
timezone = Long.parseLong((String) tz);
232+
} catch (NumberFormatException ignore) {
233+
timezone = 0;
234+
}
235+
}
216236
last_updated = (String) toCopy.get("last_updated");
217237
locale = (String) toCopy.get("locale");
218238
Hashtable l = (Hashtable) toCopy.get("location");

‎CodenameOne/src/com/codename1/io/ConnectionRequest.java‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,19 +1609,20 @@ protected void postResponse() {
16091609
protected String createRequestURL() {
16101610
if (!post && requestArguments != null) {
16111611
StringBuilder b = new StringBuilder(url);
1612-
Iterator e = requestArguments.keySet().iterator();
1613-
if (e.hasNext()) {
1612+
Iterator entries = requestArguments.entrySet().iterator();
1613+
if (entries.hasNext()) {
16141614
b.append("?");
16151615
}
1616-
while (e.hasNext()) {
1617-
String key = (String) e.next();
1618-
Object requestVal = requestArguments.get(key);
1616+
while (entries.hasNext()) {
1617+
Map.Entry entry = (Map.Entry) entries.next();
1618+
String key = (String) entry.getKey();
1619+
Object requestVal = entry.getValue();
16191620
if (requestVal instanceof String) {
16201621
String value = (String) requestVal;
16211622
b.append(key);
16221623
b.append("=");
16231624
b.append(value);
1624-
if (e.hasNext()) {
1625+
if (entries.hasNext()) {
16251626
b.append("&");
16261627
}
16271628
continue;
@@ -1637,7 +1638,7 @@ protected String createRequestURL() {
16371638
b.append(key);
16381639
b.append("=");
16391640
b.append(val[vlen - 1]);
1640-
if (e.hasNext()) {
1641+
if (entries.hasNext()) {
16411642
b.append("&");
16421643
}
16431644
}
@@ -1655,16 +1656,17 @@ protected String createRequestURL() {
16551656
protected void buildRequestBody(OutputStream os) throws IOException {
16561657
if (post && requestArguments != null) {
16571658
StringBuilder val = new StringBuilder();
1658-
Iterator e = requestArguments.keySet().iterator();
1659-
while (e.hasNext()) {
1660-
String key = (String) e.next();
1661-
Object requestVal = requestArguments.get(key);
1659+
Iterator entries = requestArguments.entrySet().iterator();
1660+
while (entries.hasNext()) {
1661+
Map.Entry entry = (Map.Entry) entries.next();
1662+
String key = (String) entry.getKey();
1663+
Object requestVal = entry.getValue();
16621664
if (requestVal instanceof String) {
16631665
String value = (String) requestVal;
16641666
val.append(key);
16651667
val.append("=");
16661668
val.append(value);
1667-
if (e.hasNext()) {
1669+
if (entries.hasNext()) {
16681670
val.append("&");
16691671
}
16701672
continue;
@@ -1680,7 +1682,7 @@ protected void buildRequestBody(OutputStream os) throws IOException {
16801682
val.append(key);
16811683
val.append("=");
16821684
val.append(valArray[vlen - 1]);
1683-
if (e.hasNext()) {
1685+
if (entries.hasNext()) {
16841686
val.append("&");
16851687
}
16861688
}
@@ -2314,10 +2316,11 @@ public boolean equals(Object o) {
23142316
if (r.url == url) {
23152317
if (requestArguments != null) {
23162318
if (r.requestArguments != null && requestArguments.size() == r.requestArguments.size()) {
2317-
Iterator e = requestArguments.keySet().iterator();
2318-
while (e.hasNext()) {
2319-
Object key = e.next();
2320-
Object value = requestArguments.get(key);
2319+
Iterator entries = requestArguments.entrySet().iterator();
2320+
while (entries.hasNext()) {
2321+
Map.Entry entry = (Map.Entry) entries.next();
2322+
Object key = entry.getKey();
2323+
Object value = entry.getValue();
23212324
Object otherValue = r.requestArguments.get(key);
23222325
if (!value.equals(otherValue)) {
23232326
return false;

‎CodenameOne/src/com/codename1/io/MultipartRequest.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.Hashtable;
3333
import java.util.Iterator;
3434
import java.util.LinkedHashMap;
35+
import java.util.Map;
3536
import java.util.Vector;
3637

3738
/**
@@ -247,7 +248,7 @@ public void addArgument(String name, String value) {
247248

248249
protected long calculateContentLength() {
249250
long length = 0L;
250-
Iterator e = args.keySet().iterator();
251+
Iterator entries = args.entrySet().iterator();
251252

252253
long dLength = "Content-Disposition: form-data; name=\"\"; filename=\"\"".length() + 2; // 2 = CRLF
253254
long ctLength = "Content-Type: ".length() + 2; // 2 = CRLF
@@ -258,9 +259,10 @@ protected long calculateContentLength() {
258259
ctLength = "Content-Type: text/plain; charset=UTF-8".length() + 4; // 4 = 2 * CRLF
259260
long baseTextLength = dLength + ctLength + bLength + 2; // 2 = CRLF at end of part
260261

261-
while (e.hasNext()) {
262-
String key = (String) e.next();
263-
Object value = args.get(key);
262+
while (entries.hasNext()) {
263+
Map.Entry entry = (Map.Entry) entries.next();
264+
String key = (String) entry.getKey();
265+
Object value = entry.getValue();
264266
if (value instanceof String) {
265267
length += baseTextLength;
266268
length += key.length();
@@ -319,13 +321,14 @@ protected long calculateContentLength() {
319321
protected void buildRequestBody(OutputStream os) throws IOException {
320322
Writer writer = null;
321323
writer = new OutputStreamWriter(os, "UTF-8");
322-
Iterator e = args.keySet().iterator();
323-
while (e.hasNext()) {
324+
Iterator entries = args.entrySet().iterator();
325+
while (entries.hasNext()) {
324326
if (shouldStop()) {
325327
break;
326328
}
327-
String key = (String) e.next();
328-
Object value = args.get(key);
329+
Map.Entry entry = (Map.Entry) entries.next();
330+
String key = (String) entry.getKey();
331+
Object value = entry.getValue();
329332

330333
writer.write("--");
331334
writer.write(boundary);

‎CodenameOne/src/com/codename1/io/NetworkManager.java‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -829,10 +829,18 @@ private boolean runCurrentRequest(@Async.Execute ConnectionRequest req) {
829829
}
830830
pending.addElement(currentRequest);
831831
LOCK.notify();
832-
try {
833-
LOCK.wait(30);
834-
} catch (InterruptedException ex) {
835-
ex.printStackTrace();
832+
long end = System.currentTimeMillis() + 30;
833+
while (true) {
834+
long remaining = end - System.currentTimeMillis();
835+
if (remaining <= 0) {
836+
break;
837+
}
838+
try {
839+
LOCK.wait(remaining);
840+
break;
841+
} catch (InterruptedException ex) {
842+
ex.printStackTrace();
843+
}
836844
}
837845
}
838846
}
@@ -964,7 +972,7 @@ public void run() {
964972
// prevent waiting when there is still a pending request
965973
// this can occur with a race condition since the synchronize
966974
// scope is limited to prevent blocking on add...
967-
if (pending.size() == 0) {
975+
while (pending.size() == 0 && running && !stopped) {
968976
LOCK.wait();
969977
}
970978
} catch (InterruptedException ex) {

‎CodenameOne/src/com/codename1/io/Properties.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.HashMap;
3434
import java.util.Hashtable;
3535
import java.util.Iterator;
36+
import java.util.Map;
3637
import java.util.Set;
3738

3839
/**
@@ -387,15 +388,14 @@ private <K> void selectProperties(Hashtable<K, Object> selectProperties, final b
387388
if (defaults != null) {
388389
defaults.selectProperties(selectProperties, isStringOnly);
389390
}
390-
Iterator<String> keys = keySet().iterator();
391-
while (keys.hasNext()) {
391+
for (Map.Entry<String, String> entry : entrySet()) {
392392
@SuppressWarnings("unchecked")
393-
K key = (K) keys.next();
393+
K key = (K) entry.getKey();
394394
if (isStringOnly && !(key instanceof String)) {
395395
// Only select property with string key and value
396396
continue;
397397
}
398-
Object value = get(key);
398+
Object value = entry.getValue();
399399
selectProperties.put(key, value);
400400
}
401401
}

‎CodenameOne/src/com/codename1/io/URL.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ public void connect() throws IOException {
273273
connection = impl.connect(url, doInput, doOutput);
274274
impl.setHttpMethod(connection, requestMethod);
275275
if (properties != null && !properties.isEmpty()) {
276-
for (String key : properties.keySet()) {
277-
impl.setHeader(connection, key, properties.get(key));
276+
for (Map.Entry<String, String> entry : properties.entrySet()) {
277+
impl.setHeader(connection, entry.getKey(), entry.getValue());
278278
}
279279
}
280280
}

0 commit comments

Comments
 (0)