Changeset 15588 in josm for trunk/src/org

Timestamp:

2019-12-13T22:12:24+01:00 (5 years ago)

Author:

Don-vip

Message:

tools update: checkstyle 8.27, pmd 6.20, spotbugs 3.1.12

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JosmAction.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/validation/OsmValidator.java (modified) (1 diff)
• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• gui/dialogs/MapPaintDialog.java (modified) (1 diff)
• gui/io/CustomConfigurator.java (modified) (1 diff)
• gui/io/importexport/GeoJSONImporter.java (modified) (1 diff)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)
• io/BoundingBoxDownloader.java (modified) (1 diff)
• io/CachedFile.java (modified) (2 diffs)
• io/Compression.java (modified) (2 diffs)
• io/GpxReader.java (modified) (1 diff)
• io/OsmServerLocationReader.java (modified) (2 diffs)
• io/remotecontrol/RemoteControlHttpServer.java (modified) (1 diff)
• io/remotecontrol/RequestProcessor.java (modified) (7 diffs)
• plugins/PluginListParser.java (modified) (2 diffs)

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

@@ -279 +279 @@
             SelectionEventManager.getInstance().removeSelectionListener(selectionChangeAdapter);
         }
-        MainApplication.getToolbar().unregister(this);
+        if (MainApplication.getToolbar() != null) {
+            MainApplication.getToolbar().unregister(this);
+        }
     }
 

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

@@ -778 +778 @@
             return Stream.empty();
         }
-        final Stream<OsmPrimitive> stream = referrers instanceof OsmPrimitive
+        final Stream<OsmPrimitive> stream = referrers instanceof OsmPrimitive // NOPMD
                 ? Stream.of((OsmPrimitive) referrers)
                 : Arrays.stream((OsmPrimitive[]) referrers);

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -108 +108 @@
      */
     @SuppressWarnings("unchecked")
-    private static final Class<Test>[] CORE_TEST_CLASSES = new Class[] {
+    private static final Class<Test>[] CORE_TEST_CLASSES = new Class[] {// NOPMD
         /* FIXME - unique error numbers for tests aren't properly unique - ignoring will not work as expected */
         DuplicateNode.class, // ID    1 ..   99

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -391 +391 @@
             final MapCSSStyleSource source = new MapCSSStyleSource("");
             final MapCSSParser preprocessor = new MapCSSParser(css, MapCSSParser.LexicalState.PREPROCESSOR);
-            final StringReader mapcss = new StringReader(preprocessor.pp_root(source));
-            final MapCSSParser parser = new MapCSSParser(mapcss, MapCSSParser.LexicalState.DEFAULT);
-            parser.sheet(source);
+            try (StringReader mapcss = new StringReader(preprocessor.pp_root(source))) {
+                new MapCSSParser(mapcss, MapCSSParser.LexicalState.DEFAULT).sheet(source);
+            }
             // Ignore "meta" rule(s) from external rules of JOSM wiki
             source.removeMetaRules();

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -634 +634 @@
             p.add(new JScrollPane(txtSource), GBC.std().fill());
 
-            try {
-                InputStream is = s.getSourceInputStream();
-                try (BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
-                    String line;
-                    while ((line = reader.readLine()) != null) {
-                        txtSource.append(line + '\n');
-                    }
-                } finally {
-                    s.closeSourceInputStream(is);
-                }
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(s.getSourceInputStream(), StandardCharsets.UTF_8))) {
+                reader.lines().forEach(line -> txtSource.append(line + '\n'));
             } catch (IOException ex) {
                 Logging.error(ex);

trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

@@ -689 +689 @@
                 String fragmentWithReplacedVars = evalVars(outputWriter.toString());
 
-                CharArrayReader reader = new CharArrayReader(fragmentWithReplacedVars.toCharArray());
-                tmpPref.fromXML(reader);
+                try (CharArrayReader reader = new CharArrayReader(fragmentWithReplacedVars.toCharArray())) {
+                    tmpPref.fromXML(reader);
+                }
             } catch (TransformerException | XMLStreamException | IOException ex) {
                 PreferencesUtils.log(ex, "Error: can not read XML fragment:");

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

@@ -71 +71 @@
     public DataSet parseDataSet(final String source) throws IOException, IllegalDataException {
         try (CachedFile cf = new CachedFile(source)) {
-            InputStream fileInputStream = Compression.getUncompressedFileInputStream(cf.getFile());
+            InputStream fileInputStream = Compression.getUncompressedFileInputStream(cf.getFile()); // NOPMD
             return GeoJSONReader.parseDataSet(fileInputStream, NullProgressMonitor.INSTANCE);
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -433 +433 @@
                     // evaluate @media { ... } blocks
                     MapCSSParser preprocessor = new MapCSSParser(reader, MapCSSParser.LexicalState.PREPROCESSOR);
-                    String mapcss = preprocessor.pp_root(this);
 
                     // do the actual mapcss parsing
-                    Reader in2 = new StringReader(mapcss);
-                    MapCSSParser parser = new MapCSSParser(in2, MapCSSParser.LexicalState.DEFAULT);
-                    parser.sheet(this);
+                    try (Reader in2 = new StringReader(preprocessor.pp_root(this))) {
+                        new MapCSSParser(in2, MapCSSParser.LexicalState.DEFAULT).sheet(this);
+                    }
 
                     loadMeta();

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

@@ -218 +218 @@
         CheckParameterUtil.ensureThat(daysClosed >= -1, "Requested note limit is less than -1.");
         String url = "notes?limit=" + noteLimit + "&closed=" + daysClosed + "&bbox=" + lon1 + ',' + lat1 + ',' + lon2 + ',' + lat2;
-        try {
-            InputStream is = getInputStream(url, progressMonitor.createSubTaskMonitor(1, false));
-            NoteReader reader = new NoteReader(is);
-            final List<Note> notes = reader.parse();
+        try (InputStream is = getInputStream(url, progressMonitor.createSubTaskMonitor(1, false))) {
+            final List<Note> notes = new NoteReader(is).parse();
             if (notes.size() == noteLimit) {
                 throw new MoreNotesException(notes, noteLimit);

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

@@ -347 +347 @@
         Pair<String, InputStream> res = null;
         try {
-            ZipFile zipFile = new ZipFile(file, StandardCharsets.UTF_8);
+            ZipFile zipFile = new ZipFile(file, StandardCharsets.UTF_8); // NOPMD
             ZipEntry resentry = null;
             Enumeration<? extends ZipEntry> entries = zipFile.entries();
@@ -358 +358 @@
             }
             if (resentry != null) {
-                InputStream is = zipFile.getInputStream(resentry);
+                InputStream is = zipFile.getInputStream(resentry); // NOPMD
                 res = Pair.create(resentry.getName(), is);
             } else {

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

@@ -177 +177 @@
     public static InputStream getUncompressedFileInputStream(File file) throws IOException {
         try {
-            InputStream in = Files.newInputStream(file.toPath());
+            InputStream in = Files.newInputStream(file.toPath()); // NOPMD
             try {
                 return byExtension(file.getName()).getUncompressedInputStream(in);
@@ -221 +221 @@
      */
     public static OutputStream getCompressedFileOutputStream(File file) throws IOException {
-        OutputStream out = Files.newOutputStream(file.toPath());
+        OutputStream out = Files.newOutputStream(file.toPath()); // NOPMD
         try {
             return byExtension(file.getName()).getCompressedOutputStream(out);

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

@@ -621 +621 @@
      */
     public GpxReader(InputStream source) throws IOException {
-        Reader utf8stream = UTFInputStreamReader.create(source);
-        Reader filtered = new InvalidXmlCharacterFilter(utf8stream);
+        Reader utf8stream = UTFInputStreamReader.create(source); // NOPMD
+        Reader filtered = new InvalidXmlCharacterFilter(utf8stream); // NOPMD
         this.inputSource = new InputSource(filtered);
     }

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

@@ -144 +144 @@
     protected final <T> T doParse(Parser<T> parser, final ProgressMonitor progressMonitor) throws OsmTransferException {
         progressMonitor.beginTask(tr("Contacting Server...", 10));
-        try {
+        try { // NOPMD
             return parser.parse();
         } catch (OsmTransferException e) {
@@ -211 +211 @@
                 return null;
             progressMonitor.subTask(tr("Downloading OSM data..."));
-            InputStream uncompressedInputStream = compression.getUncompressedInputStream(in);
+            InputStream uncompressedInputStream = compression.getUncompressedInputStream(in); // NOPMD
             ProgressMonitor subTaskMonitor = progressMonitor.createSubTaskMonitor(1, false);
             if ("application/json".equals(contentType)) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java

@@ -102 +102 @@
             try {
                 @SuppressWarnings("resource")
-                Socket request = server.accept();
+                Socket request = server.accept(); // NOPMD
                 RequestProcessor.processRequest(request);
             } catch (SocketException e) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
@@ -20 +19 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.StringTokenizer;
@@ -86 +86 @@
         super("RemoteControl request processor");
         this.setDaemon(true);
-        this.request = request;
+        this.request = Objects.requireNonNull(request);
     }
 
@@ -94 +94 @@
      */
     public static void processRequest(Socket request) {
-        RequestProcessor processor = new RequestProcessor(request);
-        processor.start();
+        new RequestProcessor(request).start();
     }
 
@@ -167 +166 @@
     @Override
     public void run() {
-        Writer out = null;
-        try {
-            OutputStream raw = new BufferedOutputStream(request.getOutputStream());
-            out = new OutputStreamWriter(raw, RESPONSE_CHARSET);
-            BufferedReader in = new BufferedReader(new InputStreamReader(request.getInputStream(), "ASCII"));
+        Writer out = null; // NOPMD
+        try { // NOPMD
+            out = new OutputStreamWriter(new BufferedOutputStream(request.getOutputStream()), RESPONSE_CHARSET);
+            BufferedReader in = new BufferedReader(new InputStreamReader(request.getInputStream(), "ASCII")); // NOPMD
 
             String get = in.readLine();
@@ -274 +272 @@
                 }
             }
-
         } catch (IOException ioe) {
             Logging.debug(Logging.getErrorMessage(ioe));
@@ -423 +420 @@
             }
 
-            PrintWriter r = new PrintWriter(w);
-            printJsonInfo(cmd, r, handler);
-            return w.toString();
+            try (PrintWriter r = new PrintWriter(w)) {
+                printJsonInfo(cmd, r, handler);
+                return w.toString();
+            }
         } catch (IOException e) {
             Logging.error(e);

trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java

@@ -59 +59 @@
     public List<PluginInformation> parse(InputStream in) throws PluginListParseException {
         List<PluginInformation> ret = new LinkedList<>();
-        BufferedReader r = null;
-        try {
-            r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+        try (BufferedReader r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) {
             String name = null;
             String url = null;
@@ -85 +83 @@
                 url = x[1];
                 manifest = new StringBuilder();
-
             }
             addPluginInformation(ret, name, url, manifest.toString());