Changeset 11544 in josm

Timestamp:

2017-02-09T00:54:57+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1854 - Dead stores should be removed

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/io/SaveLayersDialog.java (modified) (1 diff)
• gui/widgets/HtmlPanel.java (modified) (2 diffs)
• io/OsmConnection.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -586 +586 @@
                 }
                 currentTask = null;
-                currentFuture = null;
             }
         }

trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java

@@ -30 +30 @@
         Font f = UIManager.getFont("Label.font");
         StyleSheet ss = new StyleSheet();
-        String rule = MessageFormat.format(
+        ss.addRule("body {" + MessageFormat.format(
                 "font-family: ''{0}'';font-size: {1,number}pt; font-weight: {2}; font-style: {3}",
                 f.getName(),
                 f.getSize(),
                 f.isBold() ? "bold" : "normal",
-                        f.isItalic() ? "italic" : "normal"
-        );
-        rule = "body {" + rule + '}';
-        rule = MessageFormat.format(
+                f.isItalic() ? "italic" : "normal"
+        ) + '}');
+        ss.addRule("strong {" + MessageFormat.format(
                 "font-family: ''{0}'';font-size: {1,number}pt; font-weight: {2}; font-style: {3}",
                 f.getName(),
@@ -44 +43 @@
                 "bold",
                 f.isItalic() ? "italic" : "normal"
-        );
-        rule = "strong {" + rule + '}';
-        ss.addRule(rule);
+        ) + '}');
         ss.addRule("a {text-decoration: underline; color: blue}");
         ss.addRule("ul {margin-left: 1cm; list-style-type: disc}");

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

@@ -67 +67 @@
             throw new OsmTransferException(e);
         }
-        String token;
-        if (response == null) {
-            token = ":";
-        } else if (response.isCanceled()) {
-            cancel = true;
-            return;
-        } else {
-            String username = response.getUsername() == null ? "" : response.getUsername();
-            String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
-            token = username + ':' + password;
-            con.setHeader("Authorization", "Basic "+Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
+        if (response != null) {
+            if (response.isCanceled()) {
+                cancel = true;
+                return;
+            } else {
+                String username = response.getUsername() == null ? "" : response.getUsername();
+                String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
+                String token = username + ':' + password;
+                con.setHeader("Authorization", "Basic "+Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
+            }
         }
     }