Changeset 15497 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2019-11-02T16:28:02+01:00 (4 years ago)

Author:

Don-vip

Message:

see #16796 - fix most of checkstyle/pmd/findbugs violations

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• GpxLayer.java (modified) (1 diff)
• gpx/ConvertFromGpxLayerAction.java (modified) (1 diff)
• gpx/CustomizeDrawingAction.java (modified) (1 diff)
• markerlayer/ButtonMarker.java (modified) (1 diff)
• markerlayer/Marker.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -306 +306 @@
         if (Logging.isDebugEnabled() && !data.getLayerPrefs().isEmpty()) {
             info.append("<br><br>")
-                .append(String.join("<br>", data.getLayerPrefs().entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.toList())));
+                .append(String.join("<br>", data.getLayerPrefs().entrySet().stream()
+                        .map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.toList())));
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertFromGpxLayerAction.java

@@ -149 +149 @@
                     pre = "other";
                 }
-                String segpre = seg ? "segment:" : ""; //needs to be distinguished since both track and segment extensions are applied to the resulting way
+                // needs to be distinguished since both track and segment extensions are applied to the resulting way
+                String segpre = seg ? "segment:" : "";
                 String key = ext.getFlatKey();
                 String fullkey = GpxConstants.GPX_PREFIX + extpre + pre + ":" + segpre + key;

trunk/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java

@@ -76 +76 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        GPXSettingsPanel panel = new GPXSettingsPanel(layers.stream().filter(l -> l instanceof GpxLayer).map(l -> (GpxLayer) l).collect(Collectors.toList()));
+        GPXSettingsPanel panel = new GPXSettingsPanel(
+                layers.stream().filter(l -> l instanceof GpxLayer).map(l -> (GpxLayer) l).collect(Collectors.toList()));
         JScrollPane scrollpane = GuiHelper.embedInVerticalScrollPane(panel);
         scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java

@@ -65 +65 @@
 
         String labelText = getText();
-        if (labelText != null && Config.getPref().getBoolean("marker.buttonlabels", true)) {
+        if (!labelText.isEmpty() && Config.getPref().getBoolean("marker.buttonlabels", true)) {
             g.drawString(labelText, screen.x+4, screen.y+2);
         }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -279 +279 @@
 
         String labelText = getText();
-        if ((labelText != null) && showTextOrIcon) {
+        if (!labelText.isEmpty() && showTextOrIcon) {
             g.drawString(labelText, screen.x+4, screen.y+2);
         }
@@ -321 +321 @@
     private String getDefaultTextTemplate() {
         if (cachedDefaultTemplate == null) {
-            cachedDefaultTemplate = GPXSettingsPanel.getLayerPref(null,  getTextTemplateKey());
+            cachedDefaultTemplate = GPXSettingsPanel.getLayerPref(null, getTextTemplateKey());
         }
         return cachedDefaultTemplate;