Changeset 8073 in josm for trunk/src/org

Timestamp:

2015-02-16T09:48:03+01:00 (9 years ago)

Author:

Don-vip

Message:

fix some Sonar issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/mappaint/LineElemStyle.java (modified) (3 diffs)
• io/CachedFile.java (modified) (2 diffs)
• tools/PlatformHookUnixoid.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java

@@ -153 +153 @@
             case LEFT_CASING:
             case RIGHT_CASING:
-            {
                 Float baseWidthOnDefault = getWidth(c_def, WIDTH, null);
                 Float baseWidth = getWidth(c, WIDTH, baseWidthOnDefault);
@@ -167 +166 @@
                 offset += casingOffset;
                 break;
-            }
         }
 
@@ -374 +372 @@
         }
     }
+
     public String linecapToString(int linecap) {
         switch (linecap) {

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

@@ -257 +257 @@
     }
 
-    @SuppressWarnings("resource")
     private Pair<String, InputStream> findZipEntryImpl(String extension, String namepart) {
         File file = null;
@@ -263 +262 @@
             file = getFile();
         } catch (IOException ex) {
+            Main.warn(ex, false);
         }
         if (file == null)

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -37 +37 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences.pref;
+import org.openstreetmap.josm.data.Preferences.writeExplicitly;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.data.Preferences.pref;
-import org.openstreetmap.josm.data.Preferences.writeExplicitly;
 
 /**
@@ -57 +57 @@
     public static class FontEntry {
         /**
-         * The character subset. Basically a free identifier, but should
-         * be unique.
+         * The character subset. Basically a free identifier, but should be unique.
          */
         @pref
         public String charset;
+
         /**
          * Platform font name.
@@ -67 +67 @@
         @pref @writeExplicitly
         public String name = "";
+
         /**
          * File name.
@@ -73 +74 @@
         public String file = "";
 
+        /**
+         * Constructs a new {@code FontEntry}.
+         */
         public FontEntry() {
         }
 
+        /**
+         * Constructs a new {@code FontEntry}.
+         * @param charset The character subset. Basically a free identifier, but should be unique
+         * @param name Platform font name
+         * @param file File name
+         */
         public FontEntry(String charset, String name, String file) {
             this.charset = charset;
@@ -448 +458 @@
      * configuration. Finally the system property "sun.awt.fontconfig" is set
      * to the customized fontconfig.properties file.
-     * 
+     *
      * This is a crude hack, but better than no font display at all for these
      * languages.
@@ -482 +492 @@
             OutputStream os = Files.newOutputStream(fontconfigFile);
             os.write(content);
-            try (Writer w = new BufferedWriter(new OutputStreamWriter(os))) {
+            try (Writer w = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8))) {
                 Collection<FontEntry> extrasPref = Main.pref.getListOfStructs(
                         "font.extended-unicode.extra-items", getAdditionalFonts(), FontEntry.class);