Changeset 34634 in osm for applications

Timestamp:

2018-09-11T19:19:45+02:00 (6 years ago)

Author:

donvip

Message:

fix warnings

Location:

applications/editors/josm/plugins/native-password-manager/src/org

Files:

• netbeans/modules/keyring/fallback/FallbackProvider.java (modified) (2 diffs)
• netbeans/modules/keyring/kde/KWalletProvider.java (modified) (5 diffs)
• openstreetmap/josm/plugins/npm/DatatypeConverter.java (modified) (2 diffs)
• openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java (modified) (4 diffs)

applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/fallback/FallbackProvider.java

@@ -43 +43 @@
 package org.netbeans.modules.keyring.fallback;
 
+import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.util.logging.Level;
@@ -90 +91 @@
         byte[] randomArray = new byte[36];
         new SecureRandom().nextBytes(randomArray);
-        if (_save(SAMPLE_KEY, (SAMPLE_KEY + new String(randomArray)).toCharArray(),
+        if (_save(SAMPLE_KEY, (SAMPLE_KEY + new String(randomArray, StandardCharsets.UTF_8)).toCharArray(),
                 "Sample value ensuring that decryption is working.")) {
             LOG.fine("saved sample key");

applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/kde/KWalletProvider.java

@@ -46 +46 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.logging.Level;
@@ -96 +97 @@
             CommandResult result = runCommand("writePassword", handler , getApplicationName()
                     , key.toCharArray(), password , getApplicationName());
-            if (result.exitCode != 0 || (new String(result.retVal)).equals("-1")){
+            if (result.exitCode != 0 || new String(result.retVal).equals("-1")) {
                 warning("save action failed");
             }
@@ -109 +110 @@
             CommandResult result = runCommand("removeEntry" ,handler,
             getApplicationName() , key.toCharArray() , getApplicationName());
-             if (result.exitCode != 0  || (new String(result.retVal)).equals("-1")){
+             if (result.exitCode != 0  || new String(result.retVal).equals("-1")) {
                 warning("delete action failed");
             }
@@ -176 +177 @@
             Process pr = rt.exec(argv);
             
-            try (BufferedReader input = new BufferedReader(new InputStreamReader(pr.getInputStream()))) {
+            try (BufferedReader input = new BufferedReader(new InputStreamReader(pr.getInputStream(), StandardCharsets.UTF_8))) {
 
                 String line;
@@ -186 +187 @@
                 }            
             }
-            try (BufferedReader input = new BufferedReader(new InputStreamReader(pr.getErrorStream()))) {
+            try (BufferedReader input = new BufferedReader(new InputStreamReader(pr.getErrorStream(), StandardCharsets.UTF_8))) {
 
                 String line;

applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/DatatypeConverter.java

@@ -117 +117 @@
                 }
                 if (quadruplet[3] != PADDING) {
-                    out[o++] = (byte) ((quadruplet[2] << 6) | (quadruplet[3]));
+                    out[o++] = (byte) ((quadruplet[2] << 6) | quadruplet[3]);
                 }
                 q = 0;
@@ -195 +195 @@
         if (remaining == 1) {
             buf[ptr++] = encode(input[i] >> 2);
-            buf[ptr++] = encode(((input[i]) & 0x3) << 4);
+            buf[ptr++] = encode((input[i] & 0x3) << 4);
             buf[ptr++] = '=';
             buf[ptr++] = '=';

applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java

@@ -7 +7 @@
 import java.net.Authenticator.RequestorType;
 import java.net.PasswordAuthentication;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -63 +64 @@
         
         CRC32 id = new CRC32();
-        id.update((pref+"/"+url).getBytes());
+        id.update((pref+"/"+url).getBytes(StandardCharsets.UTF_8));
         
         String hash = Integer.toHexString((int)id.getValue());
@@ -76 +77 @@
         
         CRC32 id = new CRC32();
-        id.update((pref+"/"+host+"/"+port).getBytes());
+        id.update((pref+"/"+host+"/"+port).getBytes(StandardCharsets.UTF_8));
 
         String hash = Integer.toHexString((int)id.getValue());
@@ -88 +89 @@
         
         CRC32 id = new CRC32();
-        id.update((pref).getBytes());
+        id.update(pref.getBytes(StandardCharsets.UTF_8));
 
         String hash = Integer.toHexString((int)id.getValue());