Changeset 32848 in osm for applications/editors/josm

Timestamp:

2016-08-20T04:27:57+02:00 (8 years ago)

Author:

donvip

Message:

fix more warnings

Location:

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo

Files:

• PointInfoAction.java (modified) (3 diffs)
• PointInfoPlugin.java (modified) (1 diff)
• PointInfoUtils.java (modified) (4 diffs)
• ruian/AddrPlaces.java (modified) (1 diff)
• ruian/RuianModule.java (modified) (1 diff)
• ruian/RuianRecord.java (modified) (10 diffs)

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java

@@ -17 +17 @@
 import javax.swing.JScrollPane;
 import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
 
 import org.openstreetmap.josm.Main;
@@ -93 +92 @@
                         msgLabel.setEditable(false);
                         msgLabel.setOpaque(false);
-                        msgLabel.addHyperlinkListener(new HyperlinkListener() {
-                            @Override
-                            public void hyperlinkUpdate(HyperlinkEvent hle) {
-                                if (HyperlinkEvent.EventType.ACTIVATED.equals(hle.getEventType())) {
-                                    if (hle.getURL() == null || hle.getURL().toString().isEmpty()) {
-                                        return;
-                                    }
-                                    System.out.println("URL: "+ hle.getURL());
-                                    if (!hle.getURL().toString().startsWith("http")) {
-                                        mRuian.performAction(hle.getURL().toString());
-                                    } else {
-                                        String ret = OpenBrowser.displayUrl(hle.getURL().toString());
-                                        if (ret != null) {
-                                            PointInfoUtils.showNotification(ret, "error");
-                                        }
+                        msgLabel.addHyperlinkListener(hle -> {
+                            if (HyperlinkEvent.EventType.ACTIVATED.equals(hle.getEventType())) {
+                                if (hle.getURL() == null || hle.getURL().toString().isEmpty()) {
+                                    return;
+                                }
+                                System.out.println("URL: "+ hle.getURL());
+                                if (!hle.getURL().toString().startsWith("http")) {
+                                    mRuian.performAction(hle.getURL().toString());
+                                } else {
+                                    String ret = OpenBrowser.displayUrl(hle.getURL().toString());
+                                    if (ret != null) {
+                                        PointInfoUtils.showNotification(ret, "error");
                                     }
                                 }
@@ -127 +123 @@
             new Thread(infoTask).start();
         } catch (Exception e) {
-            e.printStackTrace();
+            Main.error(e);
         }
     }

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java

@@ -13 +13 @@
 public class PointInfoPlugin extends Plugin {
 
+    /**
+     * Constructs a new {@code PointInfoPlugin}.
+     * @param info plugin information
+     */
     public PointInfoPlugin(PluginInformation info) {
         super(info);

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoUtils.java

@@ -9 +9 @@
 import org.openstreetmap.josm.gui.Notification;
 
-public abstract class PointInfoUtils {
+public final class PointInfoUtils {
+
+    private PointInfoUtils() {
+        // Hide default constructor for utilities classes
+    }
 
     /**
@@ -19 +23 @@
         Notification note = new Notification(message);
 
-        if (type.equals("info"))
+        if ("info".equals(type))
             note.setIcon(JOptionPane.INFORMATION_MESSAGE);
-        else if (type.equals("warning"))
+        else if ("warning".equals(type))
             note.setIcon(JOptionPane.WARNING_MESSAGE);
-        else if (type.equals("error"))
+        else if ("error".equals(type))
             note.setIcon(JOptionPane.ERROR_MESSAGE);
         else
@@ -40 +44 @@
     public static String formatCoordinates(double lat, double lon) {
 
-        String r = "";
         DecimalFormatSymbols symbols = new DecimalFormatSymbols();
         symbols.setDecimalSeparator('.');
@@ -46 +49 @@
         DecimalFormat df = new DecimalFormat("#.00000", symbols);
 
-        r = "(" + df.format(lat) + ", " + df.format(lon) + ")";
-        return r;
+        return "(" + df.format(lat) + ", " + df.format(lon) + ")";
     }
 }

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/AddrPlaces.java

@@ -218 +218 @@
 
     public String getVzdalenost() {
-        DecimalFormat df = new DecimalFormat("0.00");
-        return df.format(m_vzdalenost) + "m";
+        return new DecimalFormat("0.00").format(m_vzdalenost) + "m";
     }
 }

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianModule.java

@@ -14 +14 @@
 public class RuianModule {
 
-    private String m_text = "";
     private String URL = "http://josm.poloha.net/pointInfo/v4/index.php";
 

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/ruian/RuianRecord.java

@@ -128 +128 @@
         m_katastr_kraj_kod = 0;
         m_katastr_kraj = "";
-
     }
 
     /**
      * Parse given JSON string and fill variables with RUIAN data
-     *
+     * @param jsonStr JSON string
      */
     public void parseJSON(String jsonStr) {
@@ -663 +662 @@
 
         if (m_objekt_ruian_id == 0 &&
-                m_parcela_ruian_id == 0 &&
-                m_adresni_mista.size() == 0 &&
-                m_ulice_ruian_id == 0 &&
-                m_katastr_ruian_id == 0)
+            m_parcela_ruian_id == 0 &&
+            m_adresni_mista.size() == 0 &&
+            m_ulice_ruian_id == 0 &&
+            m_katastr_ruian_id == 0)
             return "";
 
@@ -769 +768 @@
 
         // Reported errors
-        if (m_objekt_ruian_id > 0 && !m_err_user.equals("")) {
+        if (m_objekt_ruian_id > 0 && !m_err_user.isEmpty()) {
             r.append("<i><u>Nahlášený problém</u></i>");
             r.append("&nbsp;&nbsp;<a href=" + url_ruian_error + m_objekt_ruian_id + ">"+ icon_ext_link +"</a><br/>");
@@ -778 +777 @@
             r.append("<b>Typ problému: </b>" + m_err_type);
             r.append("<br/>");
-            if (!m_err_note.equals("")) {
+            if (!m_err_note.isEmpty()) {
                 r.append("<b>Poznámka: </b>" + m_err_note);
                 r.append("<br/>");
@@ -842 +841 @@
 
         // Near address places
-        if (m_adresni_mista.size() > 0 && m_objekt_ruian_id == 0) {
+        if (!m_adresni_mista.isEmpty() && m_objekt_ruian_id == 0) {
             String x, x_name;
             r.append("<i><u>Adresní místa v okolí</u></i><br/>");
@@ -886 +885 @@
         }
 
-        if (m_so_bez_geometrie.size() > 0) {
+        if (!m_so_bez_geometrie.isEmpty()) {
             r.append("<i><u>Budovy bez geometrie v okolí</u></i><br/>");
             r.append("<table>");
@@ -922 +921 @@
         String[] parts = ruianDate.split("\\.");
         try {
-            int day = Integer.valueOf(parts[0]);
-            int month = Integer.valueOf(parts[1]);
-            int year = Integer.valueOf(parts[2]);
+            int day = Integer.parseInt(parts[0]);
+            int month = Integer.parseInt(parts[1]);
+            int year = Integer.parseInt(parts[2]);
             r = Integer.toString(year) + "-" + String.format("%02d", month) + "-" + String.format("%02d", day);
         } catch (Exception e) {
@@ -940 +939 @@
      */
     String tagToString(String k, String v) {
-        String r = "\"" + k + "\"=\"" + v + "\"\n";
-        return r;
+        return "\"" + k + "\"=\"" + v + "\"\n";
     }
 
@@ -977 +975 @@
         if (keyType.startsWith("ghost") && !m_so_bez_geometrie.isEmpty()) {
             String[] key = keyType.split(":");
-            int i = Integer.valueOf(key[1]);
+            int i = Integer.parseInt(key[1]);
             System.out.println("Ghost ID: " + i);
 
@@ -1098 +1096 @@
         if (cmd.startsWith("tags.create-on-place")) {
             String[] key = cmd.split(":");
-            int i = Integer.valueOf(key[1]);
+            int i = Integer.parseInt(key[1]);
             node = new Node(m_adresni_mista.get(i).getPosition());
         } else {