This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 10d4ef6b4d94cd2d8d89d7e60a51814a88c28201
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Apr 28 10:28:50 2020 +0100
Formatting clean-up to improve clarity. No functional change.
---
java/org/apache/jasper/compiler/JDTCompiler.java | 77 ++++++++++--------------
1 file changed, 33 insertions(+), 44 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 5daea81..a6638f1 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -108,8 +108,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
final String outputDir =
ctxt.getOptions().getScratchDir().getAbsolutePath();
String packageName = ctxt.getServletPackageName();
final String targetClassName =
- ((packageName.length() != 0) ? (packageName + ".") : "")
- + ctxt.getServletClassName();
+ ((packageName.length() != 0) ? (packageName + ".") : "") +
ctxt.getServletClassName();
final ClassLoader classLoader = ctxt.getJspLoader();
String[] fileNames = new String[] {sourceFile};
String[] classNames = new String[] {targetClassName};
@@ -134,14 +133,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
public char[] getContents() {
char[] result = null;
try (FileInputStream is = new FileInputStream(sourceFile);
- InputStreamReader isr = new InputStreamReader(
- is, ctxt.getOptions().getJavaEncoding());
+ InputStreamReader isr = new InputStreamReader(is,
ctxt.getOptions().getJavaEncoding());
Reader reader = new BufferedReader(isr)) {
char[] chars = new char[8192];
StringBuilder buf = new StringBuilder();
int count;
- while ((count = reader.read(chars, 0,
- chars.length)) > 0) {
+ while ((count = reader.read(chars, 0, chars.length)) > 0) {
buf.append(chars, 0, count);
}
result = new char[buf.length()];
@@ -163,8 +160,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
@Override
public char[][] getPackageName() {
- StringTokenizer izer =
- new StringTokenizer(className, ".");
+ StringTokenizer izer = new StringTokenizer(className, ".");
char[][] result = new char[izer.countTokens()-1][];
for (int i = 0; i < result.length; i++) {
String tok = izer.nextToken();
@@ -182,52 +178,48 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
final INameEnvironment env = new INameEnvironment() {
@Override
- public NameEnvironmentAnswer
- findType(char[][] compoundTypeName) {
+ public NameEnvironmentAnswer findType(char[][]
compoundTypeName) {
StringBuilder result = new StringBuilder();
for (int i = 0; i < compoundTypeName.length; i++) {
- if(i > 0)
+ if (i > 0) {
result.append('.');
+ }
result.append(compoundTypeName[i]);
}
return findType(result.toString());
}
@Override
- public NameEnvironmentAnswer
- findType(char[] typeName,
- char[][] packageName) {
- StringBuilder result = new StringBuilder();
- int i=0;
- for (; i < packageName.length; i++) {
- if(i > 0)
- result.append('.');
- result.append(packageName[i]);
- }
- if(i > 0)
+ public NameEnvironmentAnswer findType(char[] typeName,
char[][] packageName) {
+ StringBuilder result = new StringBuilder();
+ int i=0;
+ for (; i < packageName.length; i++) {
+ if (i > 0) {
result.append('.');
- result.append(typeName);
- return findType(result.toString());
+ }
+ result.append(packageName[i]);
+ }
+ if (i > 0) {
+ result.append('.');
+ }
+ result.append(typeName);
+ return findType(result.toString());
}
private NameEnvironmentAnswer findType(String className) {
if (className.equals(targetClassName)) {
- ICompilationUnit compilationUnit =
- new CompilationUnit(sourceFile, className);
- return
- new NameEnvironmentAnswer(compilationUnit, null);
+ ICompilationUnit compilationUnit = new
CompilationUnit(sourceFile, className);
+ return new NameEnvironmentAnswer(compilationUnit,
null);
}
- String resourceName =
- className.replace('.', '/') + ".class";
+ String resourceName = className.replace('.', '/') +
".class";
try (InputStream is =
classLoader.getResourceAsStream(resourceName)) {
if (is != null) {
byte[] classBytes;
byte[] buf = new byte[8192];
- ByteArrayOutputStream baos =
- new ByteArrayOutputStream(buf.length);
+ ByteArrayOutputStream baos = new
ByteArrayOutputStream(buf.length);
int count;
while ((count = is.read(buf, 0, buf.length)) > 0) {
baos.write(buf, 0, count);
@@ -235,11 +227,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
baos.flush();
classBytes = baos.toByteArray();
char[] fileName = className.toCharArray();
- ClassFileReader classFileReader =
- new ClassFileReader(classBytes, fileName,
- true);
- return
- new NameEnvironmentAnswer(classFileReader,
null);
+ ClassFileReader classFileReader = new
ClassFileReader(classBytes, fileName, true);
+ return new NameEnvironmentAnswer(classFileReader,
null);
}
} catch (IOException exc) {
log.error("Compilation error", exc);
@@ -264,14 +253,14 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
}
@Override
- public boolean isPackage(char[][] parentPackageName,
- char[] packageName) {
+ public boolean isPackage(char[][] parentPackageName, char[]
packageName) {
StringBuilder result = new StringBuilder();
- int i=0;
+ int i = 0;
if (parentPackageName != null) {
for (; i < parentPackageName.length; i++) {
- if(i > 0)
+ if (i > 0) {
result.append('.');
+ }
result.append(parentPackageName[i]);
}
}
@@ -281,8 +270,9 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
return false;
}
}
- if(i > 0)
+ if (i > 0) {
result.append('.');
+ }
result.append(packageName);
return isPackage(result.toString());
@@ -294,8 +284,7 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
};
- final IErrorHandlingPolicy policy =
- DefaultErrorHandlingPolicies.proceedWithAllProblems();
+ final IErrorHandlingPolicy policy =
DefaultErrorHandlingPolicies.proceedWithAllProblems();
final Map<String,String> settings = new HashMap<>();
settings.put(CompilerOptions.OPTION_LineNumberAttribute,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
