More merge problems

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);
     }

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])) {

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);

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);
         }