From: markt Date: Mon, 15 Jun 2009 13:04:18 +0000 (+0000) Subject: Remove unused, deprecated code in Jasper X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=df1d06e09022f8dfcf073253b025ad40f98b794d;p=tomcat7.0 Remove unused, deprecated code in Jasper git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@784764 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/jasper/compiler/JspDocumentParser.java b/java/org/apache/jasper/compiler/JspDocumentParser.java index 686d6b5df..3cd6fbb77 100644 --- a/java/org/apache/jasper/compiler/JspDocumentParser.java +++ b/java/org/apache/jasper/compiler/JspDocumentParser.java @@ -356,8 +356,7 @@ class JspDocumentParser nonTaglibAttrs, nonTaglibXmlnsAttrs, taglibAttrs, - startMark, - current); + startMark); return; } @@ -370,8 +369,7 @@ class JspDocumentParser nonTaglibAttrs, nonTaglibXmlnsAttrs, taglibAttrs, - startMark, - current); + startMark); return; } @@ -398,8 +396,7 @@ class JspDocumentParser nonTaglibAttrs, nonTaglibXmlnsAttrs, taglibAttrs, - startMark, - current); + startMark); } else { node = parseCustomAction( @@ -815,8 +812,7 @@ class JspDocumentParser Attributes nonTaglibAttrs, Attributes nonTaglibXmlnsAttrs, Attributes taglibAttrs, - Mark start, - Node parent) + Mark start) throws SAXException { Node node = null; diff --git a/java/org/apache/jasper/compiler/JspUtil.java b/java/org/apache/jasper/compiler/JspUtil.java index e1ca665dd..ec30ffaca 100644 --- a/java/org/apache/jasper/compiler/JspUtil.java +++ b/java/org/apache/jasper/compiler/JspUtil.java @@ -817,27 +817,6 @@ public class JspUtil { * * @return Fully-qualified class name of the tag handler corresponding to * the given tag file path - * - * @deprecated Use {@link #getTagHandlerClassName(String, String, - * ErrorDispatcher) - * See https://issues.apache.org/bugzilla/show_bug.cgi?id=46471 - */ - public static String getTagHandlerClassName(String path, ErrorDispatcher err) - throws JasperException { - return getTagHandlerClassName(path, null, err); - } - - /** - * Gets the fully-qualified class name of the tag handler corresponding to - * the given tag file path. - * - * @param path - * Tag file path - * @param err - * Error dispatcher - * - * @return Fully-qualified class name of the tag handler corresponding to - * the given tag file path */ public static String getTagHandlerClassName(String path, String urn, ErrorDispatcher err) throws JasperException { diff --git a/java/org/apache/jasper/compiler/ParserController.java b/java/org/apache/jasper/compiler/ParserController.java index 999356f2e..d7f49d034 100644 --- a/java/org/apache/jasper/compiler/ParserController.java +++ b/java/org/apache/jasper/compiler/ParserController.java @@ -138,22 +138,6 @@ class ParserController implements TagConstants { } /** - * Extracts tag file directive information from the tag file with the - * given name. - * - * This is invoked by the compiler - * - * @param inFileName The name of the tag file to be parsed. - * @deprecated Use {@link #parseTagFileDirectives(String, URL)} - * See https://issues.apache.org/bugzilla/show_bug.cgi?id=46471 - */ - public Node.Nodes parseTagFileDirectives(String inFileName) - throws FileNotFoundException, JasperException, IOException { - return parseTagFileDirectives( - inFileName, ctxt.getTagFileJarUrl(inFileName)); - } - - /** * Extracts tag file directive information from the given tag file. * * This is invoked by the compiler diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java b/java/org/apache/jasper/compiler/TagFileProcessor.java index 9ddaa5034..d6fe1c748 100644 --- a/java/org/apache/jasper/compiler/TagFileProcessor.java +++ b/java/org/apache/jasper/compiler/TagFileProcessor.java @@ -501,33 +501,6 @@ class TagFileProcessor { * the tag name as specified in the TLD * @param tagfile * the path for the tagfile - * @param tagLibInfo - * the TagLibraryInfo object associated with this TagInfo - * @return a TagInfo object assembled from the directives in the tag file. - * @deprecated Use {@link TagFileProcessor#parseTagFileDirectives( - * ParserController, String, String, URL, TagLibraryInfo)} - * See https://issues.apache.org/bugzilla/show_bug.cgi?id=46471 - */ - public static TagInfo parseTagFileDirectives(ParserController pc, - String name, String path, TagLibraryInfo tagLibInfo) - throws JasperException { - return parseTagFileDirectives(pc, name, path, - pc.getJspCompilationContext().getTagFileJarUrl(path), - tagLibInfo); - } - - /** - * Parses the tag file, and collects information on the directives included - * in it. The method is used to obtain the info on the tag file, when the - * handler that it represents is referenced. The tag file is not compiled - * here. - * - * @param pc - * the current ParserController used in this compilation - * @param name - * the tag name as specified in the TLD - * @param tagfile - * the path for the tagfile * @param tagFileJarUrl * the url for the Jar containign the tag file * @param tagLibInfo diff --git a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java index a40aa8b42..faad83816 100644 --- a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java +++ b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java @@ -160,7 +160,7 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { err.jspError("jsp.error.file.not.found", location[0]); } - parseTLD(ctxt, location[0], in, null); + parseTLD(location[0], in, null); // Add TLD to dependency list PageInfo pageInfo = ctxt.createCompiler().getPageInfo(); if (pageInfo != null) { @@ -177,7 +177,7 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { jarFile = conn.getJarFile(); ZipEntry jarEntry = jarFile.getEntry(location[1]); in = jarFile.getInputStream(jarEntry); - parseTLD(ctxt, location[0], in, jarFileUrl); + parseTLD(location[0], in, jarFileUrl); } catch (Exception ex) { err.jspError("jsp.error.tld.unable_to_read", location[0], location[1], ex.toString()); @@ -210,8 +210,8 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { * in The TLD's input stream @param jarFileUrl The JAR file containing the * TLD, or null if the tag library is not packaged in a JAR */ - private void parseTLD(JspCompilationContext ctxt, String uri, - InputStream in, URL jarFileUrl) throws JasperException { + private void parseTLD(String uri, InputStream in, URL jarFileUrl) + throws JasperException { Vector tagVector = new Vector(); Vector tagFileVector = new Vector(); Hashtable functionTable = new Hashtable(); @@ -249,7 +249,7 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { else if ("tag".equals(tname)) tagVector.addElement(createTagInfo(element, jspversion)); else if ("tag-file".equals(tname)) { - TagFileInfo tagFileInfo = createTagFileInfo(element, uri, + TagFileInfo tagFileInfo = createTagFileInfo(element, jarFileUrl); tagFileVector.addElement(tagFileInfo); } else if ("function".equals(tname)) { // JSP2.0 @@ -446,8 +446,8 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { * * @return TagInfo correspoding to tag file directives */ - private TagFileInfo createTagFileInfo(TreeNode elem, String uri, - URL jarFileUrl) throws JasperException { + private TagFileInfo createTagFileInfo(TreeNode elem, URL jarFileUrl) + throws JasperException { String name = null; String path = null;