You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mr...@apache.org on 2011/12/30 16:14:36 UTC

svn commit: r1225842 - /xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/

Author: mrglavas
Date: Fri Dec 30 15:14:35 2011
New Revision: 1225842

URL: http://svn.apache.org/viewvc?rev=1225842&view=rev
Log:
Clean-up imports.

Modified:
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/CallTemplate.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Choose.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/FilterExpr.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Import.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Include.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Key.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/KeyCall.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Number.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Sort.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Template.java
    xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/XslElement.java

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/CallTemplate.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/CallTemplate.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/CallTemplate.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/CallTemplate.java Fri Dec 30 15:14:35 2011
@@ -21,12 +21,11 @@
 
 package org.apache.xalan.xsltc.compiler;
 
-import org.apache.bcel.generic.ALOAD;
-import org.apache.bcel.generic.ASTORE;
+import java.util.Vector;
+
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
 import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
 import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
@@ -35,8 +34,6 @@ import org.apache.xalan.xsltc.compiler.u
 import org.apache.xalan.xsltc.compiler.util.Util;
 import org.apache.xml.utils.XML11Char;
 
-import java.util.Vector;
-
 /**
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Choose.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Choose.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Choose.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Choose.java Fri Dec 30 15:14:35 2011
@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Vector;
 
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.GOTO;

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/DocumentCall.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/DocumentCall.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/DocumentCall.java Fri Dec 30 15:14:35 2011
@@ -25,7 +25,6 @@ import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GETFIELD;
-import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/FilterExpr.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/FilterExpr.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/FilterExpr.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/FilterExpr.java Fri Dec 30 15:14:35 2011
@@ -27,11 +27,9 @@ import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.ILOAD;
-import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.INVOKESPECIAL;
-import org.apache.bcel.generic.INVOKESTATIC;
-import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
 import org.apache.xalan.xsltc.compiler.util.ClassGenerator;

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java Fri Dec 30 15:14:35 2011
@@ -24,7 +24,6 @@ package org.apache.xalan.xsltc.compiler;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GOTO;
 import org.apache.bcel.generic.IFNE;
-import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.PUSH;

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Import.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Import.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Import.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Import.java Fri Dec 30 15:14:35 2011
@@ -21,18 +21,14 @@
 
 package org.apache.xalan.xsltc.compiler;
 
-import java.io.File;
-import java.net.URL;
-import java.net.MalformedURLException;
 import java.util.Enumeration;
 
-import org.apache.xml.utils.SystemIDResolver;
 import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
 import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
 import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 import org.apache.xalan.xsltc.compiler.util.Type;
 import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-
+import org.apache.xml.utils.SystemIDResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Include.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Include.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Include.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Include.java Fri Dec 30 15:14:35 2011
@@ -21,19 +21,14 @@
 
 package org.apache.xalan.xsltc.compiler;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.Enumeration;
 
-import org.apache.xml.utils.SystemIDResolver;
 import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
 import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
 import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 import org.apache.xalan.xsltc.compiler.util.Type;
 import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-
+import org.apache.xml.utils.SystemIDResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Key.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Key.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Key.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Key.java Fri Dec 30 15:14:35 2011
@@ -21,8 +21,6 @@
 
 package org.apache.xalan.xsltc.compiler;
 
-import java.util.Vector;
-
 import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GOTO;

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/KeyCall.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/KeyCall.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/KeyCall.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/KeyCall.java Fri Dec 30 15:14:35 2011
@@ -23,26 +23,15 @@ package org.apache.xalan.xsltc.compiler;
 
 import java.util.Vector;
 
-import org.apache.bcel.generic.ALOAD;
-import org.apache.bcel.generic.ASTORE;
-import org.apache.bcel.generic.BranchHandle;
 import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.GOTO;
-import org.apache.bcel.generic.IFGT;
-import org.apache.bcel.generic.INVOKEINTERFACE;
-import org.apache.bcel.generic.INVOKESPECIAL;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
-import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.bcel.generic.LocalVariableGen;
-import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;
 import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
 import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 import org.apache.xalan.xsltc.compiler.util.StringType;
 import org.apache.xalan.xsltc.compiler.util.Type;
 import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.compiler.util.Util;
 
 /**
  * @author Morten Jorgensen

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Number.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Number.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Number.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Number.java Fri Dec 30 15:14:35 2011
@@ -36,7 +36,6 @@ import org.apache.bcel.generic.INVOKESPE
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionList;
-import org.apache.bcel.generic.D2I;
 import org.apache.bcel.generic.LocalVariableGen;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.PUSH;

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Sort.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Sort.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Sort.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Sort.java Fri Dec 30 15:14:35 2011
@@ -21,26 +21,19 @@
 
 package org.apache.xalan.xsltc.compiler;
 
-import java.text.Collator;
 import java.util.ArrayList;
-import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
 import java.util.Vector;
 
 import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.Method;
 import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ANEWARRAY;
 import org.apache.bcel.generic.ASTORE;
 import org.apache.bcel.generic.CHECKCAST;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GETFIELD;
-import org.apache.bcel.generic.ICONST;
 import org.apache.bcel.generic.ILOAD;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.INVOKESPECIAL;
-import org.apache.bcel.generic.INVOKESTATIC;
-import org.apache.bcel.generic.INVOKEVIRTUAL;
 import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java Fri Dec 30 15:14:35 2011
@@ -35,19 +35,17 @@ import org.apache.bcel.generic.ICONST;
 import org.apache.bcel.generic.INVOKEINTERFACE;
 import org.apache.bcel.generic.INVOKESPECIAL;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
-import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.NEW;
 import org.apache.bcel.generic.NEWARRAY;
 import org.apache.bcel.generic.PUSH;
+import org.apache.xalan.xsltc.DOM;
 import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
 import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
 import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
 import org.apache.xalan.xsltc.compiler.util.Type;
 import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xalan.xsltc.DOM;
 import org.apache.xalan.xsltc.runtime.AttributeList;
-
 import org.xml.sax.Attributes;
 
 

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Template.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Template.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Template.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/Template.java Fri Dec 30 15:14:35 2011
@@ -25,7 +25,6 @@ import java.util.Vector;
 
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.INVOKEVIRTUAL;
-import org.apache.bcel.generic.InstructionHandle;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
 import org.apache.xalan.xsltc.compiler.util.ErrorMsg;

Modified: xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/XslElement.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/XslElement.java?rev=1225842&r1=1225841&r2=1225842&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/XslElement.java (original)
+++ xalan/java/trunk/src/org/apache/xalan/xsltc/compiler/XslElement.java Fri Dec 30 15:14:35 2011
@@ -25,7 +25,6 @@ import org.apache.bcel.generic.ALOAD;
 import org.apache.bcel.generic.ASTORE;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.GETSTATIC;
-import org.apache.bcel.generic.ICONST;
 import org.apache.bcel.generic.INVOKESTATIC;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.LocalVariableGen;



---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org