Changeset 33057 in osm for applications/editors/josm/plugins

Timestamp:

2016-11-13T16:21:17+01:00 (8 years ago)

Author:

donvip

Message:

fix error-prone warnings

Location:

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm

Files:

• gui/dialogs/TrustDialog.java (modified) (1 diff)
• util/TrustGPG.java (modified) (4 diffs)

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java

@@ -590 +590 @@
                     byte status = sigsAvailable && trust.getTagSigs().containsKey(key) ?
                             trust.getTagSigs().get(key).getStatus() : TrustSignatures.SIG_UNKNOWN;
-                    Byte oldstatus = rowStatus.containsKey(key) ? rowStatus.get(key) : new Byte(TrustSignatures.SIG_VALID);
-                    Byte sigstatus = new Byte(status);
+                    Byte oldstatus = rowStatus.containsKey(key) ? rowStatus.get(key) : Byte.valueOf(TrustSignatures.SIG_VALID);
+                    Byte sigstatus = Byte.valueOf(status);
                     Byte newstatus;
-                    if (sigstatus.equals(new Byte(TrustSignatures.SIG_BROKEN)) || oldstatus.equals(new Byte(TrustSignatures.SIG_BROKEN))) {
-                        newstatus = new Byte(TrustSignatures.SIG_BROKEN);
-                    } else if (sigstatus.equals(new Byte(TrustSignatures.SIG_UNKNOWN))
-                            || oldstatus.equals(new Byte(TrustSignatures.SIG_UNKNOWN))) {
-                        newstatus = new Byte(TrustSignatures.SIG_UNKNOWN);
-                    } else newstatus = new Byte(TrustSignatures.SIG_VALID);
+                    if (sigstatus.equals(Byte.valueOf(TrustSignatures.SIG_BROKEN))
+                            || oldstatus.equals(Byte.valueOf(TrustSignatures.SIG_BROKEN))) {
+                        newstatus = Byte.valueOf(TrustSignatures.SIG_BROKEN);
+                    } else if (sigstatus.equals(Byte.valueOf(TrustSignatures.SIG_UNKNOWN))
+                            || oldstatus.equals(Byte.valueOf(TrustSignatures.SIG_UNKNOWN))) {
+                        newstatus = Byte.valueOf(TrustSignatures.SIG_UNKNOWN);
+                    } else newstatus = Byte.valueOf(TrustSignatures.SIG_VALID);
 
                     rowStatus.put(key, newstatus);

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java

@@ -16 +16 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
@@ -29 +30 @@
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Random;
 import java.util.Vector;
@@ -467 +469 @@
 
         JFormattedTextField meters = new JFormattedTextField(NumberFormat.getNumberInstance());
-        meters.setValue(new Double(10));
+        meters.setValue(Double.valueOf(10));
         meters.setColumns(5);
 
@@ -624 +626 @@
         }
 
-        String fingerprint = new String(Hex.encode(key.getFingerprint())).toUpperCase();
-        String keyid = "0x"+Long.toHexString(key.getKeyID()).substring(8).toUpperCase();
+        String fingerprint = new String(Hex.encode(key.getFingerprint()), StandardCharsets.UTF_8).toUpperCase(Locale.ENGLISH);
+        String keyid = "0x"+Long.toHexString(key.getKeyID()).substring(8).toUpperCase(Locale.ENGLISH);
 
         String algorithm = "";