Changeset 18215 in josm for trunk

Timestamp:

2021-09-12T02:57:52+02:00 (3 years ago)

Author:

Don-vip

Message:

coverity - Explicit null dereferenced

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• PrimitiveRenderer.java (modified) (1 diff)
• SplashScreen.java (modified) (3 diffs)
• dialogs/properties/TagEditHelper.java (modified) (2 diffs)
• layer/gpx/DownloadAlongPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/PrimitiveRenderer.java

@@ -48 +48 @@
     public Component getListCellRendererComponent(JList<? extends IPrimitive> list, IPrimitive value, int index,
             boolean isSelected, boolean cellHasFocus) {
-        Component def = defaultListCellRenderer.getListCellRendererComponent(list, null, index, isSelected, cellHasFocus);
+        Component def = defaultListCellRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
         return renderer(def, value, list.getModel().getSize() > 1000);
     }

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -238 +238 @@
                 final MeasurableTask task = new MeasurableTask(title);
                 tasks.add(task);
-                listener.stateChanged(null);
+                listener.stateChanged(new ChangeEvent(this));
             }
         }
@@ -267 +267 @@
             latestSubtask = new SplashProgressMonitor(title, listener);
             tasks.add(latestSubtask);
-            listener.stateChanged(null);
+            listener.stateChanged(new ChangeEvent(this));
         }
 
@@ -300 +300 @@
             taskOptional.ifPresent(task -> {
                 ((MeasurableTask) task).finish();
-                listener.stateChanged(null);
+                listener.stateChanged(new ChangeEvent(this));
             });
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -801 +801 @@
             focus = addFocusAdapter(autocomplete, DEFAULT_AC_ITEM_COMPARATOR);
             // fire focus event in advance or otherwise the popup list will be too small at first
-            focus.focusGained(null);
+            focus.focusGained(new FocusEvent(this, FocusEvent.FOCUS_GAINED));
 
             addUpdateIconListener();
@@ -974 +974 @@
                         keys.setSelectedItem(t.getKey());
                         // fix #7951, #8298 - update list of values before setting value (?)
-                        focus.focusGained(null);
+                        focus.focusGained(new FocusEvent(AddTagsDialog.this, FocusEvent.FOCUS_GAINED));
                         values.setSelectedItem(t.getValue());
                         selectValuesCombobox();

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

@@ -14 +14 @@
 import javax.swing.JSpinner;
 import javax.swing.SpinnerNumberModel;
+import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
@@ -161 +162 @@
         cbDownloadGpxData.addChangeListener(listener);
         cbDownloadOsmData.addChangeListener(listener);
-        listener.stateChanged(null);
+        listener.stateChanged(new ChangeEvent(this));
     }