|
 |
ae0ef24 |
--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2014-11-18 14:29:02.146042000 -0500
|
|
|
ae0ef24 |
+++ java/org/apache/jasper/compiler/JDTCompiler.java 2014-11-18 14:31:41.851597000 -0500
|
|
|
ae0ef24 |
@@ -67,7 +67,6 @@
|
|
|
ae0ef24 |
/**
|
|
|
ae0ef24 |
* Compile the servlet from .java file to .class file
|
|
|
ae0ef24 |
*/
|
|
|
ae0ef24 |
- @Override
|
|
|
ae0ef24 |
protected void generateClass(String[] smap)
|
|
|
ae0ef24 |
throws FileNotFoundException, JasperException, Exception {
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
@@ -98,12 +97,10 @@
|
|
|
ae0ef24 |
this.sourceFile = sourceFile;
|
|
|
ae0ef24 |
}
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
- @Override
|
|
|
ae0ef24 |
public char[] getFileName() {
|
|
|
ae0ef24 |
return sourceFile.toCharArray();
|
|
|
ae0ef24 |
}
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
- @Override
|
|
|
ae0ef24 |
public char[] getContents() {
|
|
|
ae0ef24 |
char[] result = null;
|
|
|
ae0ef24 |
FileInputStream is = null;
|
|
|
ae0ef24 |
@@ -145,7 +142,6 @@
|
|
|
ae0ef24 |
return result;
|
|
|
ae0ef24 |
}
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
- @Override
|
|
|
ae0ef24 |
public char[] getMainTypeName() {
|
|
|
ae0ef24 |
int dot = className.lastIndexOf('.');
|
|
|
ae0ef24 |
if (dot > 0) {
|
|
|
ae0ef24 |
@@ -154,7 +150,6 @@
|
|
|
ae0ef24 |
return className.toCharArray();
|
|
|
ae0ef24 |
}
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
- @Override
|
|
|
ae0ef24 |
public char[][] getPackageName() {
|
|
|
ae0ef24 |
StringTokenizer izer =
|
|
|
ae0ef24 |
new StringTokenizer(className, ".");
|
|
|
ae0ef24 |
@@ -166,7 +161,6 @@
|
|
|
ae0ef24 |
return result;
|
|
|
ae0ef24 |
}
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
- @Override
|
|
|
ae0ef24 |
public boolean ignoreOptionalProblems() {
|
|
|
ae0ef24 |
return false;
|
|
|
ae0ef24 |
}
|
|
|
ae0ef24 |
@@ -174,7 +168,6 @@
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
final INameEnvironment env = new INameEnvironment() {
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
- @Override
|
|
|
ae0ef24 |
public NameEnvironmentAnswer
|
|
|
ae0ef24 |
findType(char[][] compoundTypeName) {
|
|
|
ae0ef24 |
String result = "";
|
|
|
ae0ef24 |
@@ -187,7 +180,6 @@
|
|
|
ae0ef24 |
return findType(result);
|
|
|
ae0ef24 |
}
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
- @Override
|
|
|
ae0ef24 |
public NameEnvironmentAnswer
|
|
|
ae0ef24 |
findType(char[] typeName,
|
|
|
ae0ef24 |
char[][] packageName) {
|
|
|
ae0ef24 |
@@ -269,7 +261,6 @@
|
|
|
ae0ef24 |
}
|
|
|
ae0ef24 |
}
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
- @Override
|
|
|
ae0ef24 |
public boolean isPackage(char[][] parentPackageName,
|
|
|
ae0ef24 |
char[] packageName) {
|
|
|
ae0ef24 |
String result = "";
|
|
|
ae0ef24 |
@@ -293,7 +284,6 @@
|
|
|
ae0ef24 |
return isPackage(result);
|
|
|
ae0ef24 |
}
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
- @Override
|
|
|
ae0ef24 |
public void cleanup() {
|
|
|
ae0ef24 |
}
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
@@ -342,9 +332,6 @@
|
|
|
ae0ef24 |
} else if(opt.equals("1.7")) {
|
|
|
ae0ef24 |
settings.put(CompilerOptions.OPTION_Source,
|
|
|
ae0ef24 |
CompilerOptions.VERSION_1_7);
|
|
|
ae0ef24 |
- } else if(opt.equals("1.8")) {
|
|
|
ae0ef24 |
- settings.put(CompilerOptions.OPTION_Source,
|
|
|
ae0ef24 |
- CompilerOptions.VERSION_1_8);
|
|
|
ae0ef24 |
} else {
|
|
|
ae0ef24 |
log.warn("Unknown source VM " + opt + " ignored.");
|
|
|
ae0ef24 |
settings.put(CompilerOptions.OPTION_Source,
|
|
|
ae0ef24 |
@@ -386,11 +373,6 @@
|
|
|
ae0ef24 |
CompilerOptions.VERSION_1_7);
|
|
|
ae0ef24 |
settings.put(CompilerOptions.OPTION_Compliance,
|
|
|
ae0ef24 |
CompilerOptions.VERSION_1_7);
|
|
|
ae0ef24 |
- } else if(opt.equals("1.8")) {
|
|
|
ae0ef24 |
- settings.put(CompilerOptions.OPTION_TargetPlatform,
|
|
|
ae0ef24 |
- CompilerOptions.VERSION_1_8);
|
|
|
ae0ef24 |
- settings.put(CompilerOptions.OPTION_Compliance,
|
|
|
ae0ef24 |
- CompilerOptions.VERSION_1_8);
|
|
|
ae0ef24 |
} else {
|
|
|
ae0ef24 |
log.warn("Unknown target VM " + opt + " ignored.");
|
|
|
ae0ef24 |
settings.put(CompilerOptions.OPTION_TargetPlatform,
|
|
|
ae0ef24 |
@@ -408,7 +390,6 @@
|
|
|
ae0ef24 |
new DefaultProblemFactory(Locale.getDefault());
|
|
|
ae0ef24 |
|
|
|
ae0ef24 |
final ICompilerRequestor requestor = new ICompilerRequestor() {
|
|
|
ae0ef24 |
- @Override
|
|
|
ae0ef24 |
public void acceptResult(CompilationResult result) {
|
|
|
ae0ef24 |
try {
|
|
|
ae0ef24 |
if (result.hasProblems()) {
|