Author: markt
Date: Thu May 20 11:06:33 2010
New Revision: 946591
URL: http://svn.apache.org/viewvc?rev=946591&view=rev
Log:
Remove unused code identified by Eclipse
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=946591&r1=946590&r2=946591&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Thu May 20
11:06:33 2010
@@ -18,7 +18,6 @@ package org.apache.jasper.compiler;
import java.io.CharArrayWriter;
import java.io.FileNotFoundException;
-import java.net.URL;
import java.util.Iterator;
import java.util.List;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=946591&r1=946590&r2=946591&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Thu May
20 11:06:33 2010
@@ -20,8 +20,6 @@ package org.apache.jasper.compiler;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.net.JarURLConnection;
-import java.net.URL;
import java.util.Stack;
import java.util.jar.JarFile;
@@ -606,18 +604,4 @@ class ParserController implements TagCon
return false;
}
-
- private JarFile getJarFile(URL jarFileUrl) throws IOException {
- JarFile jarFile = null;
-
- if (jarFileUrl != null) {
- JarURLConnection conn = (JarURLConnection)
jarFileUrl.openConnection();
- conn.setUseCaches(false);
- conn.connect();
- jarFile = conn.getJarFile();
- }
-
- return jarFile;
- }
-
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=946591&r1=946590&r2=946591&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Thu May 20
11:06:33 2010
@@ -192,39 +192,6 @@ public class SmapUtil {
int sdeIndex;
- public static void main(String[] args) throws IOException {
- if (args.length == 2) {
- install(new File(args[0]), new File(args[1]));
- } else if (args.length == 3) {
- install(
- new File(args[0]),
- new File(args[1]),
- new File(args[2]));
- } else {
- System.err.println(
- "Usage: <command> <input class file> "
- + "<attribute file> <output class file name>\n"
- + "<command> <input/output class file> <attribute
file>");
- }
- }
-
- static void install(File inClassFile, File attrFile, File outClassFile)
- throws IOException {
- new SDEInstaller(inClassFile, attrFile, outClassFile);
- }
-
- static void install(File inOutClassFile, File attrFile)
- throws IOException {
- File tmpFile = new File(inOutClassFile.getPath() + "tmp");
- new SDEInstaller(inOutClassFile, attrFile, tmpFile);
- if (!inOutClassFile.delete()) {
- throw new IOException("inOutClassFile.delete() failed");
- }
- if (!tmpFile.renameTo(inOutClassFile)) {
- throw new IOException("tmpFile.renameTo(inOutClassFile)
failed");
- }
- }
-
static void install(File classFile, byte[] smap) throws IOException {
File tmpFile = new File(classFile.getPath() + "tmp");
new SDEInstaller(classFile, smap, tmpFile);
@@ -256,11 +223,6 @@ public class SmapUtil {
outStream.close();
}
- SDEInstaller(File inClassFile, File attrFile, File outClassFile)
- throws IOException {
- this(inClassFile, readWhole(attrFile), outClassFile);
- }
-
static byte[] readWhole(File input) throws IOException {
FileInputStream inStream = new FileInputStream(input);
int len = (int)input.length();
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=946591&r1=946590&r2=946591&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Thu May
20 11:06:33 2010
@@ -19,8 +19,6 @@ package org.apache.jasper.compiler;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.Iterator;
import java.util.Vector;
import java.util.HashMap;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=946591&r1=946590&r2=946591&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Thu
May 20 11:06:33 2010
@@ -23,7 +23,6 @@ import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.net.JarURLConnection;
import java.net.URL;
import java.util.Collection;
import java.util.Enumeration;
@@ -31,8 +30,6 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
import java.util.Vector;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
import javax.servlet.jsp.tagext.FunctionInfo;
import javax.servlet.jsp.tagext.PageData;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
