Changeset 8840 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2015-10-09T02:12:45+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S3052 - Fields should not be initialized to default values

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AlignInCircleAction.java (modified) (1 diff)
• CombineWayAction.java (modified) (1 diff)
• JoinAreasAction.java (modified) (1 diff)
• OpenFileAction.java (modified) (1 diff)
• downloadtasks/AbstractDownloadTask.java (modified) (1 diff)
• downloadtasks/DownloadGpsTask.java (modified) (1 diff)
• downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• mapmode/DeleteAction.java (modified) (2 diffs)
• mapmode/DrawAction.java (modified) (2 diffs)
• mapmode/ExtrudeAction.java (modified) (2 diffs)
• mapmode/ImproveWayAccuracyAction.java (modified) (2 diffs)
• mapmode/PlayHeadDragMode.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (5 diffs)
• search/SearchAction.java (modified) (1 diff)
• search/SearchCompiler.java (modified) (1 diff)
• upload/UploadNotesTask.java (modified) (1 diff)

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

@@ -62 +62 @@
         private double angle;
         private EastNorth origin = new EastNorth(0, 0);
-        private double azimuth = 0;
+        private double azimuth;
 
         PolarCoor(double radius, double angle) {

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

@@ -464 +464 @@
 
         private Set<NodePair> edges;
-        private int numUndirectedEges = 0;
+        private int numUndirectedEges;
         private Map<Node, List<NodePair>> successors;
         private Map<Node, List<NodePair>> predecessors;

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

@@ -55 +55 @@
     // This will be used to commit commands and unite them into one large command sequence at the end
     private final LinkedList<Command> cmds = new LinkedList<>();
-    private int cmdsCount = 0;
+    private int cmdsCount;
     private final transient List<Relation> addedRelations = new LinkedList<>();
 

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

@@ -101 +101 @@
         private final FileFilter fileFilter;
         private boolean canceled;
-        private boolean recordHistory = false;
+        private boolean recordHistory;
 
         public OpenFileTask(final List<File> files, final FileFilter fileFilter, final String title) {

trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java

@@ -13 +13 @@
 public abstract class AbstractDownloadTask implements DownloadTask {
     private List<Object> errorMessages;
-    private boolean canceled = false;
-    private boolean failed = false;
+    private boolean canceled;
+    private boolean failed;
 
     public AbstractDownloadTask() {

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -44 +44 @@
     private static final String PATTERN_EXTERNAL_GPX_FILE = "https?://.*/(.*\\.gpx)";
 
-    protected String newLayerName = null;
+    protected String newLayerName;
 
     @Override

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -47 +47 @@
     protected DownloadTask downloadTask;
 
-    protected String newLayerName = null;
+    protected String newLayerName;
 
     @Override

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

@@ -47 +47 @@
 public class DeleteAction extends MapMode implements ModifierListener {
     // Cache previous mouse event (needed when only the modifier keys are pressed but the mouse isn't moved)
-    private MouseEvent oldEvent = null;
+    private MouseEvent oldEvent;
 
     /**
@@ -54 +54 @@
      * set would have to be checked.
      */
-    private transient WaySegment oldHighlightedWaySegment = null;
+    private transient WaySegment oldHighlightedWaySegment;
 
     private static final HighlightHelper highlightHelper = new HighlightHelper();

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

@@ -80 +80 @@
     private final Cursor cursorJoinWay;
 
-    private transient Node lastUsedNode = null;
+    private transient Node lastUsedNode;
     private double toleranceMultiplier;
 
@@ -94 +94 @@
     private transient Set<OsmPrimitive> newHighlights = new HashSet<>();
     private boolean drawHelperLine;
-    private boolean wayIsFinished = false;
+    private boolean wayIsFinished;
     private boolean drawTargetHighlight;
     private Point mousePos;

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

@@ -69 +69 @@
      * If {@code true}, when extruding create new node(s) even if segments are parallel.
      */
-    private boolean alwaysCreateNodes = false;
+    private boolean alwaysCreateNodes;
     private boolean nodeDragWithoutCtrl;
 
-    private long mouseDownTime = 0;
-    private transient WaySegment selectedSegment = null;
-    private transient Node selectedNode = null;
+    private long mouseDownTime;
+    private transient WaySegment selectedSegment;
+    private transient Node selectedNode;
     private Color mainColor;
     private transient Stroke mainStroke;
@@ -180 +180 @@
     private transient ReferenceSegment dualAlignSegment1, dualAlignSegment2;
     /** {@code true}, if new segment was collapsed */
-    private boolean dualAlignSegmentCollapsed = false;
+    private boolean dualAlignSegmentCollapsed;
     // Dual alignment UI stuff
     private final DualAlignChangeAction dualAlignChangeAction;

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

@@ -65 +65 @@
 
     private transient Way targetWay;
-    private transient Node candidateNode = null;
-    private transient WaySegment candidateSegment = null;
-
-    private Point mousePos = null;
-    private boolean dragging = false;
+    private transient Node candidateNode;
+    private transient WaySegment candidateSegment;
+
+    private Point mousePos;
+    private boolean dragging;
 
     private final Cursor cursorSelect;
@@ -86 +86 @@
     private int dotSize;
 
-    private boolean selectionChangedBlocked = false;
+    private boolean selectionChangedBlocked;
 
     protected String oldModeHelpText;

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

@@ -20 +20 @@
 public class PlayHeadDragMode extends MapMode {
 
-    private boolean dragging = false;
-    private Point mousePos = null;
-    private Point mouseStart = null;
-    private transient PlayHeadMarker playHeadMarker = null;
+    private boolean dragging;
+    private Point mousePos;
+    private Point mouseStart;
+    private transient PlayHeadMarker playHeadMarker;
 
     /**

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

@@ -116 +116 @@
     }
 
-    private boolean lassoMode = false;
+    private boolean lassoMode;
     public boolean repeatedKeySwitchLassoOption;
 
     // Cache previous mouse event (needed when only the modifier keys are
     // pressed but the mouse isn't moved)
-    private MouseEvent oldEvent = null;
-
-    private Mode mode = null;
+    private MouseEvent oldEvent;
+
+    private Mode mode;
     private final transient SelectionManager selectionManager;
-    private boolean cancelDrawMode = false;
+    private boolean cancelDrawMode;
     private boolean drawTargetHighlight;
-    private boolean didMouseDrag = false;
+    private boolean didMouseDrag;
     /**
      * The component this SelectAction is associated with.
@@ -147 +147 @@
      * The time of the user mouse down event.
      */
-    private long mouseDownTime = 0;
+    private long mouseDownTime;
     /**
      * The pressed button of the user mouse down event.
      */
-    private int mouseDownButton = 0;
+    private int mouseDownButton;
     /**
      * The time of the user mouse down event.
      */
-    private long mouseReleaseTime = 0;
+    private long mouseReleaseTime;
     /**
      * The time which needs to pass between click and release before something
@@ -166 +166 @@
      */
     private int initialMoveThreshold;
-    private boolean initialMoveThresholdExceeded = false;
+    private boolean initialMoveThresholdExceeded;
 
     /**
@@ -991 +991 @@
 
         private Collection<OsmPrimitive> cycleList = Collections.emptyList();
-        private boolean cyclePrims = false;
-        private OsmPrimitive cycleStart = null;
+        private boolean cyclePrims;
+        private OsmPrimitive cycleStart;
         private boolean waitForMouseUpParameter;
         private boolean multipleMatchesParameter;
@@ -1130 +1130 @@
     private class VirtualManager {
 
-        private Node virtualNode = null;
+        private Node virtualNode;
         private Collection<WaySegment> virtualWays = new LinkedList<>();
         private int nodeVirtualSize;

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -125 +125 @@
     }
 
-    private static volatile SearchSetting lastSearch = null;
+    private static volatile SearchSetting lastSearch;
 
     /**

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -62 +62 @@
 public class SearchCompiler {
 
-    private boolean caseSensitive = false;
-    private boolean regexSearch = false;
+    private boolean caseSensitive;
+    private boolean regexSearch;
     private static String  rxErrorMsg = marktr("The regex \"{0}\" had a parse error at offset {1}, full error:\n\n{2}");
     private static String  rxErrorMsgNoPos = marktr("The regex \"{0}\" had a parse error, full error:\n\n{1}");

trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

@@ -39 +39 @@
     private class UploadTask extends PleaseWaitRunnable {
 
-        private boolean isCanceled = false;
+        private boolean isCanceled;
         private Map<Note, Note> updatedNotes = new HashMap<>();
         private Map<Note, Exception> failedNotes = new HashMap<>();