Browse Source

reduced min Java version to 1.6

tags/V1_8_11RC1
Andy Clement 7 years ago
parent
commit
4a07d09f36

+ 3
- 2
build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java View File

@@ -278,8 +278,9 @@ public class AntBuilder extends Builder {
javac.setSource("1.8");
javac.setTarget("1.8");
} else {
javac.setSource("1.7");
javac.setTarget("1.7");
// min
javac.setSource("1.6");
javac.setTarget("1.6");
}
}
// compile

BIN
lib/build/build.jar View File


+ 1
- 1
org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java View File

@@ -65,7 +65,7 @@ public class AdviceDeclaration extends AjMethodDeclaration {
public int adviceSequenceNumberInType;

public MethodBinding proceedMethodBinding; // set during this.resolveStaments, referenced by Proceed
public List<Proceed> proceedCalls = new ArrayList<>(2); // populated during Proceed.findEnclosingAround
public List<Proceed> proceedCalls = new ArrayList<Proceed>(2); // populated during Proceed.findEnclosingAround

private boolean proceedInInners;
private ResolvedMember[] proceedCallSignatures;

+ 24
- 4
testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java View File

@@ -24,10 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.Stack;

import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;

import org.apache.commons.digester.Digester;
import org.aspectj.apache.bcel.classfile.Attribute;
import org.aspectj.apache.bcel.classfile.JavaClass;
@@ -39,6 +35,12 @@ import org.aspectj.apache.bcel.util.SyntheticRepository;
import org.aspectj.tools.ajc.AjcTestCase;
import org.aspectj.tools.ajc.CompilationResult;
import org.aspectj.util.FileUtil;
import org.aspectj.weaver.ResolvedMember;
import org.aspectj.weaver.ResolvedType;

import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;

/**
* Root class for all Test suites that are based on an AspectJ XML test suite file. Extends AjcTestCase allowing a mix of
@@ -463,5 +465,23 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase {
return new File(getClass().getResource(resourceName).getFile());
}

protected Method findMethod(JavaClass jc, String string) {
for (Method m : jc.getMethods()) {
if (m.getName().equals(string)) {
return m;
}
}
return null;
}

protected ResolvedMember findMethod(ResolvedType outerType, String string) {
for (ResolvedMember method: outerType.getDeclaredMethods()) {
if (method.getName().equals(string)) {
return method;
}
}
return null;
}

}

+ 1
- 1
util/src/org/aspectj/util/LangUtil.java View File

@@ -933,7 +933,7 @@ public class LangUtil {
if ((null == array) || (1 > array.length)) {
return Collections.emptyList();
}
ArrayList<T> list = new ArrayList<>();
ArrayList<T> list = new ArrayList<T>();
list.addAll(Arrays.asList(array));
return list;
}

Loading…
Cancel
Save