Changeset 8308 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

Timestamp:

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

Author:

Don-vip

Message:

fix potential NPEs and Sonar issues related to serialization

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -25 +25 @@
 import java.util.LinkedList;
 import java.util.List;
+
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JMenuItem;
@@ -49 +50 @@
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.KeyPressReleaseListener;
-import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.ModifierListener;
 import org.openstreetmap.josm.tools.Geometry;
@@ -72 +73 @@
 
     private long mouseDownTime = 0;
-    private WaySegment selectedSegment = null;
-    private Node selectedNode = null;
+    private transient WaySegment selectedSegment = null;
+    private transient Node selectedNode = null;
     private Color mainColor;
-    private Stroke mainStroke;
+    private transient Stroke mainStroke;
 
     /** settings value whether shared nodes should be ignored or not */
@@ -86 +87 @@
      */
     private Color helperColor;
-    private Stroke helperStrokeDash;
-    private Stroke helperStrokeRA;
-
-    private Stroke oldLineStroke;
+    private transient Stroke helperStrokeDash;
+    private transient Stroke helperStrokeRA;
+
+    private transient Stroke oldLineStroke;
     private double symbolSize;
     /**
      * Possible directions to move to.
      */
-    private List<ReferenceSegment> possibleMoveDirections;
+    private transient List<ReferenceSegment> possibleMoveDirections;
 
 
@@ -105 +106 @@
      * The direction that is currently active.
      */
-    private ReferenceSegment activeMoveDirection;
+    private transient ReferenceSegment activeMoveDirection;
 
     /**
@@ -135 +136 @@
      * the command that performed last move.
      */
-    private MoveCommand moveCommand;
+    private transient MoveCommand moveCommand;
     /**
      *  The command used for dual alignment movement.
      *  Needs to be separate, due to two nodes moving in different directions.
      */
-    private MoveCommand moveCommand2;
+    private transient MoveCommand moveCommand2;
 
     /** The cursor for the 'create_new' mode. */
@@ -176 +177 @@
     private boolean dualAlignActive;
     /** Dual alignment reference segments */
-    private ReferenceSegment dualAlignSegment1, dualAlignSegment2;
+    private transient ReferenceSegment dualAlignSegment1, dualAlignSegment2;
     /** {@code true}, if new segment was collapsed */
     private boolean dualAlignSegmentCollapsed = false;
@@ -182 +183 @@
     private final DualAlignChangeAction dualAlignChangeAction;
     private final JCheckBoxMenuItem dualAlignCheckboxMenuItem;
-    private final Shortcut dualAlignShortcut;
+    private final transient Shortcut dualAlignShortcut;
     private boolean useRepeatedShortcut;
     private boolean ignoreNextKeyRelease;