Changeset 14201 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-08-29T19:40:53+02:00 (6 years ago)

Author:

Don-vip

Message:

spotbugs - fix various issues found with Eclipse plugin

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenFileAction.java (modified) (1 diff)
• gui/mappaint/MapPaintStyles.java (modified) (1 diff)
• io/session/SessionReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -320 +320 @@
                 }
 
+                Pattern urlPattern = Pattern.compile(".*(https?://.*)");
                 for (File urlFile: urlFiles) {
                     try (BufferedReader reader = Files.newBufferedReader(urlFile.toPath(), StandardCharsets.UTF_8)) {
                         String line;
                         while ((line = reader.readLine()) != null) {
-                            Matcher m = Pattern.compile(".*(https?://.*)").matcher(line);
+                            Matcher m = urlPattern.matcher(line);
                             if (m.matches()) {
                                 String url = m.group(1);

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

@@ -425 +425 @@
      * Add a new map paint style.
      * @param entry map paint style
-     * @return loaded style source, or {@code null}
+     * @return loaded style source
      */
     public static StyleSource addStyle(SourceEntry entry) {

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -653 +653 @@
         Collection<String> parameters = new ArrayList<>();
         NodeList paramNl = parametersEl.getElementsByTagName("param");
-        for (int i = 0; i < paramNl.getLength(); i++) {
+        int length = paramNl.getLength();
+        for (int i = 0; i < length; i++) {
             Element paramEl = (Element) paramNl.item(i);
             parameters.add(paramEl.getTextContent());