You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/05/26 18:32:54 UTC
ant git commit: More merge problems
Repository: ant
Updated Branches:
refs/heads/1.9.x 64809d976 -> baba2b85b
More merge problems
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/baba2b85
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/baba2b85
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/baba2b85
Branch: refs/heads/1.9.x
Commit: baba2b85bb3a9ec802f3131d5500232e3d874792
Parents: 64809d9
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sat May 26 20:31:34 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sat May 26 20:31:34 2018 +0200
----------------------------------------------------------------------
.../org/apache/tools/ant/filters/BaseParamFilterReader.java | 2 +-
.../org/apache/tools/ant/types/selectors/SelectorUtils.java | 9 ++++-----
.../junit/org/apache/tools/ant/IntrospectionHelperTest.java | 2 +-
.../junit/org/apache/tools/ant/UnknownElementTest.java | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/baba2b85/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java
index f3a8e5e..54bc9ff 100644
--- a/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java
+++ b/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java
@@ -58,7 +58,7 @@ public abstract class BaseParamFilterReader
* @param parameters The parameters to be used by this filter.
* Should not be <code>null</code>.
*/
- public final void setParameters(final Parameter... parameters) {
+ public final void setParameters(final Parameter[] parameters) {
this.parameters = parameters;
setInitialized(false);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/baba2b85/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
index 24630e8..a2804c2 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
@@ -366,7 +366,6 @@ public final class SelectorUtils {
int patIdxEnd = patArr.length - 1;
int strIdxStart = 0;
int strIdxEnd = strArr.length - 1;
- char ch;
boolean containsStar = false;
for (char ch : patArr) {
@@ -382,7 +381,7 @@ public final class SelectorUtils {
return false; // Pattern and string do not have the same size
}
for (int i = 0; i <= patIdxEnd; i++) {
- ch = patArr[i];
+ char ch = patArr[i];
if (ch != '?') {
if (different(caseSensitive, ch, strArr[i])) {
return false; // Character mismatch
@@ -398,7 +397,7 @@ public final class SelectorUtils {
// Process characters before first star
while (true) {
- ch = patArr[patIdxStart];
+ char ch = patArr[patIdxStart];
if (ch == '*' || strIdxStart > strIdxEnd) {
break;
}
@@ -418,7 +417,7 @@ public final class SelectorUtils {
// Process characters after last star
while (true) {
- ch = patArr[patIdxEnd];
+ char ch = patArr[patIdxEnd];
if (ch == '*' || strIdxStart > strIdxEnd) {
break;
}
@@ -459,7 +458,7 @@ public final class SelectorUtils {
strLoop:
for (int i = 0; i <= strLength - patLength; i++) {
for (int j = 0; j < patLength; j++) {
- ch = patArr[patIdxStart + j + 1];
+ char ch = patArr[patIdxStart + j + 1];
if (ch != '?') {
if (different(caseSensitive, ch,
strArr[strIdxStart + i + j])) {
http://git-wip-us.apache.org/repos/asf/ant/blob/baba2b85/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
index cc9a0fe..058e628 100644
--- a/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
+++ b/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
@@ -204,7 +204,7 @@ public class IntrospectionHelperTest {
}
private Map<String, Class<?>> getExpectedNestedElements() {
- Map<String, Class<?>> elemMap = new Hashtable<>();
+ Map<String, Class<?>> elemMap = new Hashtable<String, Class<?>>();
elemMap.put("six", String.class);
elemMap.put("thirteen", StringBuffer.class);
elemMap.put("fourteen", StringBuffer.class);
http://git-wip-us.apache.org/repos/asf/ant/blob/baba2b85/src/tests/junit/org/apache/tools/ant/UnknownElementTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/UnknownElementTest.java b/src/tests/junit/org/apache/tools/ant/UnknownElementTest.java
index 003f1a9..22688d6 100644
--- a/src/tests/junit/org/apache/tools/ant/UnknownElementTest.java
+++ b/src/tests/junit/org/apache/tools/ant/UnknownElementTest.java
@@ -96,7 +96,7 @@ public class UnknownElementTest {
}
public static class Parent extends Task implements TaskContainer {
- List<Task> children = new ArrayList<>();
+ List<Task> children = new ArrayList<Task>();
public void addTask(Task t) {
children.add(t);
}