Changeset 8308 in josm for trunk/src/org/openstreetmap/josm/gui/widgets

Timestamp:

2015-05-02T00:55:19+02:00 (10 years ago)

Author:

Don-vip

Message:

fix potential NPEs and Sonar issues related to serialization

Location:

trunk/src/org/openstreetmap/josm/gui/widgets

Files:

• AbstractIdTextField.java (modified) (2 diffs)
• ComboBoxHistory.java (modified) (1 diff)
• DateEditorWithSlider.java (modified) (1 diff)
• DisableShortcutsOnFocusGainedTextField.java (modified) (1 diff)
• MultiSplitLayout.java (modified) (1 diff)
• MultiSplitPane.java (modified) (2 diffs)
• OsmPrimitivesTable.java (modified) (4 diffs)
• QuadStateCheckBox.java (modified) (1 diff)
• TextContextualPopupMenu.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/AbstractIdTextField.java

@@ -15 +15 @@
 public abstract class AbstractIdTextField<T extends AbstractTextComponentValidator> extends JosmTextField {
 
-    protected final T validator;
+    protected final transient T validator;
 
     /**
@@ -56 +56 @@
      */
     public final void clearTextIfInvalid() {
-        if (!validator.isValid()) 
+        if (!validator.isValid())
             setText("");
         validator.validate();
     }
-    
+
     /**
      * Reads the id(s).

trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java

@@ -14 +14 @@
     private int maxSize = 10;
 
-    private List<HistoryChangedListener> listeners = new ArrayList<>();
+    private transient List<HistoryChangedListener> listeners = new ArrayList<>();
 
     public ComboBoxHistory(int size) {

trunk/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java

@@ -35 +35 @@
     private boolean watchSlider = true;
 
-    private List<ChangeListener> listeners = new ArrayList<>();
+    private transient List<ChangeListener> listeners = new ArrayList<>();
 
     /**

trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java

@@ -96 +96 @@
     }
 
-    private final List<Pair<Action,Shortcut>> unregisteredActionShortcuts = new ArrayList<>();
-    private final Set<JosmAction> disabledMenuActions = new HashSet<>();
+    private final transient List<Pair<Action,Shortcut>> unregisteredActionShortcuts = new ArrayList<>();
+    private final transient Set<JosmAction> disabledMenuActions = new HashSet<>();
 
     @Override

trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

@@ -708 +708 @@
      */
     public static class InvalidLayoutException extends RuntimeException {
-        private final Node node;
+        private final transient Node node;
         public InvalidLayoutException (String msg, Node node) {
             super(msg);

trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java

@@ -47 +47 @@
  */
 public class MultiSplitPane extends JPanel {
-    private AccessibleContext accessibleContext = null;
+    private transient AccessibleContext accessibleContext = null;
     private boolean continuousLayout = true;
-    private DividerPainter dividerPainter = new DefaultDividerPainter();
+    private transient DividerPainter dividerPainter = new DefaultDividerPainter();
 
     /**
@@ -222 +222 @@
 
     private boolean dragUnderway = false;
-    private MultiSplitLayout.Divider dragDivider = null;
+    private transient MultiSplitLayout.Divider dragDivider = null;
     private Rectangle initialDividerBounds = null;
     private boolean oldFloatingDividers = true;

trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java

@@ -17 +17 @@
 
 public abstract class OsmPrimitivesTable extends JTable {
-    
+
     /**
      * the data layer in whose context primitives are edited in this table
      */
-    private OsmDataLayer layer;
+    private transient OsmDataLayer layer;
 
     /** the popup menu */
@@ -40 +40 @@
         addMouseListener(new DblClickHandler());
     }
-    
+
     public OsmPrimitivesTableModel getOsmPrimitivesTableModel() {
         return (OsmPrimitivesTableModel) getModel();
@@ -56 +56 @@
         return popupMenu;
     }
-    
+
     protected abstract ZoomToAction buildZoomToAction();
 
@@ -67 +67 @@
         return menu;
     }
-    
+
     public void unlinkAsListener() {
         MapView.removeLayerChangeListener(zoomToAction);
     }
-        
+
     public OsmPrimitive getPrimitiveInLayer(int row, OsmDataLayer layer) {
         return getOsmPrimitivesTableModel().getReferredPrimitive(row);

trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java

@@ -43 +43 @@
     }
 
-    private final QuadStateDecorator model;
+    private final transient QuadStateDecorator model;
     private State[] allowed;
 

trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java

@@ -51 +51 @@
     protected final UndoManager undo = new UndoManager();
 
-    protected final UndoableEditListener undoEditListener = new UndoableEditListener() {
+    protected final transient UndoableEditListener undoEditListener = new UndoableEditListener() {
         @Override
         public void undoableEditHappened(UndoableEditEvent e) {
@@ -60 +60 @@
     };
 
-    protected final PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
+    protected final transient PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
         @Override
         public void propertyChange(PropertyChangeEvent evt) {