Browse Source

Merge pull request #131 from twogee/getref

Another getCheckedRef() refactoring
master
Stefan Bodewig GitHub 4 years ago
parent
commit
3b06118487
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java

+ 6
- 2
src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java View File

@@ -64,7 +64,7 @@ public class DelegatedResourceComparator extends ResourceComparator {
return true;
}
if (isReference()) {
return getCheckedRef(DelegatedResourceComparator.class).equals(o);
return getRef().equals(o);
}
if (o instanceof DelegatedResourceComparator) {
List<ResourceComparator> ov = ((DelegatedResourceComparator) o).resourceComparators;
@@ -80,7 +80,7 @@ public class DelegatedResourceComparator extends ResourceComparator {
@Override
public synchronized int hashCode() {
if (isReference()) {
return getCheckedRef(DelegatedResourceComparator.class).hashCode();
return getRef().hashCode();
}
return resourceComparators == null ? 0 : resourceComparators.hashCode();
}
@@ -118,6 +118,10 @@ s.
}
}

private DelegatedResourceComparator getRef() {
return getCheckedRef(DelegatedResourceComparator.class);
}

private static Comparator<Resource> composite(List<? extends Comparator<Resource>> foo) {
Comparator<Resource> result = null;
if (foo != null) {


Loading…
Cancel
Save