Changeset 8346 in josm for trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

Timestamp:

2015-05-11T13:34:53+02:00 (9 years ago)

Author:

Don-vip

Message:

squid:S00116 - Field names should comply with a naming convention

File:

• trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -38 +38 @@
     protected Storage<PrimitiveData> makeIncompleteData;
 
-    protected Map<PrimitiveId, PrimitiveData> makeIncompleteData_byPrimId;
+    protected Map<PrimitiveId, PrimitiveData> makeIncompleteDataByPrimId;
 
     protected final ConflictCollection purgedConflicts = new ConflictCollection();
@@ -69 +69 @@
     protected final void saveIncomplete(Collection<OsmPrimitive> makeIncomplete) {
         makeIncompleteData = new Storage<>(new Storage.PrimitiveIdHash());
-        makeIncompleteData_byPrimId = makeIncompleteData.foreignKey(new Storage.PrimitiveIdHash());
+        makeIncompleteDataByPrimId = makeIncompleteData.foreignKey(new Storage.PrimitiveIdHash());
 
         for (OsmPrimitive osm : makeIncomplete) {
@@ -86 +86 @@
             for (int i=toPurge.size()-1; i>=0; --i) {
                 OsmPrimitive osm = toPurge.get(i);
-                if (makeIncompleteData_byPrimId.containsKey(osm)) {
+                if (makeIncompleteDataByPrimId.containsKey(osm)) {
                     // we could simply set the incomplete flag
                     // but that would not free memory in case the
@@ -121 +121 @@
 
         for (OsmPrimitive osm : toPurge) {
-            PrimitiveData data = makeIncompleteData_byPrimId.get(osm);
+            PrimitiveData data = makeIncompleteDataByPrimId.get(osm);
             if (data != null) {
                 if (ds.getPrimitiveById(osm) != osm)