Changeset 12414 in josm

Timestamp:

2017-06-18T01:36:38+02:00 (7 years ago)

Author:

Don-vip

Message:

fix more SonarQube issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/FilterModel.java (modified) (1 diff)
• gui/autofilter/AutoFilterRule.java (modified) (1 diff)
• gui/autofilter/package-info.java (added)
• io/audio/JavaFxMediaPlayer.java (modified) (4 diffs)
• io/audio/JavaSoundPlayer.java (modified) (1 diff)

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

@@ -42 +42 @@
     private boolean changed;
 
-    /**
-     * Constructs a new {@code FilterTableModel}.
-     */
-    public FilterModel() {
-    }
-
-    private final transient List<Filter> filters = new LinkedList<>();
-    private final transient FilterMatcher filterMatcher = new FilterMatcher();
+    private final List<Filter> filters = new LinkedList<>();
+    private final FilterMatcher filterMatcher = new FilterMatcher();
 
     private void updateFilterMatcher() {

trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java

@@ -99 +99 @@
             new AutoFilterRule("voltage", 5)
                 .setValueFormatter(s -> s.replaceAll("000$", "k") + 'V')
-                .setValueComparator(Comparator.comparingInt(s -> Integer.parseInt(s)))
+                .setValueComparator(Comparator.comparingInt(Integer::parseInt))
         };
     }

trunk/src/org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java

@@ -35 +35 @@
     private final ListenerList<AudioListener> listeners = ListenerList.create();
 
-    private URL url;
     private MediaPlayer mediaPlayer;
 
@@ -50 +49 @@
 
         // Note, this method is called on the FX Application Thread
-        PlatformImpl.startup(() -> startupLatch.countDown());
+        PlatformImpl.startup(startupLatch::countDown);
 
         // Wait for FX platform to start
@@ -59 +58 @@
     public void play(Execute command, State stateChange, URL playingUrl) throws AudioException, IOException {
         try {
-            url = command.url();
+            final URL url = command.url();
             if (playingUrl != url) {
                 if (mediaPlayer != null) {
@@ -69 +68 @@
                 }
                 mediaPlayer = new MediaPlayer(new Media(url.toString()));
-                mediaPlayer.setOnPlaying(() -> {
-                    listeners.fireEvent(l -> l.playing(url));
-                });
+                mediaPlayer.setOnPlaying(() ->
+                    listeners.fireEvent(l -> l.playing(url))
+                );
             }
             mediaPlayer.setRate(command.speed());

trunk/src/org/openstreetmap/josm/io/audio/JavaSoundPlayer.java

@@ -37 +37 @@
 
     private double bytesPerSecond;
-    private byte[] abData = new byte[chunk];
+    private final byte[] abData = new byte[chunk];
 
     private double position; // seconds