Browse Source

@Override annotation is not supported at build time by Java 1.5 for interface methods.

Updating the STATUS file too.
master
Antoine Levy-Lambert 9 years ago
parent
commit
32634d817a
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      STATUS
  2. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/Replace.java

+ 3
- 3
STATUS View File

@@ -1,10 +1,10 @@
Apache Ant Status Apache Ant Status
Last modified at 2014-05-26
Last modified at 2016-02-24


Release: Release:
Current: 1.9.4 (in GIT Tag: ANT_194)
Current: 1.9.6 (in GIT Tag: ANT_196)
Maintenance: 1.9.x (in GIT Branch: master) Maintenance: 1.9.x (in GIT Branch: master)
Development: 1.9.5 (in GIT Branch: master)
Development: 1.9.7 (in GIT Branch: master)


Assets: Assets:
DNS: ant.apache.org DNS: ant.apache.org


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/Replace.java View File

@@ -962,7 +962,7 @@ public class Replace extends MatchingTask {
private Iterator<Object> getOrderedIterator(Properties props) { private Iterator<Object> getOrderedIterator(Properties props) {
List<Object> keys = new ArrayList<Object>(props.keySet()); List<Object> keys = new ArrayList<Object>(props.keySet());
Collections.sort(keys, new Comparator<Object>() { Collections.sort(keys, new Comparator<Object>() {
@Override
//Override annotation is not supported as long as we want to support building Ant on Java 1.5
public int compare(Object key1, Object key2) { public int compare(Object key1, Object key2) {
return compare(key1.toString(), key2.toString()); return compare(key1.toString(), key2.toString());
} }


Loading…
Cancel
Save