Changeset 33057 in osm
- Timestamp:
- 2016-11-13T16:21:17+01:00 (8 years ago)
- Location:
- applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java
r32533 r33057 590 590 byte status = sigsAvailable && trust.getTagSigs().containsKey(key) ? 591 591 trust.getTagSigs().get(key).getStatus() : TrustSignatures.SIG_UNKNOWN; 592 Byte oldstatus = rowStatus.containsKey(key) ? rowStatus.get(key) : new Byte(TrustSignatures.SIG_VALID);593 Byte sigstatus = new Byte(status);592 Byte oldstatus = rowStatus.containsKey(key) ? rowStatus.get(key) : Byte.valueOf(TrustSignatures.SIG_VALID); 593 Byte sigstatus = Byte.valueOf(status); 594 594 Byte newstatus; 595 if (sigstatus.equals(new Byte(TrustSignatures.SIG_BROKEN)) || oldstatus.equals(new Byte(TrustSignatures.SIG_BROKEN))) { 596 newstatus = new Byte(TrustSignatures.SIG_BROKEN); 597 } else if (sigstatus.equals(new Byte(TrustSignatures.SIG_UNKNOWN)) 598 || oldstatus.equals(new Byte(TrustSignatures.SIG_UNKNOWN))) { 599 newstatus = new Byte(TrustSignatures.SIG_UNKNOWN); 600 } else newstatus = new Byte(TrustSignatures.SIG_VALID); 595 if (sigstatus.equals(Byte.valueOf(TrustSignatures.SIG_BROKEN)) 596 || oldstatus.equals(Byte.valueOf(TrustSignatures.SIG_BROKEN))) { 597 newstatus = Byte.valueOf(TrustSignatures.SIG_BROKEN); 598 } else if (sigstatus.equals(Byte.valueOf(TrustSignatures.SIG_UNKNOWN)) 599 || oldstatus.equals(Byte.valueOf(TrustSignatures.SIG_UNKNOWN))) { 600 newstatus = Byte.valueOf(TrustSignatures.SIG_UNKNOWN); 601 } else newstatus = Byte.valueOf(TrustSignatures.SIG_VALID); 601 602 602 603 rowStatus.put(key, newstatus); -
applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java
r32533 r33057 16 16 import java.io.IOException; 17 17 import java.nio.charset.Charset; 18 import java.nio.charset.StandardCharsets; 18 19 import java.security.KeyPair; 19 20 import java.security.KeyPairGenerator; … … 29 30 import java.util.Iterator; 30 31 import java.util.List; 32 import java.util.Locale; 31 33 import java.util.Random; 32 34 import java.util.Vector; … … 467 469 468 470 JFormattedTextField meters = new JFormattedTextField(NumberFormat.getNumberInstance()); 469 meters.setValue( new Double(10));471 meters.setValue(Double.valueOf(10)); 470 472 meters.setColumns(5); 471 473 … … 624 626 } 625 627 626 String fingerprint = new String(Hex.encode(key.getFingerprint()) ).toUpperCase();627 String keyid = "0x"+Long.toHexString(key.getKeyID()).substring(8).toUpperCase( );628 String fingerprint = new String(Hex.encode(key.getFingerprint()), StandardCharsets.UTF_8).toUpperCase(Locale.ENGLISH); 629 String keyid = "0x"+Long.toHexString(key.getKeyID()).substring(8).toUpperCase(Locale.ENGLISH); 628 630 629 631 String algorithm = "";
Note:
See TracChangeset
for help on using the changeset viewer.