This commit is contained in:
parent
6173a5f811
commit
2872262496
@ -1,3 +1,41 @@
|
|||||||
|
--- groovy-core-GROOVY_1_8_9/src/main/groovy/util/ProxyGenerator.java 2023-09-26 13:31:23.332876047 +0200
|
||||||
|
+++ groovy-core-GROOVY_1_8_9/src/main/groovy/util/ProxyGenerator.java 2023-09-26 16:00:10.274451173 +0200
|
||||||
|
@@ -96,7 +96,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public GroovyObject instantiateAggregateFromBaseClass(Closure cl, Class clazz) {
|
||||||
|
- Map<String, Closure> m = new HashMap<String, Closure>();
|
||||||
|
+ Map<String, Closure> m = new TreeMap<String, Closure>();
|
||||||
|
m.put("*", cl);
|
||||||
|
return instantiateAggregateFromBaseClass(m, clazz, null);
|
||||||
|
}
|
||||||
|
@@ -132,7 +132,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public GroovyObject instantiateAggregate(Map closureMap, List<Class> interfaces, Class clazz, Object[] constructorArgs) {
|
||||||
|
- Map map = new HashMap();
|
||||||
|
+ Map map = new TreeMap();
|
||||||
|
if (closureMap != null) {
|
||||||
|
map = closureMap;
|
||||||
|
}
|
||||||
|
@@ -181,7 +181,7 @@
|
||||||
|
buffer.append(" }\n");
|
||||||
|
|
||||||
|
// add overwriting methods
|
||||||
|
- Map<String, Method> selectedMethods = new HashMap<String, Method>();
|
||||||
|
+ Map<String, Method> selectedMethods = new TreeMap<String, Method>();
|
||||||
|
List<Method> publicAndProtectedMethods = getInheritedMethods(baseClass, new ArrayList<Method>());
|
||||||
|
boolean closureIndicator = map.containsKey("*");
|
||||||
|
for (Method method : publicAndProtectedMethods) {
|
||||||
|
@@ -269,7 +269,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public GroovyObject instantiateDelegateWithBaseClass(Map closureMap, List<Class> interfaces, Object delegate, Class baseClass, String name) {
|
||||||
|
- Map map = new HashMap();
|
||||||
|
+ Map map = new TreeMap();
|
||||||
|
if (closureMap != null) {
|
||||||
|
map = closureMap;
|
||||||
|
}
|
||||||
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ant/Groovyc.java 2023-09-26 13:31:23.336209403 +0200
|
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ant/Groovyc.java 2023-09-26 13:31:23.336209403 +0200
|
||||||
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ant/Groovyc.java 2023-09-26 13:31:35.556291444 +0200
|
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ant/Groovyc.java 2023-09-26 13:31:35.556291444 +0200
|
||||||
@@ -53,11 +53,11 @@
|
@@ -53,11 +53,11 @@
|
||||||
|
Loading…
x
Reference in New Issue
Block a user