xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TagSet: fix C-style string comparisons #185, fixes #190

Browse Source
This commit is contained in:
Andrey Novikov 2016-09-28 14:57:32 +03:00 committed by Emux
parent 98924b83af
commit 52bb54c006
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vtm/src/org/oscim/core/TagSet.java
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016 Andrey Novikov
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@ -83,7 +84,7 @@ public class TagSet {
*/ */
public Tag get(String key) { public Tag get(String key) {
for (int i = 0; i < numTags; i++) { for (int i = 0; i < numTags; i++) {
if (tags[i].key == key) if (tags[i].key.equals(key))
return tags[i]; return tags[i];
} }
return null; return null;
@ -97,7 +98,7 @@ public class TagSet {
*/ */
public boolean containsKey(String key) { public boolean containsKey(String key) {
for (int i = 0; i < numTags; i++) { for (int i = 0; i < numTags; i++) {
if (tags[i].key == key) if (tags[i].key.equals(key))
return true; return true;
} }
return false; return false;
@ -111,7 +112,7 @@ public class TagSet {
*/ */
public String getValue(String key) { public String getValue(String key) {
for (int i = 0; i < numTags; i++) { for (int i = 0; i < numTags; i++) {
if (tags[i].key == key) if (tags[i].key.equals(key))
return tags[i].value; return tags[i].value;
} }
return null; return null;
@ -154,7 +155,7 @@ public class TagSet {
public boolean contains(Tag tag) { public boolean contains(Tag tag) {
for (int i = 0; i < numTags; i++) { for (int i = 0; i < numTags; i++) {
Tag t = tags[i]; Tag t = tags[i];
if ((t == tag) || (t.key == tag.key && t.value == tag.value)) if ((t == tag) || (t.key.equals(tag.key) && t.value.equals(tag.value)))
return true; return true;
} }
return false; return false;
@ -169,7 +170,7 @@ public class TagSet {
*/ */
public boolean contains(String key, String value) { public boolean contains(String key, String value) {
for (int i = 0; i < numTags; i++) { for (int i = 0; i < numTags; i++) {
if (tags[i].key == key) if (tags[i].key.equals(key))
return value.equals(tags[i].value); return value.equals(tags[i].value);
} }
return false; return false;