Browse Source

Small refactor of previous commit's code to improve consistency.

qdn
CalDescent 3 years ago
parent
commit
1f3d400ad6
  1. 15
      src/main/java/org/qortal/list/ResourceList.java
  2. 6
      src/main/java/org/qortal/list/ResourceListManager.java

15
src/main/java/org/qortal/list/ResourceList.java

@ -103,7 +103,7 @@ public class ResourceList {
if (resource == null || this.list == null) {
return;
}
if (!this.contains(resource)) {
if (!this.contains(resource, true)) {
this.list.add(resource);
}
}
@ -115,18 +115,17 @@ public class ResourceList {
this.list.remove(resource);
}
public boolean contains(String resource) {
public boolean contains(String resource, boolean caseSensitive) {
if (resource == null || this.list == null) {
return false;
}
return this.list.contains(resource);
}
public boolean containsCaseInsensitive(String resource) {
if (resource == null || this.list == null) {
return false;
if (caseSensitive) {
return this.list.contains(resource);
}
else {
return this.list.stream().anyMatch(resource::equalsIgnoreCase);
}
return this.list.stream().anyMatch(resource::equalsIgnoreCase);
}

6
src/main/java/org/qortal/list/ResourceListManager.java

@ -92,11 +92,7 @@ public class ResourceListManager {
if (list == null) {
return false;
}
if (caseSensitive) {
return list.contains(item);
}
return list.containsCaseInsensitive(item);
return list.contains(item, caseSensitive);
}
public void saveList(String category, String resourceName) {

Loading…
Cancel
Save