Changeset 10308 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2016-06-01T23:17:40+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1854 - Dead stores should be removed

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSetMerger.java (modified) (1 diff)
• FilterWorker.java (modified) (2 diffs)
• event/DatasetEventManager.java (modified) (1 diff)

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

@@ -111 +111 @@
         // the target dataset. Create a clone and add it to the target dataset.
         //
-        OsmPrimitive target = null;
+        OsmPrimitive target;
         switch(source.getType()) {
         case NODE: target = source.isNew() ? new Node() : new Node(source.getId()); break;

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

@@ -24 +24 @@
      * Apply the filters to the primitives of the data set.
      *
-     * @param all the collection of primitives for that the filter state should
-     * be updated
+     * @param all the collection of primitives for that the filter state should be updated
      * @param filterMatcher the FilterMatcher
      * @return true, if the filter state (normal / disabled / hidden)
@@ -31 +30 @@
      */
     public static boolean executeFilters(Collection<OsmPrimitive> all, FilterMatcher filterMatcher) {
-        boolean changed = false;
+        boolean changed;
         // first relations, then ways and nodes last; this is required to resolve dependencies
         changed = doExecuteFilters(Utils.filter(all, OsmPrimitive.relationPredicate), filterMatcher);

trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

@@ -36 +36 @@
                 DataSet dataSet = null;
                 AbstractDatasetChangedEvent consolidatedEvent = null;
-                AbstractDatasetChangedEvent event = null;
+                AbstractDatasetChangedEvent event;
 
                 while ((event = eventsInEDT.poll()) != null) {