From: markt Date: Fri, 9 Jan 2009 11:17:13 +0000 (+0000) Subject: Fix various Eclipse warnings in o.a.jasper.compiler. Remove unused and unnecessary... X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ac1da74759e10eb544c01084cc8bf7fd39acfdf0;p=tomcat7.0 Fix various Eclipse warnings in o.a.jasper.compiler. Remove unused and unnecessary code, correct use of deprecated methods. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@733008 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/jasper/compiler/Dumper.java b/java/org/apache/jasper/compiler/Dumper.java index 1925f55d3..e43e8083a 100644 --- a/java/org/apache/jasper/compiler/Dumper.java +++ b/java/org/apache/jasper/compiler/Dumper.java @@ -42,14 +42,6 @@ class Dumper { System.out.print(str); } - private void printString(String prefix, char[] chars, String suffix) { - String str = null; - if (chars != null) { - str = new String(chars); - } - printString(prefix, str, suffix); - } - private void printString(String prefix, String str, String suffix) { printIndent(); if (str != null) { diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java index 797704228..ccb8bed6e 100644 --- a/java/org/apache/jasper/compiler/JDTCompiler.java +++ b/java/org/apache/jasper/compiler/JDTCompiler.java @@ -105,17 +105,15 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { is = new FileInputStream(sourceFile); Reader reader = new BufferedReader(new InputStreamReader(is, ctxt.getOptions().getJavaEncoding())); - if (reader != null) { - char[] chars = new char[8192]; - StringBuffer buf = new StringBuffer(); - int count; - while ((count = reader.read(chars, 0, - chars.length)) > 0) { - buf.append(chars, 0, count); - } - result = new char[buf.length()]; - buf.getChars(0, result.length, result, 0); + char[] chars = new char[8192]; + StringBuffer buf = new StringBuffer(); + int count; + while ((count = reader.read(chars, 0, + chars.length)) > 0) { + buf.append(chars, 0, count); } + result = new char[buf.length()]; + buf.getChars(0, result.length, result, 0); } catch (IOException e) { log.error("Compilation error", e); } finally { @@ -421,12 +419,13 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { String className = classNames[i]; compilationUnits[i] = new CompilationUnit(fileNames[i], className); } + CompilerOptions cOptions = new CompilerOptions(settings); + cOptions.parseLiteralExpressionsAsConstants = true; Compiler compiler = new Compiler(env, policy, - settings, + cOptions, requestor, - problemFactory, - true); + problemFactory); compiler.compile(compilationUnits); if (!ctxt.keepGenerated()) { diff --git a/java/org/apache/jasper/compiler/JspConfig.java b/java/org/apache/jasper/compiler/JspConfig.java index 6b9d38208..5dd3e2bc2 100644 --- a/java/org/apache/jasper/compiler/JspConfig.java +++ b/java/org/apache/jasper/compiler/JspConfig.java @@ -424,7 +424,6 @@ public class JspConfig { while (iter.hasNext()) { JspPropertyGroup jpg = iter.next(); - JspProperty jp = jpg.getJspProperty(); String extension = jpg.getExtension(); String path = jpg.getPath(); diff --git a/java/org/apache/jasper/compiler/JspDocumentParser.java b/java/org/apache/jasper/compiler/JspDocumentParser.java index e51008556..686d6b5df 100644 --- a/java/org/apache/jasper/compiler/JspDocumentParser.java +++ b/java/org/apache/jasper/compiler/JspDocumentParser.java @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.jar.JarFile; -import javax.servlet.jsp.tagext.Tag; import javax.servlet.jsp.tagext.TagFileInfo; import javax.servlet.jsp.tagext.TagInfo; import javax.servlet.jsp.tagext.TagLibraryInfo; @@ -56,7 +55,6 @@ class JspDocumentParser extends DefaultHandler implements LexicalHandler, TagConstants { - private static final String JSP_VERSION = "version"; private static final String LEXICAL_HANDLER_PROPERTY = "http://xml.org/sax/properties/lexical-handler"; private static final String JSP_URI = "http://java.sun.com/JSP/Page"; diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java b/java/org/apache/jasper/compiler/JspRuntimeContext.java index 797559e6c..d5c13c938 100644 --- a/java/org/apache/jasper/compiler/JspRuntimeContext.java +++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java @@ -376,7 +376,7 @@ public final class JspRuntimeContext { codeBase = codeBase + File.separator; } File contextDir = new File(codeBase); - URL url = contextDir.getCanonicalFile().toURL(); + URL url = contextDir.getCanonicalFile().toURI().toURL(); codeSource = new CodeSource(url,(Certificate[])null); permissionCollection = policy.getPermissions(codeSource); @@ -408,34 +408,32 @@ public final class JspRuntimeContext { permissionCollection.add( new RuntimePermission( "accessClassInPackage.org.apache.jasper.runtime") ); - if (parentClassLoader instanceof URLClassLoader) { - URL [] urls = parentClassLoader.getURLs(); - String jarUrl = null; - String jndiUrl = null; - for (int i=0; i list = elem.findChildren(); while (list.hasNext()) { @@ -555,9 +555,8 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { } else { methodSignature = "java.lang.Object method()"; } - } else if ("description".equals(tname) || // Ignored elements - false) { - ; + } else if ("description".equals(tname) || false) { + // Ignored elements } else { if (log.isWarnEnabled()) { log.warn(Localizer.getMessage( diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java index c37a89a08..c8168e510 100644 --- a/java/org/apache/jasper/compiler/Validator.java +++ b/java/org/apache/jasper/compiler/Validator.java @@ -36,7 +36,6 @@ import javax.servlet.jsp.tagext.TagLibraryInfo; import javax.servlet.jsp.tagext.ValidationMessage; import org.apache.el.lang.ELSupport; -import org.apache.jasper.Constants; import org.apache.jasper.JasperException; import org.apache.jasper.el.ELContextImpl; import org.xml.sax.Attributes;