Changeset 10308 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-06-01T23:17:40+02:00 (10 years ago)

Author:

Don-vip

Message:

sonar - squid:S1854 - Dead stores should be removed

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• AbstractReader.java (modified) (1 diff)
• OsmConnection.java (modified) (4 diffs)
• OsmReader.java (modified) (2 diffs)
• auth/AbstractCredentialsAgent.java (modified) (1 diff)
• remotecontrol/AddTagsDialog.java (modified) (1 diff)
• remotecontrol/RemoteControlHttpsServer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/AbstractReader.java

@@ -140 +140 @@
             List<RelationMember> relationMembers = new ArrayList<>();
             for (RelationMemberData rm : entry.getValue()) {
-                OsmPrimitive primitive = null;
-
                 // lookup the member from the map of already created primitives
-                primitive = externalIdMap.get(new SimplePrimitiveId(rm.getMemberId(), rm.getMemberType()));
+                OsmPrimitive primitive = externalIdMap.get(new SimplePrimitiveId(rm.getMemberId(), rm.getMemberType()));
 
                 if (primitive == null) {

trunk/src/org/openstreetmap/josm/io/OsmConnection.java

@@ -11 +11 @@
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
-import java.nio.charset.CharsetEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
@@ -63 +62 @@
      */
     protected void addBasicAuthorizationHeader(HttpClient con) throws OsmTransferException {
-        CharsetEncoder encoder = StandardCharsets.UTF_8.newEncoder();
         CredentialsAgentResponse response;
-        String token;
         try {
             synchronized (CredentialsManager.getInstance()) {
@@ -74 +71 @@
             throw new OsmTransferException(e);
         }
+        String token;
         if (response == null) {
             token = ":";
@@ -84 +82 @@
             token = username + ':' + password;
             try {
-                ByteBuffer bytes = encoder.encode(CharBuffer.wrap(token));
+                ByteBuffer bytes = StandardCharsets.UTF_8.newEncoder().encode(CharBuffer.wrap(token));
                 con.setHeader("Authorization", "Basic "+Base64.encode(bytes));
             } catch (CharacterCodingException e) {

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -316 +316 @@
 
     private RelationMemberData parseRelationMember(Relation r) throws XMLStreamException {
-        String role = null;
         OsmPrimitiveType type = null;
         long id = 0;
@@ -339 +338 @@
                     Long.toString(id), Long.toString(r.getUniqueId()), value), e);
         }
-        value = parser.getAttributeValue(null, "role");
-        role = value;
+        String role = parser.getAttributeValue(null, "role");
 
         if (id == 0) {

trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java

@@ -49 +49 @@
                     @Override
                     public void run() {
-                        CredentialDialog dialog = null;
+                        CredentialDialog dialog;
                         if (requestorType.equals(RequestorType.PROXY))
                             dialog = CredentialDialog.getHttpProxyCredentialDialog(

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -272 +272 @@
                 @Override
                 public void run() {
-                    String[] tags = null;
-                    tags = Utils.decodeUrl(args.get("addtags")).split("\\|");
                     Set<String> tagSet = new HashSet<>();
-                    for (String tag : tags) {
+                    for (String tag : Utils.decodeUrl(args.get("addtags")).split("\\|")) {
                         if (!tag.trim().isEmpty() && tag.contains("=")) {
                             tagSet.add(tag.trim());

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -216 +216 @@
     public static Path setupJosmKeystore() throws IOException, GeneralSecurityException {
 
-        char[] storePassword = KEYSTORE_PASSWORD.get().toCharArray();
-        char[] entryPassword = KEYENTRY_PASSWORD.get().toCharArray();
-
         Path dir = Paths.get(RemoteControl.getRemoteControlDir());
         Path path = dir.resolve(KEYSTORE_FILENAME);
@@ -249 +246 @@
             KEYENTRY_PASSWORD.put(new BigInteger(130, random).toString(32));
 
-            storePassword = KEYSTORE_PASSWORD.get().toCharArray();
-            entryPassword = KEYENTRY_PASSWORD.get().toCharArray();
+            char[] storePassword = KEYSTORE_PASSWORD.get().toCharArray();
+            char[] entryPassword = KEYENTRY_PASSWORD.get().toCharArray();
 
             ks.setKeyEntry(ENTRY_ALIAS, pair.getPrivate(), entryPassword, new Certificate[]{cert});