Changeset 14905 in josm

Timestamp:

2019-03-19T06:19:07+01:00 (5 years ago)

Author:

GerdP

Message:

fix #17440: remove confusing code
fixes several sonar lint issues "Local variables should not shadow class fields"

Location:

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

Files:

• AbstractPrimitive.java (modified) (7 diffs)
• OsmPrimitive.java (modified) (2 diffs)
• Relation.java (modified) (3 diffs)
• TagMap.java (modified) (2 diffs)
• Way.java (modified) (11 diffs)

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

@@ -234 +234 @@
     @Override
     public long getId() {
-        long id = this.id;
         return id >= 0 ? id : 0;
     }
@@ -470 +469 @@
     @Override
     public void visitKeys(KeyValueVisitor visitor) {
-        final String[] keys = this.keys;
         if (keys != null) {
             for (int i = 0; i < keys.length; i += 2) {
@@ -640 +638 @@
     @Override
     public final String get(String key) {
-        String[] keys = this.keys;
         if (key == null)
             return null;
@@ -657 +654 @@
      */
     public final String getIgnoreCase(String key) {
-        String[] keys = this.keys;
         if (key == null)
             return null;
@@ -670 +666 @@
     @Override
     public final int getNumKeys() {
-        String[] keys = this.keys;
         return keys == null ? 0 : keys.length / 2;
     }
@@ -676 +671 @@
     @Override
     public final Collection<String> keySet() {
-        final String[] keys = this.keys;
         if (keys == null) {
             return Collections.emptySet();
@@ -845 +839 @@
     public Map<String, String> getInterestingTags() {
         Map<String, String> result = new HashMap<>();
-        String[] keys = this.keys;
         if (keys != null) {
             for (int i = 0; i < keys.length; i += 2) {

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

@@ -817 +817 @@
         }
         checkDataset();
-        final Object referrers = this.referrers;
         if (referrers == null) {
             return Stream.empty();
@@ -895 +894 @@
         // Count only referrers that are members of the same dataset (primitive can have some fake references, for example
         // when way is cloned
-        Object referrers = this.referrers;
         if (referrers == null) return false;
         checkDataset();

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

@@ -464 +464 @@
         DataSet dataSet = getDataSet();
         if (dataSet != null) {
-            RelationMember[] members = this.members;
             for (RelationMember rm: members) {
                 if (rm.getMember().getDataSet() != dataSet)
@@ -494 +493 @@
     @Override
     public boolean hasIncompleteMembers() {
-        RelationMember[] members = this.members;
         for (RelationMember rm: members) {
             if (rm.getMember().isIncomplete()) return true;
@@ -509 +507 @@
     public Collection<OsmPrimitive> getIncompleteMembers() {
         Set<OsmPrimitive> ret = new HashSet<>();
-        RelationMember[] members = this.members;
         for (RelationMember rm: members) {
             if (!rm.getMember().isIncomplete()) {

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

@@ -176 +176 @@
     @Override
     public String get(Object key) {
-        String[] tags = this.tags;
         int index = indexOfKey(tags, key);
         return index < 0 ? null : tags[index + 1];
@@ -183 +182 @@
     @Override
     public boolean containsValue(Object value) {
-        String[] tags = this.tags;
         for (int i = 1; i < tags.length; i += 2) {
             if (value.equals(tags[i])) {

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

@@ -120 +120 @@
         if (node == null) return false;
 
-        Node[] nodes = this.nodes;
         for (Node n : nodes) {
             if (n.equals(node))
@@ -140 +139 @@
         if (node == null) return neigh;
 
-        Node[] nodes = this.nodes;
         for (int i = 0; i < nodes.length; i++) {
             if (nodes[i].equals(node)) {
@@ -164 +162 @@
         if (isIncomplete()) return chunkSet;
         Node lastN = null;
-        Node[] nodes = this.nodes;
         for (Node n : nodes) {
             if (lastN == null) {
@@ -466 +463 @@
         if (isIncomplete()) return false;
 
-        Node[] nodes = this.nodes;
         return nodes.length >= 3 && nodes[nodes.length-1] == nodes[0];
     }
@@ -492 +488 @@
     @Override
     public Node lastNode() {
-        Node[] nodes = this.nodes;
         if (isIncomplete() || nodes.length == 0) return null;
         return nodes[nodes.length-1];
@@ -499 +494 @@
     @Override
     public Node firstNode() {
-        Node[] nodes = this.nodes;
         if (isIncomplete() || nodes.length == 0) return null;
         return nodes[0];
@@ -506 +500 @@
     @Override
     public boolean isFirstLastNode(INode n) {
-        Node[] nodes = this.nodes;
         if (isIncomplete() || nodes.length == 0) return false;
         return n == nodes[0] || n == nodes[nodes.length -1];
@@ -513 +506 @@
     @Override
     public boolean isInnerNode(INode n) {
-        Node[] nodes = this.nodes;
         if (isIncomplete() || nodes.length <= 2) return false;
         /* circular ways have only inner nodes, so return true for them! */
@@ -536 +528 @@
         DataSet dataSet = getDataSet();
         if (dataSet != null) {
-            Node[] nodes = this.nodes;
             for (Node n: nodes) {
                 if (n.getDataSet() != dataSet)
@@ -598 +589 @@
      */
     public boolean hasIncompleteNodes() {
-        Node[] nodes = this.nodes;
         for (Node node : nodes) {
             if (node.isIncomplete())
@@ -612 +602 @@
      */
     public boolean hasOnlyLocatableNodes() {
-        Node[] nodes = this.nodes;
         for (Node node : nodes) {
             if (!node.isLatLonKnown())