Changeset 15497 in josm for trunk/src/org

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• data/gpx/GpxData.java (modified) (1 diff)
• data/gpx/GpxExtension.java (modified) (2 diffs)
• data/gpx/GpxExtensionCollection.java (modified) (1 diff)
• data/gpx/GpxTrack.java (modified) (1 diff)
• data/gpx/IGpxTrack.java (modified) (1 diff)
• data/osm/DataSet.java (modified) (2 diffs)
• gui/io/importexport/GpxExporter.java (modified) (1 diff)
• gui/layer/GpxLayer.java (modified) (1 diff)
• gui/layer/gpx/ConvertFromGpxLayerAction.java (modified) (1 diff)
• gui/layer/gpx/CustomizeDrawingAction.java (modified) (1 diff)
• gui/layer/markerlayer/ButtonMarker.java (modified) (1 diff)
• gui/layer/markerlayer/Marker.java (modified) (2 diffs)
• gui/preferences/display/GPXSettingsPanel.java (modified) (2 diffs)
• gui/util/StayOpenPopupMenu.java (modified) (1 diff)
• io/GpxReader.java (modified) (1 diff)
• io/GpxWriter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -132 +132 @@
 
     /** rename keys that equal */
-    private final static Map<String, String> UPDATE_PREF_KEYS = getUpdatePrefKeys();
+    private static final Map<String, String> UPDATE_PREF_KEYS = getUpdatePrefKeys();
 
     private static Map<String, String> getUpdatePrefKeys() {

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -1208 +1208 @@
          * Creates a schema with prefix, URI and location.
          * Does NOT try to determine prefix from URI!
-         * @param prefix
-         * @param uri
-         * @param location
+         * @param prefix XML namespace prefix
+         * @param uri XML namespace URI
+         * @param location XML namespace location
          */
         public XMLNamespace(String prefix, String uri, String location) {

trunk/src/org/openstreetmap/josm/data/gpx/GpxExtension.java

@@ -12 +12 @@
  * @since 15496
  */
-public class GpxExtension extends WithAttributes implements IWithAttributes, GpxConstants {
+public class GpxExtension extends WithAttributes implements GpxConstants {
     private final String qualifiedName, prefix, key;
     private IWithAttributes parent;
@@ -60 +60 @@
     /**
      * Finds the default prefix used by JOSM for the given namespaceURI as the document is free specify another one.
-     * @param namespaceURI
+     * @param namespaceURI namespace URI
      * @return the prefix
      */

trunk/src/org/openstreetmap/josm/data/gpx/GpxExtensionCollection.java

@@ -20 +20 @@
  */
 public class GpxExtensionCollection extends ArrayList<GpxExtension> {
+
+    private static final long serialVersionUID = 1L;
 
     private Stack<GpxExtension> childStack = new Stack<>();

trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java

@@ -95 +95 @@
 
     private void setColorExtension(Color color) {
-        getExtensions().findAndRemove("gpxx",  "DisplayColor");
+        getExtensions().findAndRemove("gpxx", "DisplayColor");
         if (color == null) {
-            getExtensions().findAndRemove("gpxd",  "color");
+            getExtensions().findAndRemove("gpxd", "color");
         } else {
             getExtensions().addOrUpdate("gpxd", "color", String.format("#%02X%02X%02X", color.getRed(), color.getGreen(), color.getBlue()));

trunk/src/org/openstreetmap/josm/data/gpx/IGpxTrack.java

@@ -42 +42 @@
     /**
      * Sets the color of this track. Not necessarily supported by all implementations.
-     * @param color
+     * @param color color of this track
      * @since 15496
      */

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -175 +175 @@
      * Will not be saved to .osm files, but that's not necessary because GPX files won't automatically be overridden after that.
      */
-    private List<XMLNamespace> GPXNamespaces;
+    private List<XMLNamespace> gpxNamespaces;
 
     /**
@@ -1206 +1206 @@
      */
     public List<XMLNamespace> getGPXNamespaces() {
-        return GPXNamespaces;
+        return gpxNamespaces;
     }
 
     /**
      * Sets the GPX (XML) namespaces
-     * @param GPXNamespaces the GPXNamespaces to set
-     */
-    public void setGPXNamespaces(List<XMLNamespace> GPXNamespaces) {
-        this.GPXNamespaces = GPXNamespaces;
+     * @param gpxNamespaces the GPXNamespaces to set
+     */
+    public void setGPXNamespaces(List<XMLNamespace> gpxNamespaces) {
+        this.gpxNamespaces = gpxNamespaces;
     }
 

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java

@@ -195 +195 @@
 
         garmin.addActionListener(l -> {
-            if (garmin.isSelected() &&
-                    !ConditionalOptionPaneUtil.showConfirmationDialog(
-                            "gpx_color_garmin",
-                            ed,
-                            new JLabel(tr("<html>Garmin track extensions only support 16 colors.<br>If you continue, the closest supported track color will be used.</html>")),
-                            tr("Information"),
-                            JOptionPane.OK_CANCEL_OPTION,
-                            JOptionPane.INFORMATION_MESSAGE,
-                            JOptionPane.OK_OPTION)) {
+            if (garmin.isSelected() && !ConditionalOptionPaneUtil.showConfirmationDialog(
+                    "gpx_color_garmin",
+                    ed,
+                    new JLabel("<html>" + tr("Garmin track extensions only support 16 colors.") + "<br>"
+                                        + tr("If you continue, the closest supported track color will be used.")
+                             + "</html>"),
+                    tr("Information"),
+                    JOptionPane.OK_CANCEL_OPTION,
+                    JOptionPane.INFORMATION_MESSAGE,
+                    JOptionPane.OK_OPTION)) {
                 garmin.setSelected(false);
             }

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;

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -104 +104 @@
     private final boolean hasNonLocalFile; // flag to display AllLines checkbox
 
-    private final static Map<String, Object> DEFAULT_PREFS = getDefaultPrefs();
+    private static final Map<String, Object> DEFAULT_PREFS = getDefaultPrefs();
 
     private static Map<String, Object> getDefaultPrefs() {
@@ -263 +263 @@
      */
     public static void putLayerPrefLocal(GpxData data, String key, String value) {
-        if (value == null || value.trim().isEmpty() || (getLayerPref(null, key).equals(value) && DEFAULT_PREFS.get(key) != null && DEFAULT_PREFS.get(key).toString().equals(value))) {
+        if (value == null || value.trim().isEmpty() ||
+                (getLayerPref(null, key).equals(value) && DEFAULT_PREFS.get(key) != null && DEFAULT_PREFS.get(key).toString().equals(value))) {
             data.getLayerPrefs().remove(key);
         } else {

trunk/src/org/openstreetmap/josm/gui/util/StayOpenPopupMenu.java

@@ -53 +53 @@
         if (PlatformManager.isPlatformOsx()) {
             try {
-                Class<?> AppContextClass = Class.forName("sun.awt.AppContext");
-                Field tableField = AppContextClass.getDeclaredField("table");
+                Class<?> appContextClass = Class.forName("sun.awt.AppContext");
+                Field tableField = appContextClass.getDeclaredField("table");
                 ReflectionUtils.setObjectsAccessible(tableField);
                 Object mouseGrabber = null;
                 for (Entry<?, ?> e : ((Map<?, ?>)
-                        tableField.get(AppContextClass.getMethod("getAppContext").invoke(AppContextClass))).entrySet()) {
+                        tableField.get(appContextClass.getMethod("getAppContext").invoke(appContextClass))).entrySet()) {
                     if (MOUSE_GRABBER_KEY.equals(Objects.toString(e.getKey()))) {
                         mouseGrabber = e.getValue();

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

@@ -264 +264 @@
                     currentState = State.EXT;
                     break;
+                default: // Do nothing
                 }
                 break;

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

@@ -128 +128 @@
         out.println("<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"");
 
-        String schemaLocations = "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd";
+        StringBuilder schemaLocations = new StringBuilder("http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd");
 
         for (XMLNamespace n : namespaces) {
@@ -134 +134 @@
                 out.println(String.format("    xmlns:%s=\"%s\"", n.getPrefix(), n.getURI()));
                 if (n.getLocation() != null) {
-                    schemaLocations += " " + n.getURI() + " " + n.getLocation();
+                    schemaLocations.append(' ').append(n.getURI()).append(' ').append(n.getLocation());
                 }
             }
@@ -394 +394 @@
                 // but otherwise the file is invalid and can't even be parsed by SAX anymore
                 String k = (e.getPrefix().isEmpty() ? "" : e.getPrefix() + ":") + e.getKey();
-                String attr = String.join(" ", e.getAttributes().entrySet().stream().map(a -> encode(a.getKey()) + "=\"" + encode(a.getValue().toString()) + "\"").sorted().collect(Collectors.toList()));
+                String attr = String.join(" ", e.getAttributes().entrySet().stream()
+                        .map(a -> encode(a.getKey()) + "=\"" + encode(a.getValue().toString()) + "\"").sorted().collect(Collectors.toList()));
                 if (e.getValue() == null && e.getExtensions().isEmpty()) {
                     inline(k, attr);