mkwan 2003/01/30 10:42:11
Modified: java/src/org/apache/xalan/client Tag: XSLTC_DTM
XSLTProcessorApplet.java
java/src/org/apache/xalan/extensions Tag: XSLTC_DTM
ExpressionContext.java ExpressionVisitor.java
ExtensionHandler.java
ExtensionHandlerExsltFunction.java
ExtensionHandlerGeneral.java
ExtensionHandlerJavaClass.java
ExtensionHandlerJavaPackage.java
ExtensionNamespaceSupport.java
ExtensionNamespacesManager.java
ExtensionsTable.java MethodResolver.java
XSLProcessorContext.java
java/src/org/apache/xalan/lib Tag: XSLTC_DTM ExsltBase.java
ExsltCommon.java ExsltDatetime.java
ExsltDynamic.java ExsltMath.java ExsltSets.java
ExsltStrings.java Extensions.java NodeInfo.java
PipeDocument.java Redirect.java
java/src/org/apache/xalan/lib/sql Tag: XSLTC_DTM
ConnectionPool.java ConnectionPoolManager.java
DTMDocument.java DefaultConnectionPool.java
PooledConnection.java SQLDocument.java
SQLErrorDocument.java XConnection.java
java/src/org/apache/xalan/processor Tag: XSLTC_DTM
ProcessorAttributeSet.java ProcessorCharacters.java
ProcessorDecimalFormat.java
ProcessorExsltFuncResult.java
ProcessorExsltFunction.java
ProcessorGlobalParamDecl.java
ProcessorGlobalVariableDecl.java
ProcessorImport.java ProcessorInclude.java
ProcessorKey.java ProcessorLRE.java
ProcessorNamespaceAlias.java
ProcessorOutputElem.java
ProcessorPreserveSpace.java
ProcessorStripSpace.java
ProcessorStylesheetElement.java
ProcessorTemplate.java ProcessorTemplateElem.java
ProcessorText.java ProcessorUnknown.java
StylesheetHandler.java StylesheetPIHandler.java
TransformerFactoryImpl.java
WhitespaceInfoPaths.java XSLTAttributeDef.java
XSLTElementDef.java XSLTElementProcessor.java
XSLTSchema.java
java/src/org/apache/xalan/res Tag: XSLTC_DTM
XSLMessages.java XSLTErrorResources.java
XSLTErrorResources_de.java
XSLTErrorResources_es.java
XSLTErrorResources_fr.java
XSLTErrorResources_it.java
XSLTErrorResources_ja.java
XSLTErrorResources_ko.java
XSLTErrorResources_sv.java
XSLTErrorResources_zh_CN.java
XSLTErrorResources_zh_TW.java
java/src/org/apache/xalan/serialize Tag: XSLTC_DTM
CharInfo.java Encodings.java Serializer.java
SerializerFactory.java SerializerToHTML.java
SerializerToText.java SerializerToXML.java
WriterToASCI.java WriterToUTF8.java
WriterToUTF8Buffered.java
java/src/org/apache/xalan/templates Tag: XSLTC_DTM AVT.java
AVTPart.java AVTPartSimple.java AVTPartXPath.java
Constants.java DecimalFormatProperties.java
ElemApplyImport.java ElemApplyTemplates.java
ElemAttribute.java ElemAttributeSet.java
ElemCallTemplate.java ElemChoose.java
ElemComment.java ElemCopy.java ElemCopyOf.java
ElemElement.java ElemEmpty.java
ElemExsltFuncResult.java ElemExsltFunction.java
ElemExtensionCall.java ElemExtensionDecl.java
ElemFallback.java ElemForEach.java ElemIf.java
ElemLiteralResult.java ElemMessage.java
ElemNumber.java ElemOtherwise.java ElemPI.java
ElemParam.java ElemSort.java ElemTemplate.java
ElemTemplateElement.java ElemText.java
ElemTextLiteral.java ElemUnknown.java ElemUse.java
ElemValueOf.java ElemVariable.java
ElemVariablePsuedo.java ElemWhen.java
ElemWithParam.java FuncDocument.java
FuncFormatNumb.java FuncKey.java
KeyDeclaration.java OutputProperties.java
RedundentExprEliminator.java Stylesheet.java
StylesheetComposed.java StylesheetRoot.java
TemplateList.java
TemplateSubPatternAssociation.java XSLTVisitor.java
XUnresolvedVariable.java
XUnresolvedVariableSimple.java
java/src/org/apache/xalan/trace Tag: XSLTC_DTM
EndSelectionEvent.java GenerateEvent.java
PrintTraceListener.java SelectionEvent.java
TraceListener.java TraceManager.java
TracerEvent.java
java/src/org/apache/xalan/transformer Tag: XSLTC_DTM
ClonerToResultTree.java Counter.java
CountersTable.java KeyIterator.java KeyManager.java
KeyRefIterator.java KeyTable.java MsgMgr.java
NodeSortKey.java NodeSorter.java
NumeratorFormatter.java QueuedEvents.java
ResultTreeHandler.java SerializerSwitcher.java
StackGuard.java TrAXFilter.java
TransformSnapshotImpl.java TransformState.java
TransformerHandlerImpl.java
TransformerIdentityImpl.java TransformerImpl.java
TreeWalker2Result.java
java/src/org/apache/xalan/xslt Tag: XSLTC_DTM
EnvironmentCheck.java Process.java
java/src/org/apache/xalan/xsltc Tag: XSLTC_DTM DOM.java
DOMCache.java StripFilter.java Translet.java
TransletOutputHandler.java
java/src/org/apache/xalan/xsltc/cmdline Tag: XSLTC_DTM
Compile.java Transform.java
java/src/org/apache/xalan/xsltc/cmdline/getopt Tag:
XSLTC_DTM GetOpt.java IllegalArgumentException.java
MissingOptArgException.java
java/src/org/apache/xalan/xsltc/compiler Tag: XSLTC_DTM
AbsoluteLocationPath.java AbsolutePathPattern.java
AlternativePattern.java AncestorPattern.java
ApplyImports.java ApplyTemplates.java
Attribute.java AttributeSet.java
AttributeValue.java AttributeValueTemplate.java
BinOpExpr.java BooleanCall.java BooleanExpr.java
CallTemplate.java CastExpr.java CeilingCall.java
Choose.java Comment.java ConcatCall.java
ContainsCall.java Copy.java CopyOf.java
CurrentCall.java DecimalFormatting.java
DocumentCall.java ElementAvailableCall.java
EqualityExpr.java Expression.java Fallback.java
FilterExpr.java FilterParentPath.java
FilteredAbsoluteLocationPath.java FloorCall.java
FlowList.java ForEach.java FormatNumberCall.java
ForwardPositionExpr.java FunctionAvailableCall.java
FunctionCall.java GenerateIdCall.java
IdKeyPattern.java IdPattern.java If.java
Import.java Include.java Instruction.java
IntExpr.java Key.java KeyCall.java LangCall.java
LastCall.java LiteralAttribute.java
LiteralElement.java LiteralExpr.java
LocalNameCall.java LocationPathPattern.java
LogicalExpr.java Message.java Mode.java
NameBase.java NameCall.java NamespaceAlias.java
NamespaceUriCall.java NodeTest.java NotCall.java
Number.java NumberCall.java Otherwise.java
Output.java Param.java ParameterRef.java
ParentLocationPath.java ParentPattern.java
Parser.java Pattern.java PositionCall.java
Predicate.java ProcessingInstruction.java
ProcessingInstructionPattern.java RealExpr.java
RelationalExpr.java RoundCall.java
SimpleAttributeValue.java Sort.java
StartsWithCall.java Step.java StepPattern.java
StringCall.java StringLengthCall.java
Stylesheet.java SymbolTable.java
SyntaxTreeNode.java Template.java TestSeq.java
Text.java TopLevelElement.java TransletOutput.java
UnaryOpExpr.java UnionPathExpr.java
UnparsedEntityUriCall.java UnresolvedRef.java
UnsupportedElement.java UseAttributeSets.java
ValueOf.java Variable.java VariableBase.java
VariableRef.java VariableRefBase.java When.java
Whitespace.java WithParam.java XSLTC.java
XslAttribute.java XslElement.java
java/src/org/apache/xalan/xsltc/compiler/util Tag: XSLTC_DTM
AttributeSetMethodGenerator.java BooleanType.java
ClassGenerator.java CompareGenerator.java
ErrorMessages.java ErrorMessages_no.java
ErrorMsg.java FilterGenerator.java IntType.java
MatchGenerator.java MethodGenerator.java
MultiHashtable.java NamedMethodGenerator.java
NodeCounterGenerator.java NodeSetType.java
NodeSortRecordFactGenerator.java
NodeSortRecordGenerator.java NodeType.java
NumberType.java ObjectType.java RealType.java
ReferenceType.java ResultTreeType.java
RtMethodGenerator.java SlotAllocator.java
StringType.java TestGenerator.java Type.java
Util.java VoidType.java
java/src/org/apache/xalan/xsltc/dom Tag: XSLTC_DTM
AbsoluteIterator.java AnyNodeCounter.java
BitArray.java CH2TOH.java
CurrentNodeListFilter.java
CurrentNodeListIterator.java DOMAdapter.java
DOMBuilder.java DOMImpl.java DOMWSFilter.java
DocumentCache.java DupFilterIterator.java
ExtendedSAX.java FilterIterator.java
FilteredStepIterator.java
ForwardPositionIterator.java KeyIndex.java
LoadDocument.java MatchingIterator.java
MultiDOM.java MultipleNodeCounter.java
NodeCounter.java NodeSortRecord.java
NthIterator.java SingleNodeCounter.java
SingletonIterator.java SortingIterator.java
StepIterator.java UnionIterator.java
XSLTCDTMManager.java
java/src/org/apache/xalan/xsltc/runtime Tag: XSLTC_DTM
AbstractTranslet.java AttributeList.java
Attributes.java BasisLibrary.java Constants.java
DefaultSAXOutputHandler.java ErrorMessages.java
ErrorMessages_no.java Hashtable.java
SAXAdapter.java StringValueHandler.java
TextOutput.java TransletLoader.java
TransletOutputBase.java
java/src/org/apache/xalan/xsltc/runtime/output Tag:
XSLTC_DTM OutputBase.java SAXHTMLOutput.java
SAXOutput.java SAXTextOutput.java SAXXMLOutput.java
StreamHTMLOutput.java StreamOutput.java
StreamTextOutput.java StreamUnknownOutput.java
StreamXMLOutput.java StringOutputBuffer.java
TransletOutputHandlerFactory.java
WriterOutputBuffer.java
java/src/org/apache/xalan/xsltc/trax Tag: XSLTC_DTM
DOM2SAX.java DOM2TO.java OutputSettings.java
SAX2DOM.java SAX2TO.java
SmartTransformerFactoryImpl.java
TemplatesHandlerImpl.java TemplatesImpl.java
TrAXFilter.java TransformerFactoryImpl.java
TransformerHandlerImpl.java TransformerImpl.java
Util.java XSLTCSource.java
java/src/org/apache/xml/dtm Tag: XSLTC_DTM DTM.java
DTMException.java DTMManager.java
FactoryFinder.java SecuritySupport.java
SecuritySupport12.java
java/src/org/apache/xml/dtm/ref Tag: XSLTC_DTM
ChunkedIntArray.java CoroutineManager.java
CoroutineParser.java CustomStringPool.java
DTMAxisIterNodeList.java DTMAxisIteratorBase.java
DTMChildIterNodeList.java DTMDocumentImpl.java
DTMManagerDefault.java DTMNamedNodeMap.java
DTMNodeIterator.java DTMNodeList.java
DTMNodeListBase.java DTMNodeProxy.java
DTMSafeStringPool.java DTMStringPool.java
DTMTreeWalker.java ExpandedNameTable.java
IncrementalSAXSource.java
IncrementalSAXSource_Filter.java
IncrementalSAXSource_Xerces.java
java/src/org/apache/xml/dtm/ref/dom2dtm Tag: XSLTC_DTM
DOM2DTM.java
DOM2DTMdefaultNamespaceDeclarationNode.java
java/src/org/apache/xml/dtm/ref/sax2dtm Tag: XSLTC_DTM
SAX2RTFDTM.java
java/src/org/apache/xml/res Tag: XSLTC_DTM
XMLErrorResources.java XMLMessages.java
java/src/org/apache/xml/utils Tag: XSLTC_DTM AttList.java
BoolStack.java DOM2Helper.java DOMBuilder.java
DOMHelper.java DefaultErrorHandler.java
Hashtree2Node.java ListingErrorHandler.java
MutableAttrListImpl.java ObjectPool.java
PrefixResolverDefault.java QName.java
SAXSourceLocator.java SystemIDResolver.java
TreeWalker.java UnImplNode.java
java/src/org/apache/xml/utils/res Tag: XSLTC_DTM
XResourceBundle.java XResources_cy.java
XResources_de.java XResources_el.java
XResources_en.java XResources_es.java
XResources_fr.java XResources_he.java
XResources_hy.java XResources_it.java
XResources_ja_JP_A.java XResources_ja_JP_HA.java
XResources_ja_JP_HI.java XResources_ja_JP_I.java
XResources_ka.java XResources_ko.java
XResources_sv.java XResources_zh_CN.java
XResources_zh_TW.java
java/src/org/apache/xml/utils/synthetic Tag: XSLTC_DTM
Class.java TestDriver.java
java/src/org/apache/xml/utils/synthetic/reflection Tag:
XSLTC_DTM Constructor.java EntryPoint.java
Method.java
java/src/org/apache/xpath Tag: XSLTC_DTM CachedXPathAPI.java
Expression.java ExtensionsProvider.java
NodeSet.java NodeSetDTM.java SourceTree.java
SourceTreeManager.java VariableStack.java
WhitespaceStrippingElementMatcher.java XPath.java
XPathAPI.java XPathContext.java XPathException.java
XPathFactory.java XPathVisitor.java
java/src/org/apache/xpath/axes Tag: XSLTC_DTM
AttributeIterator.java AxesWalker.java
BasicTestIterator.java ChildIterator.java
ChildTestIterator.java DescendantIterator.java
FilterExprIterator.java
FilterExprIteratorSimple.java FilterExprWalker.java
IteratorPool.java LocPathIterator.java
MatchPatternIterator.java NodeSequence.java
OneStepIterator.java OneStepIteratorForward.java
PredicatedNodeTest.java RTFIterator.java
ReverseAxesWalker.java SelfIteratorNoPredicate.java
SingletonIterator.java SubContextList.java
UnionPathIterator.java WalkerFactory.java
WalkingIterator.java WalkingIteratorSorted.java
java/src/org/apache/xpath/compiler Tag: XSLTC_DTM
Compiler.java FuncLoader.java XPathDumper.java
XPathParser.java
java/src/org/apache/xpath/domapi Tag: XSLTC_DTM
XPathEvaluatorImpl.java XPathExpressionImpl.java
XPathNamespaceImpl.java XPathResultImpl.java
java/src/org/apache/xpath/functions Tag: XSLTC_DTM
FuncBoolean.java FuncCeiling.java FuncConcat.java
FuncContains.java FuncCount.java FuncCurrent.java
FuncDoclocation.java FuncExtElementAvailable.java
FuncExtFunction.java FuncExtFunctionAvailable.java
FuncFalse.java FuncFloor.java FuncGenerateId.java
FuncId.java FuncLang.java FuncLast.java
FuncLocalPart.java FuncNamespace.java
FuncNormalizeSpace.java FuncNot.java
FuncNumber.java FuncPosition.java FuncQname.java
FuncRound.java FuncStartsWith.java FuncString.java
FuncStringLength.java FuncSubstring.java
FuncSubstringAfter.java FuncSubstringBefore.java
FuncSum.java FuncSystemProperty.java
FuncTranslate.java FuncTrue.java
FuncUnparsedEntityURI.java Function.java
Function2Args.java Function3Args.java
FunctionDef1Arg.java FunctionMultiArgs.java
FunctionOneArg.java
java/src/org/apache/xpath/objects Tag: XSLTC_DTM
XBoolean.java XBooleanStatic.java
XMLStringFactoryImpl.java XNodeSet.java
XNodeSetForDOM.java XNull.java XNumber.java
XObject.java XObjectFactory.java XRTreeFrag.java
XRTreeFragSelectWrapper.java XString.java
XStringForChars.java XStringForFSB.java
java/src/org/apache/xpath/operations Tag: XSLTC_DTM And.java
Bool.java Div.java Equals.java Gt.java Gte.java
Lt.java Lte.java Minus.java Mod.java Mult.java
Neg.java NotEquals.java Number.java Operation.java
Or.java Plus.java Quo.java UnaryOperation.java
Variable.java VariableSafeAbsRef.java
java/src/org/apache/xpath/patterns Tag: XSLTC_DTM
ContextMatchStepPattern.java FunctionPattern.java
NodeTest.java StepPattern.java UnionPattern.java
java/src/org/apache/xpath/res Tag: XSLTC_DTM
XPATHErrorResources.java
XPATHErrorResources_de.java
XPATHErrorResources_es.java
XPATHErrorResources_fr.java
XPATHErrorResources_it.java
XPATHErrorResources_ja.java
XPATHErrorResources_ko.java
XPATHErrorResources_sv.java
XPATHErrorResources_zh_CN.java
XPATHErrorResources_zh_TW.java XPATHMessages.java
Log:
Patch from Sarah Mcnamara ([EMAIL PROTECTED]) to remove
unused imports in java source.
Revision Changes Path
No revision
No revision
1.16.16.2 +10 -21
xml-xalan/java/src/org/apache/xalan/client/XSLTProcessorApplet.java
Index: XSLTProcessorApplet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/client/XSLTProcessorApplet.java,v
retrieving revision 1.16.16.1
retrieving revision 1.16.16.2
diff -u -r1.16.16.1 -r1.16.16.2
--- XSLTProcessorApplet.java 27 Jan 2003 19:43:42 -0000 1.16.16.1
+++ XSLTProcessorApplet.java 30 Jan 2003 18:41:18 -0000 1.16.16.2
@@ -57,35 +57,24 @@
package org.apache.xalan.client;
import java.applet.Applet;
-
import java.awt.Graphics;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-
+import java.io.IOException;
import java.io.PrintWriter;
-import java.io.StringWriter;
import java.io.StringReader;
-import java.io.IOException;
-import java.io.InputStream;
-
-import java.util.Properties;
-
-// Needed Xalan classes
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
-// Needed TRaX classes
-import javax.xml.transform.Result;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
-import javax.xml.transform.Templates;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
/**
* <meta name="usage" content="general"/>
No revision
No revision
1.3.10.4 +4 -3
xml-xalan/java/src/org/apache/xalan/extensions/ExpressionContext.java
Index: ExpressionContext.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExpressionContext.java,v
retrieving revision 1.3.10.3
retrieving revision 1.3.10.4
diff -u -r1.3.10.3 -r1.3.10.4
--- ExpressionContext.java 27 Jan 2003 19:43:42 -0000 1.3.10.3
+++ ExpressionContext.java 30 Jan 2003 18:41:19 -0000 1.3.10.4
@@ -56,10 +56,11 @@
*/
package org.apache.xalan.extensions;
-import org.w3c.dom.traversal.NodeIterator;
-import org.w3c.dom.Node;
-import org.apache.xpath.objects.XObject;
import javax.xml.transform.ErrorListener;
+
+import org.apache.xpath.objects.XObject;
+import org.w3c.dom.Node;
+import org.w3c.dom.traversal.NodeIterator;
/**
* An object that implements this interface can supply
1.2.8.2 +3 -3
xml-xalan/java/src/org/apache/xalan/extensions/ExpressionVisitor.java
Index: ExpressionVisitor.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExpressionVisitor.java,v
retrieving revision 1.2.8.1
retrieving revision 1.2.8.2
diff -u -r1.2.8.1 -r1.2.8.2
--- ExpressionVisitor.java 27 Jan 2003 19:43:42 -0000 1.2.8.1
+++ ExpressionVisitor.java 30 Jan 2003 18:41:19 -0000 1.2.8.2
@@ -56,11 +56,11 @@
*/
package org.apache.xalan.extensions;
-import org.apache.xpath.XPathVisitor;
+import org.apache.xalan.templates.StylesheetRoot;
import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.functions.Function;
+import org.apache.xpath.XPathVisitor;
import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xalan.templates.StylesheetRoot;
+import org.apache.xpath.functions.Function;
/**
* When [EMAIL PROTECTED] org.apache.xalan.templates.StylesheetHandler}
creates
1.14.12.3 +4 -11
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandler.java
Index: ExtensionHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandler.java,v
retrieving revision 1.14.12.2
retrieving revision 1.14.12.3
diff -u -r1.14.12.2 -r1.14.12.3
--- ExtensionHandler.java 27 Jan 2003 19:43:42 -0000 1.14.12.2
+++ ExtensionHandler.java 30 Jan 2003 18:41:19 -0000 1.14.12.3
@@ -56,23 +56,16 @@
*/
package org.apache.xalan.extensions;
-import java.util.Vector;
-import java.lang.reflect.Method;
-
import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Vector;
import javax.xml.transform.TransformerException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.functions.FuncExtFunction;
-
-// Temp??
+import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xpath.functions.FuncExtFunction;
/**
* <meta name="usage" content="internal"/>
1.3.2.2 +9 -20
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java
Index: ExtensionHandlerExsltFunction.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- ExtensionHandlerExsltFunction.java 27 Jan 2003 19:43:43 -0000
1.3.2.1
+++ ExtensionHandlerExsltFunction.java 30 Jan 2003 18:41:19 -0000
1.3.2.2
@@ -56,36 +56,25 @@
*/
package org.apache.xalan.extensions;
-import java.util.Vector;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.io.IOException;
+import java.util.Vector;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-
-import org.apache.xalan.transformer.TransformerImpl;
+import javax.xml.transform.TransformerException;
+import org.apache.xalan.templates.Constants;
+import org.apache.xalan.templates.ElemExsltFuncResult;
+import org.apache.xalan.templates.ElemExsltFunction;
+import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemExsltFunction;
-import org.apache.xalan.templates.ElemExsltFuncResult;
-import org.apache.xalan.templates.Constants;
-
+import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xml.utils.QName;
-
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.VariableStack;
import org.apache.xpath.ExpressionNode;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.functions.FuncExtFunction;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
-import org.apache.xpath.functions.FuncExtFunction;
-
-import javax.xml.transform.TransformerException;
/**
* Execute EXSLT functions, determine the availability of EXSLT functions,
and the
1.15.10.3 +13 -25
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java
Index: ExtensionHandlerGeneral.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java,v
retrieving revision 1.15.10.2
retrieving revision 1.15.10.3
diff -u -r1.15.10.2 -r1.15.10.3
--- ExtensionHandlerGeneral.java 27 Jan 2003 19:43:43 -0000
1.15.10.2
+++ ExtensionHandlerGeneral.java 30 Jan 2003 18:41:19 -0000
1.15.10.3
@@ -56,40 +56,28 @@
*/
package org.apache.xalan.extensions;
-import java.util.Hashtable;
-import java.util.Vector;
-
import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLConnection;
-import java.io.InputStream;
+import java.util.Hashtable;
+import java.util.Vector;
-//import org.w3c.dom.Element;
-//import org.w3c.dom.Node;
-import org.apache.xml.dtm.DTM;
+import javax.xml.transform.TransformerException;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.SystemIDResolver;
-
-import javax.xml.transform.TransformerException;
-
-// Temp??
+import org.apache.xalan.templates.ElemTemplateElement;
+import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xpath.XPathProcessorException;
-import org.apache.xml.utils.StringVector;
-
-import java.lang.reflect.Method;
-
-import org.apache.xml.dtm.ref.DTMNodeIterator;
-import org.apache.xml.dtm.ref.DTMNodeList;
import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.dtm.ref.DTMNodeList;
+import org.apache.xml.utils.StringVector;
+import org.apache.xml.utils.SystemIDResolver;
+import org.apache.xpath.XPathProcessorException;
+import org.apache.xpath.functions.FuncExtFunction;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="internal"/>
1.10.12.6 +9 -12
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java
Index: ExtensionHandlerJavaClass.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java,v
retrieving revision 1.10.12.5
retrieving revision 1.10.12.6
diff -u -r1.10.12.5 -r1.10.12.6
--- ExtensionHandlerJavaClass.java 27 Jan 2003 19:43:43 -0000
1.10.12.5
+++ ExtensionHandlerJavaClass.java 30 Jan 2003 18:41:19 -0000
1.10.12.6
@@ -57,23 +57,20 @@
package org.apache.xalan.extensions;
-import java.util.Vector;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.io.IOException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Vector;
-//import org.w3c.dom.Element;
-//import org.w3c.dom.Node;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xml.utils.QName;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.objects.XObject;
+import org.apache.xalan.templates.ElemTemplateElement;
+import org.apache.xalan.templates.Stylesheet;
+import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xpath.functions.FuncExtFunction;
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="internal"/>
1.11.10.5 +9 -16
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java
Index: ExtensionHandlerJavaPackage.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java,v
retrieving revision 1.11.10.4
retrieving revision 1.11.10.5
diff -u -r1.11.10.4 -r1.11.10.5
--- ExtensionHandlerJavaPackage.java 27 Jan 2003 19:43:43 -0000
1.11.10.4
+++ ExtensionHandlerJavaPackage.java 30 Jan 2003 18:41:19 -0000
1.11.10.5
@@ -56,29 +56,22 @@
*/
package org.apache.xalan.extensions;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.io.IOException;
-
-//import org.w3c.dom.Element;
-//import org.w3c.dom.Node;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Vector;
-import org.apache.xml.dtm.DTM;
+import javax.xml.transform.TransformerException;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.utils.QName;
-
-import org.apache.xpath.objects.XObject;
+import org.apache.xalan.templates.ElemTemplateElement;
+import org.apache.xalan.templates.Stylesheet;
+import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xpath.functions.FuncExtFunction;
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="internal"/>
1.3.8.2 +1 -0
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionNamespaceSupport.java
Index: ExtensionNamespaceSupport.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionNamespaceSupport.java,v
retrieving revision 1.3.8.1
retrieving revision 1.3.8.2
diff -u -r1.3.8.1 -r1.3.8.2
--- ExtensionNamespaceSupport.java 27 Jan 2003 19:43:43 -0000 1.3.8.1
+++ ExtensionNamespaceSupport.java 30 Jan 2003 18:41:19 -0000 1.3.8.2
@@ -57,6 +57,7 @@
package org.apache.xalan.extensions;
import java.lang.reflect.Constructor;
+
import javax.xml.transform.TransformerException;
/**
1.4.4.2 +2 -1
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionNamespacesManager.java
Index: ExtensionNamespacesManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionNamespacesManager.java,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -r1.4.4.1 -r1.4.4.2
--- ExtensionNamespacesManager.java 27 Jan 2003 19:43:43 -0000 1.4.4.1
+++ ExtensionNamespacesManager.java 30 Jan 2003 18:41:19 -0000 1.4.4.2
@@ -56,8 +56,9 @@
*/
package org.apache.xalan.extensions;
-import org.apache.xalan.templates.Constants;
import java.util.Vector;
+
+import org.apache.xalan.templates.Constants;
/**
* Used during assembly of a stylesheet to collect the information for each
1.18.2.4 +2 -19
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionsTable.java
Index: ExtensionsTable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionsTable.java,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -r1.18.2.3 -r1.18.2.4
--- ExtensionsTable.java 27 Jan 2003 19:43:43 -0000 1.18.2.3
+++ ExtensionsTable.java 30 Jan 2003 18:41:19 -0000 1.18.2.4
@@ -58,29 +58,12 @@
import java.util.Hashtable;
import java.util.Vector;
-import org.apache.xml.utils.StringVector;
-
-import org.apache.xpath.objects.XNull;
-import org.apache.xpath.XPathProcessorException;
-import org.apache.xpath.functions.FuncExtFunction;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
-
-import org.apache.xalan.transformer.TransformerImpl;
-
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xalan.templates.TemplateList;
-
-import org.apache.xpath.XPathContext;
-
-import org.apache.xml.utils.QName;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import org.apache.xpath.XPathProcessorException;
+import org.apache.xpath.functions.FuncExtFunction;
/**
* <meta name="usage" content="internal"/>
1.27.2.3 +11 -14
xml-xalan/java/src/org/apache/xalan/extensions/MethodResolver.java
Index: MethodResolver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/MethodResolver.java,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -u -r1.27.2.2 -r1.27.2.3
--- MethodResolver.java 27 Jan 2003 19:43:43 -0000 1.27.2.2
+++ MethodResolver.java 30 Jan 2003 18:41:19 -0000 1.27.2.3
@@ -56,26 +56,23 @@
*/
package org.apache.xalan.extensions;
-import java.lang.reflect.Method;
import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.traversal.NodeIterator;
-
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.objects.XRTreeFrag;
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.DTMNodeIterator;
-import org.apache.xml.dtm.ref.DTMNodeList;
-import org.apache.xml.dtm.ref.DTMNodeProxy;
+import javax.xml.transform.TransformerException;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.dtm.ref.DTMNodeIterator;
+import org.apache.xpath.objects.XObject;
+import org.apache.xpath.objects.XRTreeFrag;
+import org.apache.xpath.objects.XString;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.traversal.NodeIterator;
/**
* Utility class to help resolve method overloading with Xalan XSLT
1.13.6.2 +15 -18
xml-xalan/java/src/org/apache/xalan/extensions/XSLProcessorContext.java
Index: XSLProcessorContext.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/XSLProcessorContext.java,v
retrieving revision 1.13.6.1
retrieving revision 1.13.6.2
diff -u -r1.13.6.1 -r1.13.6.2
--- XSLProcessorContext.java 27 Jan 2003 19:43:43 -0000 1.13.6.1
+++ XSLProcessorContext.java 30 Jan 2003 18:41:19 -0000 1.13.6.2
@@ -56,30 +56,27 @@
*/
package org.apache.xalan.extensions;
-import org.w3c.dom.Node;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.traversal.NodeIterator;
-import org.apache.xml.dtm.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.transformer.ResultTreeHandler;
-import org.apache.xalan.transformer.ClonerToResultTree;
import org.apache.xalan.templates.Stylesheet;
+import org.apache.xalan.transformer.ClonerToResultTree;
+import org.apache.xalan.transformer.ResultTreeHandler;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.utils.QName;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XRTreeFrag;
-import org.apache.xpath.objects.XNodeSet;
import org.apache.xpath.XPathContext;
import org.apache.xpath.axes.DescendantIterator;
import org.apache.xpath.axes.OneStepIterator;
-
-import org.apache.xml.dtm.DTM;
+import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XNodeSet;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
+import org.apache.xpath.objects.XRTreeFrag;
+import org.apache.xpath.objects.XString;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.traversal.NodeIterator;
// import org.apache.xalan.xslt.*;
No revision
No revision
1.2.6.2 +2 -1 xml-xalan/java/src/org/apache/xalan/lib/ExsltBase.java
Index: ExsltBase.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/ExsltBase.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- ExsltBase.java 27 Jan 2003 19:43:44 -0000 1.2.6.1
+++ ExsltBase.java 30 Jan 2003 18:41:20 -0000 1.2.6.2
@@ -56,9 +56,10 @@
*/
package org.apache.xalan.lib;
+import org.apache.xml.dtm.ref.DTMNodeProxy;
+
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.xml.dtm.ref.DTMNodeProxy;
/**
* The base class for some EXSLT extension classes.
1.2.2.5 +1 -1 xml-xalan/java/src/org/apache/xalan/lib/ExsltCommon.java
Index: ExsltCommon.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/ExsltCommon.java,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- ExsltCommon.java 27 Jan 2003 19:43:44 -0000 1.2.2.4
+++ ExsltCommon.java 30 Jan 2003 18:41:20 -0000 1.2.2.5
@@ -56,10 +56,10 @@
*/
package org.apache.xalan.lib;
+import org.apache.xalan.extensions.ExpressionContext;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.ref.DTMNodeIterator;
import org.apache.xpath.NodeSet;
-import org.apache.xalan.extensions.ExpressionContext;
/**
* <meta name="usage" content="general"/>
1.6.2.2 +6 -7
xml-xalan/java/src/org/apache/xalan/lib/ExsltDatetime.java
Index: ExsltDatetime.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/ExsltDatetime.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- ExsltDatetime.java 27 Jan 2003 19:43:44 -0000 1.6.2.1
+++ ExsltDatetime.java 30 Jan 2003 18:41:20 -0000 1.6.2.2
@@ -58,16 +58,15 @@
package org.apache.xalan.lib;
-import java.util.Date;
-import java.util.TimeZone;
-import java.util.Calendar;
-import java.text.SimpleDateFormat;
-import java.text.DateFormat;
import java.text.ParseException;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.objects.XNumber;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XNumber;
import org.apache.xpath.objects.XObject;
+import org.apache.xpath.objects.XString;
/**
* <meta name="usage" content="general"/>
1.7.4.2 +17 -14 xml-xalan/java/src/org/apache/xalan/lib/ExsltDynamic.java
Index: ExsltDynamic.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/ExsltDynamic.java,v
retrieving revision 1.7.4.1
retrieving revision 1.7.4.2
diff -u -r1.7.4.1 -r1.7.4.2
--- ExsltDynamic.java 27 Jan 2003 19:43:44 -0000 1.7.4.1
+++ ExsltDynamic.java 30 Jan 2003 18:41:20 -0000 1.7.4.2
@@ -56,26 +56,29 @@
*/
package org.apache.xalan.lib;
-import org.w3c.dom.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.objects.XObject;
+import org.apache.xalan.extensions.ExpressionContext;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xpath.NodeSet;
+import org.apache.xpath.NodeSetDTM;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XNumber;
import org.apache.xpath.objects.XNodeSet;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.NodeSet;
-import org.apache.xpath.NodeSetDTM;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
import org.xml.sax.SAXNotSupportedException;
-
-import org.apache.xalan.extensions.ExpressionContext;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-
-import javax.xml.transform.*;
-import javax.xml.parsers.*;
/**
* <meta name="usage" content="general"/>
1.2.2.8 +2 -1 xml-xalan/java/src/org/apache/xalan/lib/ExsltMath.java
Index: ExsltMath.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/ExsltMath.java,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -r1.2.2.7 -r1.2.2.8
--- ExsltMath.java 27 Jan 2003 19:43:44 -0000 1.2.2.7
+++ ExsltMath.java 30 Jan 2003 18:41:20 -0000 1.2.2.8
@@ -56,9 +56,10 @@
*/
package org.apache.xalan.lib;
+import org.apache.xpath.NodeSet;
+
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.xpath.NodeSet;
/**
* <meta name="usage" content="general"/>
1.2.2.6 +4 -4 xml-xalan/java/src/org/apache/xalan/lib/ExsltSets.java
Index: ExsltSets.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/ExsltSets.java,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- ExsltSets.java 27 Jan 2003 19:43:44 -0000 1.2.2.5
+++ ExsltSets.java 30 Jan 2003 18:41:20 -0000 1.2.2.6
@@ -56,12 +56,12 @@
*/
package org.apache.xalan.lib;
+import java.util.Hashtable;
+
+import org.apache.xml.utils.DOMHelper;
+import org.apache.xpath.NodeSet;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.xpath.NodeSet;
-import org.apache.xml.utils.DOMHelper;
-import java.util.Hashtable;
-import javax.xml.parsers.*;
/**
* <meta name="usage" content="general"/>
1.9.4.2 +11 -3 xml-xalan/java/src/org/apache/xalan/lib/ExsltStrings.java
Index: ExsltStrings.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/ExsltStrings.java,v
retrieving revision 1.9.4.1
retrieving revision 1.9.4.2
diff -u -r1.9.4.1 -r1.9.4.2
--- ExsltStrings.java 27 Jan 2003 19:43:44 -0000 1.9.4.1
+++ ExsltStrings.java 30 Jan 2003 18:41:20 -0000 1.9.4.2
@@ -56,10 +56,18 @@
*/
package org.apache.xalan.lib;
-import org.w3c.dom.*;
-import javax.xml.parsers.*;
-import org.apache.xpath.NodeSet;
import java.util.StringTokenizer;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.xpath.NodeSet;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
/**
* <meta name="usage" content="general"/>
1.17.2.7 +15 -17 xml-xalan/java/src/org/apache/xalan/lib/Extensions.java
Index: Extensions.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/Extensions.java,v
retrieving revision 1.17.2.6
retrieving revision 1.17.2.7
diff -u -r1.17.2.6 -r1.17.2.7
--- Extensions.java 27 Jan 2003 19:43:44 -0000 1.17.2.6
+++ Extensions.java 30 Jan 2003 18:41:20 -0000 1.17.2.7
@@ -56,30 +56,28 @@
*/
package org.apache.xalan.lib;
-import org.w3c.dom.Node;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.xalan.extensions.ExpressionContext;
+import org.apache.xalan.xslt.EnvironmentCheck;
+import org.apache.xpath.NodeSet;
+import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
+
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.w3c.dom.traversal.NodeIterator;
-import org.apache.xpath.NodeSet;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XBoolean;
-import org.apache.xpath.objects.XNumber;
import org.xml.sax.SAXNotSupportedException;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import org.apache.xalan.extensions.ExpressionContext;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-// Note: we should consider loading EnvironmentCheck at runtime
-// to simplify inter-package dependencies Sep-01 -sc
-import org.apache.xalan.xslt.EnvironmentCheck;
-import javax.xml.transform.TransformerException;
-import javax.xml.parsers.*;
/**
* <meta name="usage" content="general"/>
1.3.6.2 +3 -3 xml-xalan/java/src/org/apache/xalan/lib/NodeInfo.java
Index: NodeInfo.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/NodeInfo.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- NodeInfo.java 27 Jan 2003 19:43:45 -0000 1.3.6.1
+++ NodeInfo.java 30 Jan 2003 18:41:20 -0000 1.3.6.2
@@ -56,10 +56,10 @@
package org.apache.xalan.lib;
-import org.apache.xml.dtm.ref.DTMNodeProxy;
-import org.apache.xalan.extensions.ExpressionContext;
-
import javax.xml.transform.SourceLocator;
+
+import org.apache.xalan.extensions.ExpressionContext;
+import org.apache.xml.dtm.ref.DTMNodeProxy;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
1.1.10.3 +25 -45 xml-xalan/java/src/org/apache/xalan/lib/PipeDocument.java
Index: PipeDocument.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/PipeDocument.java,v
retrieving revision 1.1.10.2
retrieving revision 1.1.10.3
diff -u -r1.1.10.2 -r1.1.10.3
--- PipeDocument.java 27 Jan 2003 19:43:45 -0000 1.1.10.2
+++ PipeDocument.java 30 Jan 2003 18:41:20 -0000 1.1.10.3
@@ -55,61 +55,41 @@
* <http://www.apache.org/>.
*/
package org.apache.xalan.lib;
-// Imported classes for Extension elements
-import org.apache.xalan.extensions.XSLProcessorContext;
-import org.apache.xalan.templates.ElemExtensionCall;
-import org.apache.xalan.templates.ElemLiteralResult;
-import org.apache.xalan.templates.AVT;
-import org.apache.xalan.transformer.TransformerImpl;
-// Imported JAXP/TrAX classes
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Transformer;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.Vector;
+
import javax.xml.transform.Templates;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.TransformerException;
+import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.sax.SAXResult;
-
-// Imported JAXP parsing classes
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-// Imported SAX classes
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.Parser;
-import org.xml.sax.helpers.ParserAdapter;
-import org.xml.sax.helpers.XMLReaderFactory;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
-
-// Imported DOM classes
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
+import javax.xml.transform.stream.StreamSource;
-// Imported Serializer classes
+import org.apache.xalan.extensions.XSLProcessorContext;
import org.apache.xalan.serialize.Serializer;
import org.apache.xalan.serialize.SerializerFactory;
-import org.apache.xalan.templates.OutputProperties;
-
-// Other org.apache imports
-import org.apache.xpath.XPathContext;
+import org.apache.xalan.templates.AVT;
+import org.apache.xalan.templates.ElemExtensionCall;
+import org.apache.xalan.templates.ElemLiteralResult;
+import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xml.utils.SystemIDResolver;
+import org.apache.xpath.XPathContext;
-// Imported java.io and java.util classes
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.util.Vector;
-import java.util.Properties;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
/**
* PipeDocument is a Xalan extension element to set stylesheet params and
pipes an XML
1.16.10.3 +11 -13 xml-xalan/java/src/org/apache/xalan/lib/Redirect.java
Index: Redirect.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/Redirect.java,v
retrieving revision 1.16.10.2
retrieving revision 1.16.10.3
diff -u -r1.16.10.2 -r1.16.10.3
--- Redirect.java 27 Jan 2003 19:43:45 -0000 1.16.10.2
+++ Redirect.java 30 Jan 2003 18:41:20 -0000 1.16.10.3
@@ -56,26 +56,24 @@
*/
package org.apache.xalan.lib;
-import java.util.*;
-import java.io.*;
-import java.net.URL;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.util.Hashtable;
-import org.xml.sax.ContentHandler;
+import javax.xml.transform.Result;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.stream.StreamResult;
import org.apache.xalan.extensions.XSLProcessorContext;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.templates.StylesheetRoot;
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.templates.ElemExtensionCall;
import org.apache.xalan.templates.OutputProperties;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xpath.objects.XObject;
+import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xpath.XPath;
+import org.apache.xpath.objects.XObject;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.Result;
-import javax.xml.transform.TransformerException;
-
-import org.w3c.dom.*;
+import org.xml.sax.ContentHandler;
/**
* Implements three extension elements to allow an XSLT transformation to
No revision
No revision
1.9.10.2 +1 -3
xml-xalan/java/src/org/apache/xalan/lib/sql/ConnectionPool.java
Index: ConnectionPool.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/ConnectionPool.java,v
retrieving revision 1.9.10.1
retrieving revision 1.9.10.2
diff -u -r1.9.10.1 -r1.9.10.2
--- ConnectionPool.java 27 Jan 2003 19:43:46 -0000 1.9.10.1
+++ ConnectionPool.java 30 Jan 2003 18:41:20 -0000 1.9.10.2
@@ -57,11 +57,9 @@
package org.apache.xalan.lib.sql;
-import java.util.Properties;
-import java.lang.String;
import java.sql.Connection;
import java.sql.SQLException;
-import java.sql.*;
+import java.util.Properties;
/**
* An interface used to build wrapper classes around existing
1.3.10.2 +1 -1
xml-xalan/java/src/org/apache/xalan/lib/sql/ConnectionPoolManager.java
Index: ConnectionPoolManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/ConnectionPoolManager.java,v
retrieving revision 1.3.10.1
retrieving revision 1.3.10.2
diff -u -r1.3.10.1 -r1.3.10.2
--- ConnectionPoolManager.java 27 Jan 2003 19:43:46 -0000 1.3.10.1
+++ ConnectionPoolManager.java 30 Jan 2003 18:41:20 -0000 1.3.10.2
@@ -59,7 +59,7 @@
package org.apache.xalan.lib.sql;
import java.util.Hashtable;
-import java.lang.IllegalArgumentException;
+
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
1.8.2.3 +18 -18
xml-xalan/java/src/org/apache/xalan/lib/sql/DTMDocument.java
Index: DTMDocument.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/DTMDocument.java,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- DTMDocument.java 27 Jan 2003 19:43:46 -0000 1.8.2.2
+++ DTMDocument.java 30 Jan 2003 18:41:20 -0000 1.8.2.3
@@ -58,31 +58,31 @@
package org.apache.xalan.lib.sql;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.dtm.ref.DTMDefaultBaseIterators;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+
+import javax.xml.transform.SourceLocator;
+
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMAxisTraverser;
import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xml.dtm.DTMAxisTraverser;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.ref.DTMDefaultBaseIterators;
+import org.apache.xml.utils.FastStringBuffer;
+import org.apache.xml.utils.StringBufferPool;
import org.apache.xml.utils.SuballocatedIntVector;
+import org.apache.xml.utils.XMLString;
+
import org.w3c.dom.Node;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ErrorHandler;
+
+import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.ext.DeclHandler;
import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.ContentHandler;
-import java.io.IOException;
-import java.io.File;
-import java.io.PrintStream;
-import java.io.FileOutputStream;
-import org.xml.sax.*;
-import javax.xml.transform.SourceLocator;
-import org.apache.xml.utils.*;
-import org.apache.xml.dtm.*;
-import org.xml.sax.ext.*;
/**
* The SQL Document is the main controlling class the executesa SQL Query
1.9.10.6 +2 -2
xml-xalan/java/src/org/apache/xalan/lib/sql/DefaultConnectionPool.java
Index: DefaultConnectionPool.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/DefaultConnectionPool.java,v
retrieving revision 1.9.10.5
retrieving revision 1.9.10.6
diff -u -r1.9.10.5 -r1.9.10.6
--- DefaultConnectionPool.java 27 Jan 2003 19:43:46 -0000 1.9.10.5
+++ DefaultConnectionPool.java 30 Jan 2003 18:41:20 -0000 1.9.10.6
@@ -56,15 +56,15 @@
*/
package org.apache.xalan.lib.sql;
+import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
import java.sql.Driver;
+import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Enumeration;
import java.util.Properties;
import java.util.Vector;
-import java.lang.reflect.Method;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
1.7.10.2 +1 -1
xml-xalan/java/src/org/apache/xalan/lib/sql/PooledConnection.java
Index: PooledConnection.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/PooledConnection.java,v
retrieving revision 1.7.10.1
retrieving revision 1.7.10.2
diff -u -r1.7.10.1 -r1.7.10.2
--- PooledConnection.java 27 Jan 2003 19:43:46 -0000 1.7.10.1
+++ PooledConnection.java 30 Jan 2003 18:41:21 -0000 1.7.10.2
@@ -56,8 +56,8 @@
*/
package org.apache.xalan.lib.sql;
-import java.sql.*;
import java.sql.Connection;
+import java.sql.SQLException;
/**
*/
1.19.10.4 +4 -5
xml-xalan/java/src/org/apache/xalan/lib/sql/SQLDocument.java
Index: SQLDocument.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/SQLDocument.java,v
retrieving revision 1.19.10.3
retrieving revision 1.19.10.4
diff -u -r1.19.10.3 -r1.19.10.4
--- SQLDocument.java 27 Jan 2003 19:43:46 -0000 1.19.10.3
+++ SQLDocument.java 30 Jan 2003 18:41:21 -0000 1.19.10.4
@@ -60,15 +60,14 @@
package org.apache.xalan.lib.sql;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTM;
import java.sql.Connection;
-import java.sql.Statement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import java.sql.*;
-import org.apache.xml.dtm.ref.*;
+import java.sql.Statement;
+
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMManager;
/**
* The SQL Document is the main controlling class the executesa SQL Query
1.4.10.2 +3 -2
xml-xalan/java/src/org/apache/xalan/lib/sql/SQLErrorDocument.java
Index: SQLErrorDocument.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/SQLErrorDocument.java,v
retrieving revision 1.4.10.1
retrieving revision 1.4.10.2
diff -u -r1.4.10.1 -r1.4.10.2
--- SQLErrorDocument.java 27 Jan 2003 19:43:46 -0000 1.4.10.1
+++ SQLErrorDocument.java 30 Jan 2003 18:41:21 -0000 1.4.10.2
@@ -60,9 +60,10 @@
package org.apache.xalan.lib.sql;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTM;
import java.sql.SQLException;
+
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMManager;
/**
*
1.23.10.3 +12 -18
xml-xalan/java/src/org/apache/xalan/lib/sql/XConnection.java
Index: XConnection.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/XConnection.java,v
retrieving revision 1.23.10.2
retrieving revision 1.23.10.3
diff -u -r1.23.10.2 -r1.23.10.3
--- XConnection.java 27 Jan 2003 19:43:46 -0000 1.23.10.2
+++ XConnection.java 30 Jan 2003 18:41:21 -0000 1.23.10.3
@@ -56,37 +56,31 @@
*/
package org.apache.xalan.lib.sql;
+import java.math.BigDecimal;
import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.Date;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.Date;
-import java.sql.Timestamp;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Enumeration;
import java.util.Properties;
-import java.util.Vector;
import java.util.StringTokenizer;
-import java.lang.IllegalArgumentException;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
import java.util.Vector;
-import java.util.Enumeration;
-import java.math.BigDecimal;
+
+import org.apache.xalan.extensions.ExpressionContext;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMManager;
import org.apache.xml.dtm.ref.DTMManagerDefault;
import org.apache.xpath.XPathContext;
-import org.apache.xalan.extensions.ExpressionContext;
import org.apache.xpath.objects.XBooleanStatic;
-import org.w3c.dom.*;
-import java.sql.*;
-import java.util.*;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* An XSLT extension that allows a stylesheet to
No revision
No revision
1.5.16.2 +2 -1
xml-xalan/java/src/org/apache/xalan/processor/ProcessorAttributeSet.java
Index: ProcessorAttributeSet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorAttributeSet.java,v
retrieving revision 1.5.16.1
retrieving revision 1.5.16.2
diff -u -r1.5.16.1 -r1.5.16.2
--- ProcessorAttributeSet.java 27 Jan 2003 19:43:47 -0000 1.5.16.1
+++ ProcessorAttributeSet.java 30 Jan 2003 18:41:21 -0000 1.5.16.2
@@ -56,11 +56,12 @@
*/
package org.apache.xalan.processor;
+import javax.xml.transform.TransformerException;
+
import org.apache.xalan.templates.ElemAttributeSet;
import org.apache.xalan.templates.ElemTemplateElement;
import org.xml.sax.Attributes;
-import javax.xml.transform.TransformerException;
/**
* This class processes parse events for an xsl:attribute-set.
1.9.12.2 +3 -5
xml-xalan/java/src/org/apache/xalan/processor/ProcessorCharacters.java
Index: ProcessorCharacters.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorCharacters.java,v
retrieving revision 1.9.12.1
retrieving revision 1.9.12.2
diff -u -r1.9.12.1 -r1.9.12.2
--- ProcessorCharacters.java 27 Jan 2003 19:43:48 -0000 1.9.12.1
+++ ProcessorCharacters.java 30 Jan 2003 18:41:21 -0000 1.9.12.2
@@ -56,16 +56,14 @@
*/
package org.apache.xalan.processor;
-import java.lang.StringBuffer;
-import org.w3c.dom.Node;
-
import javax.xml.transform.TransformerException;
+import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.ElemText;
import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Constants;
import org.apache.xml.utils.XMLCharacterRecognizer;
+
+import org.w3c.dom.Node;
/**
* This class processes character events for a XSLT template element.
1.6.16.2 +0 -2
xml-xalan/java/src/org/apache/xalan/processor/ProcessorDecimalFormat.java
Index: ProcessorDecimalFormat.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorDecimalFormat.java,v
retrieving revision 1.6.16.1
retrieving revision 1.6.16.2
diff -u -r1.6.16.1 -r1.6.16.2
--- ProcessorDecimalFormat.java 27 Jan 2003 19:43:48 -0000 1.6.16.1
+++ ProcessorDecimalFormat.java 30 Jan 2003 18:41:21 -0000 1.6.16.2
@@ -57,8 +57,6 @@
package org.apache.xalan.processor;
import org.apache.xalan.templates.DecimalFormatProperties;
-
-import javax.xml.transform.TransformerException;
import org.xml.sax.Attributes;
/**
1.2.8.2 +3 -14
xml-xalan/java/src/org/apache/xalan/processor/ProcessorExsltFuncResult.java
Index: ProcessorExsltFuncResult.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorExsltFuncResult.java,v
retrieving revision 1.2.8.1
retrieving revision 1.2.8.2
diff -u -r1.2.8.1 -r1.2.8.2
--- ProcessorExsltFuncResult.java 27 Jan 2003 19:43:48 -0000 1.2.8.1
+++ ProcessorExsltFuncResult.java 30 Jan 2003 18:41:21 -0000 1.2.8.2
@@ -56,25 +56,14 @@
*/
package org.apache.xalan.processor;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemExsltFunction;
import org.apache.xalan.templates.ElemExsltFuncResult;
-import org.apache.xalan.templates.ElemVariable;
+import org.apache.xalan.templates.ElemExsltFunction;
import org.apache.xalan.templates.ElemParam;
-import org.apache.xalan.templates.ElemFallback;
-import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.templates.ElemTemplateElement;
+import org.apache.xalan.templates.ElemVariable;
-import javax.xml.transform.TransformerException;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.NoSuchMethodException;
-import java.lang.InstantiationException;
-import java.lang.IllegalAccessException;
-
-import java.util.Vector;
/**
* <meta name="usage" content="internal"/>
1.4.4.2 +15 -25
xml-xalan/java/src/org/apache/xalan/processor/ProcessorExsltFunction.java
Index: ProcessorExsltFunction.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorExsltFunction.java,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -r1.4.4.1 -r1.4.4.2
--- ProcessorExsltFunction.java 27 Jan 2003 19:43:48 -0000 1.4.4.1
+++ ProcessorExsltFunction.java 30 Jan 2003 18:41:21 -0000 1.4.4.2
@@ -56,20 +56,8 @@
*/
package org.apache.xalan.processor;
-import org.apache.xalan.templates.ElemLiteralResult;
-import org.apache.xalan.templates.ElemElement;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.ElemExtensionCall;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemExsltFunction;
-import org.apache.xalan.templates.ElemExsltFuncResult;
-import org.apache.xalan.templates.ElemFallback;
-import org.apache.xalan.templates.ElemVariable;
-import org.apache.xalan.templates.ElemParam;
-import org.apache.xalan.templates.ElemValueOf;
-import org.apache.xalan.templates.ElemText;
-import org.apache.xalan.templates.ElemTextLiteral;
+import javax.xml.transform.SourceLocator;
+
import org.apache.xalan.templates.ElemApplyImport;
import org.apache.xalan.templates.ElemApplyTemplates;
import org.apache.xalan.templates.ElemAttribute;
@@ -77,22 +65,24 @@
import org.apache.xalan.templates.ElemComment;
import org.apache.xalan.templates.ElemCopy;
import org.apache.xalan.templates.ElemCopyOf;
+import org.apache.xalan.templates.ElemElement;
+import org.apache.xalan.templates.ElemExsltFuncResult;
+import org.apache.xalan.templates.ElemExsltFunction;
+import org.apache.xalan.templates.ElemFallback;
+import org.apache.xalan.templates.ElemLiteralResult;
import org.apache.xalan.templates.ElemNumber;
import org.apache.xalan.templates.ElemPI;
-import org.apache.xalan.templates.Constants;
-import org.apache.xpath.XPath;
-import org.apache.xalan.templates.StylesheetRoot;
+import org.apache.xalan.templates.ElemParam;
+import org.apache.xalan.templates.ElemTemplate;
+import org.apache.xalan.templates.ElemTemplateElement;
+import org.apache.xalan.templates.ElemText;
+import org.apache.xalan.templates.ElemTextLiteral;
+import org.apache.xalan.templates.ElemValueOf;
+import org.apache.xalan.templates.ElemVariable;
+import org.apache.xalan.templates.Stylesheet;
-import javax.xml.transform.SourceLocator;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerConfigurationException;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.apache.xalan.res.XSLTErrorResources;
/**
1.5.16.2 +1 -4
xml-xalan/java/src/org/apache/xalan/processor/ProcessorGlobalParamDecl.java
Index: ProcessorGlobalParamDecl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorGlobalParamDecl.java,v
retrieving revision 1.5.16.1
retrieving revision 1.5.16.2
diff -u -r1.5.16.1 -r1.5.16.2
--- ProcessorGlobalParamDecl.java 27 Jan 2003 19:43:48 -0000 1.5.16.1
+++ ProcessorGlobalParamDecl.java 30 Jan 2003 18:41:21 -0000 1.5.16.2
@@ -56,11 +56,8 @@
*/
package org.apache.xalan.processor;
-import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.ElemParam;
-
-import javax.xml.transform.TransformerException;
-import org.xml.sax.Attributes;
+import org.apache.xalan.templates.ElemTemplateElement;
/**
* This class processes parse events for an xsl:param element.
1.5.16.2 +0 -3
xml-xalan/java/src/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java
Index: ProcessorGlobalVariableDecl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java,v
retrieving revision 1.5.16.1
retrieving revision 1.5.16.2
diff -u -r1.5.16.1 -r1.5.16.2
--- ProcessorGlobalVariableDecl.java 27 Jan 2003 19:43:48 -0000 1.5.16.1
+++ ProcessorGlobalVariableDecl.java 30 Jan 2003 18:41:21 -0000 1.5.16.2
@@ -59,9 +59,6 @@
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.ElemVariable;
-import javax.xml.transform.TransformerException;
-import org.xml.sax.Attributes;
-
/**
* This class processes parse events for an xsl:variable element.
* @see <a href="http://www.w3.org/TR/xslt#dtd";>XSLT DTD</a>
1.10.16.3 +0 -19
xml-xalan/java/src/org/apache/xalan/processor/ProcessorImport.java
Index: ProcessorImport.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorImport.java,v
retrieving revision 1.10.16.2
retrieving revision 1.10.16.3
diff -u -r1.10.16.2 -r1.10.16.3
--- ProcessorImport.java 27 Jan 2003 19:43:48 -0000 1.10.16.2
+++ ProcessorImport.java 30 Jan 2003 18:41:21 -0000 1.10.16.3
@@ -56,26 +56,7 @@
*/
package org.apache.xalan.processor;
-import org.apache.xml.utils.TreeWalker;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.StylesheetComposed;
-import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
-
-import javax.xml.transform.TransformerException;
-import org.xml.sax.Attributes;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-import org.xml.sax.InputSource;
-import org.xml.sax.EntityResolver;
-
-import java.net.URL;
-
-import java.io.IOException;
-
-import javax.xml.transform.URIResolver;
-
-import org.w3c.dom.Node;
/**
* This class processes parse events for an xsl:import element.
1.20.10.5 +11 -19
xml-xalan/java/src/org/apache/xalan/processor/ProcessorInclude.java
Index: ProcessorInclude.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorInclude.java,v
retrieving revision 1.20.10.4
retrieving revision 1.20.10.5
diff -u -r1.20.10.4 -r1.20.10.5
--- ProcessorInclude.java 27 Jan 2003 19:43:48 -0000 1.20.10.4
+++ ProcessorInclude.java 30 Jan 2003 18:41:21 -0000 1.20.10.5
@@ -56,34 +56,26 @@
*/
package org.apache.xalan.processor;
-import org.apache.xml.utils.TreeWalker;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-
-import javax.xml.transform.TransformerException;
-import org.xml.sax.Attributes;
-import org.xml.sax.XMLReader;
-import org.xml.sax.InputSource;
-import org.xml.sax.EntityResolver;
-
-import java.net.URL;
-
import java.io.IOException;
-import org.xml.sax.helpers.XMLReaderFactory;
-
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerException;
+
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xml.utils.SystemIDResolver;
+import org.apache.xml.utils.TreeWalker;
import org.w3c.dom.Node;
-import org.apache.xml.utils.SystemIDResolver;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
/**
* TransformerFactory class for xsl:include markup.
1.10.2.2 +3 -5
xml-xalan/java/src/org/apache/xalan/processor/ProcessorKey.java
Index: ProcessorKey.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorKey.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- ProcessorKey.java 27 Jan 2003 19:43:48 -0000 1.10.2.1
+++ ProcessorKey.java 30 Jan 2003 18:41:21 -0000 1.10.2.2
@@ -56,15 +56,13 @@
*/
package org.apache.xalan.processor;
-import org.apache.xalan.templates.KeyDeclaration;
-
-import javax.xml.transform.TransformerException;
-import org.xml.sax.Attributes;
+import java.util.Vector;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.templates.KeyDeclaration;
-import java.util.Vector;
+import org.xml.sax.Attributes;
/**
* TransformerFactory for xsl:key markup.
1.18.10.3 +12 -12
xml-xalan/java/src/org/apache/xalan/processor/ProcessorLRE.java
Index: ProcessorLRE.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorLRE.java,v
retrieving revision 1.18.10.2
retrieving revision 1.18.10.3
diff -u -r1.18.10.2 -r1.18.10.3
--- ProcessorLRE.java 27 Jan 2003 19:43:48 -0000 1.18.10.2
+++ ProcessorLRE.java 30 Jan 2003 18:41:22 -0000 1.18.10.3
@@ -56,27 +56,27 @@
*/
package org.apache.xalan.processor;
+import java.util.Vector;
+
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.templates.Constants;
+import org.apache.xalan.templates.ElemExtensionCall;
import org.apache.xalan.templates.ElemLiteralResult;
+import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.ElemExtensionCall;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.Constants;
+import org.apache.xalan.templates.StylesheetRoot;
import org.apache.xalan.templates.XMLNSDecl;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xml.utils.SAXSourceLocator;
import org.apache.xpath.XPath;
-import org.apache.xalan.templates.StylesheetRoot;
-import javax.xml.transform.TransformerException;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.helpers.AttributesImpl;
-
-import javax.xml.transform.TransformerConfigurationException;
-import org.apache.xml.utils.SAXSourceLocator;
-
-import java.util.Vector;
/**
* <meta name="usage" content="internal"/>
1.8.16.2 +0 -2
xml-xalan/java/src/org/apache/xalan/processor/ProcessorNamespaceAlias.java
Index: ProcessorNamespaceAlias.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorNamespaceAlias.java,v
retrieving revision 1.8.16.1
retrieving revision 1.8.16.2
diff -u -r1.8.16.1 -r1.8.16.2
--- ProcessorNamespaceAlias.java 27 Jan 2003 19:43:48 -0000 1.8.16.1
+++ ProcessorNamespaceAlias.java 30 Jan 2003 18:41:22 -0000 1.8.16.2
@@ -57,8 +57,6 @@
package org.apache.xalan.processor;
import org.apache.xalan.templates.NamespaceAlias;
-
-import javax.xml.transform.TransformerException;
import org.xml.sax.Attributes;
/**
1.12.16.3 +2 -9
xml-xalan/java/src/org/apache/xalan/processor/ProcessorOutputElem.java
Index: ProcessorOutputElem.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorOutputElem.java,v
retrieving revision 1.12.16.2
retrieving revision 1.12.16.3
diff -u -r1.12.16.2 -r1.12.16.3
--- ProcessorOutputElem.java 27 Jan 2003 19:43:48 -0000 1.12.16.2
+++ ProcessorOutputElem.java 30 Jan 2003 18:41:22 -0000 1.12.16.3
@@ -57,19 +57,12 @@
package org.apache.xalan.processor;
import javax.xml.transform.OutputKeys;
+import javax.xml.transform.TransformerException;
-import java.util.Hashtable;
-
-import org.apache.xalan.templates.OutputProperties;
-import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.templates.ElemTemplateElement;
-
+import org.apache.xalan.templates.OutputProperties;
import org.apache.xml.utils.QName;
import org.apache.xml.utils.SystemIDResolver;
-
-import javax.xml.transform.TransformerException;
-
import org.xml.sax.Attributes;
/**
1.8.2.2 +3 -3
xml-xalan/java/src/org/apache/xalan/processor/ProcessorPreserveSpace.java
Index: ProcessorPreserveSpace.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorPreserveSpace.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- ProcessorPreserveSpace.java 27 Jan 2003 19:43:48 -0000 1.8.2.1
+++ ProcessorPreserveSpace.java 30 Jan 2003 18:41:22 -0000 1.8.2.2
@@ -56,13 +56,13 @@
*/
package org.apache.xalan.processor;
-import javax.xml.transform.TransformerException;
-import org.xml.sax.Attributes;
+import java.util.Vector;
+
import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.templates.WhiteSpaceInfo;
import org.apache.xpath.XPath;
-import java.util.Vector;
+import org.xml.sax.Attributes;
/**
* TransformerFactory for xsl:preserve-space markup.
1.8.2.2 +3 -3
xml-xalan/java/src/org/apache/xalan/processor/ProcessorStripSpace.java
Index: ProcessorStripSpace.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorStripSpace.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- ProcessorStripSpace.java 27 Jan 2003 19:43:48 -0000 1.8.2.1
+++ ProcessorStripSpace.java 30 Jan 2003 18:41:22 -0000 1.8.2.2
@@ -56,13 +56,13 @@
*/
package org.apache.xalan.processor;
-import javax.xml.transform.TransformerException;
-import org.xml.sax.Attributes;
+import java.util.Vector;
+
import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.templates.WhiteSpaceInfo;
import org.apache.xpath.XPath;
-import java.util.Vector;
+import org.xml.sax.Attributes;
/**
* TransformerFactory for xsl:strip-space markup.
1.10.10.2 +4 -4
xml-xalan/java/src/org/apache/xalan/processor/ProcessorStylesheetElement.java
Index: ProcessorStylesheetElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorStylesheetElement.java,v
retrieving revision 1.10.10.1
retrieving revision 1.10.10.2
diff -u -r1.10.10.1 -r1.10.10.2
--- ProcessorStylesheetElement.java 27 Jan 2003 19:43:49 -0000
1.10.10.1
+++ ProcessorStylesheetElement.java 30 Jan 2003 18:41:22 -0000
1.10.10.2
@@ -56,14 +56,14 @@
*/
package org.apache.xalan.processor;
-import org.apache.xalan.templates.StylesheetRoot;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+
import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.templates.StylesheetComposed;
+import org.apache.xalan.templates.StylesheetRoot;
-import javax.xml.transform.TransformerException;
import org.xml.sax.Attributes;
-
-import javax.xml.transform.TransformerConfigurationException;
/**
* TransformerFactory for xsl:stylesheet or xsl:transform markup.
1.7.12.2 +0 -3
xml-xalan/java/src/org/apache/xalan/processor/ProcessorTemplate.java
Index: ProcessorTemplate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorTemplate.java,v
retrieving revision 1.7.12.1
retrieving revision 1.7.12.2
diff -u -r1.7.12.1 -r1.7.12.2
--- ProcessorTemplate.java 27 Jan 2003 19:43:49 -0000 1.7.12.1
+++ ProcessorTemplate.java 30 Jan 2003 18:41:22 -0000 1.7.12.2
@@ -59,9 +59,6 @@
import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.ElemTemplateElement;
-import javax.xml.transform.TransformerException;
-import org.xml.sax.Attributes;
-
/**
* TransformerFactory for xsl:template markup.
*/
1.10.2.2 +3 -10
xml-xalan/java/src/org/apache/xalan/processor/ProcessorTemplateElem.java
Index: ProcessorTemplateElem.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorTemplateElem.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- ProcessorTemplateElem.java 27 Jan 2003 19:43:49 -0000 1.10.2.1
+++ ProcessorTemplateElem.java 30 Jan 2003 18:41:22 -0000 1.10.2.2
@@ -56,19 +56,12 @@
*/
package org.apache.xalan.processor;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.res.XSLTErrorResources;
-
import javax.xml.transform.TransformerException;
-import org.xml.sax.Attributes;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.NoSuchMethodException;
-import java.lang.InstantiationException;
-import java.lang.IllegalAccessException;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.templates.ElemTemplateElement;
-import java.util.Vector;
+import org.xml.sax.Attributes;
/**
* This class processes parse events for an XSLT template element.
1.5.16.2 +0 -2
xml-xalan/java/src/org/apache/xalan/processor/ProcessorText.java
Index: ProcessorText.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorText.java,v
retrieving revision 1.5.16.1
retrieving revision 1.5.16.2
diff -u -r1.5.16.1 -r1.5.16.2
--- ProcessorText.java 27 Jan 2003 19:43:49 -0000 1.5.16.1
+++ ProcessorText.java 30 Jan 2003 18:41:22 -0000 1.5.16.2
@@ -59,8 +59,6 @@
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.ElemText;
-import javax.xml.transform.TransformerException;
-
/**
* Process xsl:text.
* @see <a href="http://www.w3.org/TR/xslt#dtd";>XSLT DTD</a>
1.4.16.2 +0 -10
xml-xalan/java/src/org/apache/xalan/processor/ProcessorUnknown.java
Index: ProcessorUnknown.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorUnknown.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- ProcessorUnknown.java 27 Jan 2003 19:43:49 -0000 1.4.16.1
+++ ProcessorUnknown.java 30 Jan 2003 18:41:22 -0000 1.4.16.2
@@ -56,16 +56,6 @@
*/
package org.apache.xalan.processor;
-import org.apache.xalan.templates.ElemLiteralResult;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.ElemExtensionCall;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.Constants;
-import org.apache.xpath.XPath;
-import org.apache.xalan.templates.StylesheetRoot;
-
-import javax.xml.transform.TransformerException;
import org.xml.sax.Attributes;
/**
1.50.2.7 +13 -28
xml-xalan/java/src/org/apache/xalan/processor/StylesheetHandler.java
Index: StylesheetHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/StylesheetHandler.java,v
retrieving revision 1.50.2.6
retrieving revision 1.50.2.7
diff -u -r1.50.2.6 -r1.50.2.7
--- StylesheetHandler.java 27 Jan 2003 19:43:49 -0000 1.50.2.6
+++ StylesheetHandler.java 30 Jan 2003 18:41:22 -0000 1.50.2.7
@@ -56,55 +56,40 @@
*/
package org.apache.xalan.processor;
-import java.net.URL;
-
-import java.io.IOException;
+import java.util.Stack;
-import javax.xml.transform.sax.TemplatesHandler;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.SourceLocator;
import javax.xml.transform.Templates;
-import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.sax.TemplatesHandler;
-import java.util.Stack;
-
+import org.apache.xalan.extensions.ExpressionVisitor;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemUnknown;
import org.apache.xalan.templates.ElemForEach;
-import org.apache.xalan.templates.StylesheetRoot;
+import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.Stylesheet;
+import org.apache.xalan.templates.StylesheetRoot;
+import org.apache.xml.utils.BoolStack;
+import org.apache.xml.utils.NamespaceSupport2;
import org.apache.xml.utils.NodeConsumer;
import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.utils.SAXSourceLocator;
import org.apache.xml.utils.XMLCharacterRecognizer;
-import org.apache.xml.utils.BoolStack;
+import org.apache.xpath.XPath;
import org.apache.xpath.compiler.FunctionTable;
-import org.apache.xpath.compiler.XPathParser;
import org.apache.xpath.functions.Function;
-import org.apache.xpath.XPathFactory;
-import org.apache.xpath.XPath;
-import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xalan.extensions.ExpressionVisitor;
import org.w3c.dom.Node;
import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
-
-import org.xml.sax.helpers.NamespaceSupport;
-import org.apache.xml.utils.NamespaceSupport2;
import org.xml.sax.helpers.DefaultHandler;
-
-import javax.xml.transform.SourceLocator;
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.TransformerException;
-
-import org.apache.xml.utils.SAXSourceLocator;
+import org.xml.sax.helpers.NamespaceSupport;
/**
* <meta name="usage" content="advanced"/>
1.12.10.2 +7 -7
xml-xalan/java/src/org/apache/xalan/processor/StylesheetPIHandler.java
Index: StylesheetPIHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/StylesheetPIHandler.java,v
retrieving revision 1.12.10.1
retrieving revision 1.12.10.2
diff -u -r1.12.10.1 -r1.12.10.2
--- StylesheetPIHandler.java 27 Jan 2003 19:43:49 -0000 1.12.10.1
+++ StylesheetPIHandler.java 30 Jan 2003 18:41:22 -0000 1.12.10.2
@@ -56,19 +56,19 @@
*/
package org.apache.xalan.processor;
-import org.xml.sax.helpers.DefaultHandler;
-import javax.xml.transform.TransformerException;
-import org.xml.sax.InputSource;
-import org.xml.sax.Attributes;
-
-import java.util.Vector;
import java.util.StringTokenizer;
+import java.util.Vector;
import javax.xml.transform.Source;
-import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
+import javax.xml.transform.sax.SAXSource;
import org.apache.xml.utils.SystemIDResolver;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.helpers.DefaultHandler;
/**
* Search for the xml-stylesheet processing instructions in an XML document.
1.41.6.7 +30 -40
xml-xalan/java/src/org/apache/xalan/processor/TransformerFactoryImpl.java
Index: TransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/TransformerFactoryImpl.java,v
retrieving revision 1.41.6.6
retrieving revision 1.41.6.7
diff -u -r1.41.6.6 -r1.41.6.7
--- TransformerFactoryImpl.java 27 Jan 2003 19:43:49 -0000 1.41.6.6
+++ TransformerFactoryImpl.java 30 Jan 2003 18:41:22 -0000 1.41.6.7
@@ -56,56 +56,46 @@
*/
package org.apache.xalan.processor;
-import org.xml.sax.InputSource;
-import org.xml.sax.helpers.XMLReaderFactory;
-import org.xml.sax.XMLReader;
-
-import javax.xml.transform.TransformerException;
-
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.XMLFilter;
-
-import org.w3c.dom.Node;
-
-import org.apache.xml.utils.TreeWalker;
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xml.utils.DefaultErrorHandler;
-import org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.transformer.TransformerIdentityImpl;
-import org.apache.xalan.transformer.TrAXFilter;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.Properties;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
-import javax.xml.transform.Templates;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TemplatesHandler;
import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.ErrorListener;
+import javax.xml.transform.stream.StreamSource;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.BufferedInputStream;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.io.StringReader;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.transformer.TrAXFilter;
+import org.apache.xalan.transformer.TransformerIdentityImpl;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xalan.transformer.XalanProperties;
+import org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
+import org.apache.xml.utils.DefaultErrorHandler;
+import org.apache.xml.utils.SystemIDResolver;
+import org.apache.xml.utils.TreeWalker;
-import java.util.Properties;
-import java.util.Enumeration;
+import org.w3c.dom.Node;
-import org.apache.xalan.transformer.XalanProperties;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLFilter;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
/**
* The TransformerFactoryImpl, which implements the TRaX TransformerFactory
1.2.2.2 +2 -1
xml-xalan/java/src/org/apache/xalan/processor/WhitespaceInfoPaths.java
Index: WhitespaceInfoPaths.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/WhitespaceInfoPaths.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- WhitespaceInfoPaths.java 27 Jan 2003 19:43:49 -0000 1.2.2.1
+++ WhitespaceInfoPaths.java 30 Jan 2003 18:41:22 -0000 1.2.2.2
@@ -56,9 +56,10 @@
*/
package org.apache.xalan.processor;
-import org.apache.xalan.templates.WhiteSpaceInfo;
import java.util.Vector;
+
import org.apache.xalan.templates.Stylesheet;
+import org.apache.xalan.templates.WhiteSpaceInfo;
public class WhitespaceInfoPaths extends WhiteSpaceInfo
{
1.21.2.5 +6 -9
xml-xalan/java/src/org/apache/xalan/processor/XSLTAttributeDef.java
Index: XSLTAttributeDef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTAttributeDef.java,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -u -r1.21.2.4 -r1.21.2.5
--- XSLTAttributeDef.java 27 Jan 2003 19:43:49 -0000 1.21.2.4
+++ XSLTAttributeDef.java 30 Jan 2003 18:41:22 -0000 1.21.2.5
@@ -56,26 +56,23 @@
*/
package org.apache.xalan.processor;
-import org.apache.xml.utils.StringToIntTable;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.xalan.templates.AVT;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Constants;
+import javax.xml.transform.TransformerException;
+
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.templates.AVT;
+import org.apache.xalan.templates.Constants;
+import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xml.utils.QName;
-import org.apache.xml.utils.SystemIDResolver;
+import org.apache.xml.utils.StringToIntTable;
import org.apache.xml.utils.StringVector;
import org.apache.xml.utils.XMLChar;
import org.apache.xpath.XPath;
-
-import javax.xml.transform.TransformerException;
/**
1.14.10.3 +2 -6
xml-xalan/java/src/org/apache/xalan/processor/XSLTElementDef.java
Index: XSLTElementDef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTElementDef.java,v
retrieving revision 1.14.10.2
retrieving revision 1.14.10.3
diff -u -r1.14.10.2 -r1.14.10.3
--- XSLTElementDef.java 27 Jan 2003 19:43:49 -0000 1.14.10.2
+++ XSLTElementDef.java 30 Jan 2003 18:41:22 -0000 1.14.10.3
@@ -56,15 +56,11 @@
*/
package org.apache.xalan.processor;
-import org.xml.sax.ContentHandler;
+import java.util.Enumeration;
+import java.util.Hashtable;
import org.apache.xalan.templates.Constants;
import org.apache.xml.utils.QName;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-
-import java.util.Hashtable;
-import java.util.Enumeration;
/**
* This class defines the allowed structure for an element in a XSLT
stylesheet,
1.13.2.3 +3 -10
xml-xalan/java/src/org/apache/xalan/processor/XSLTElementProcessor.java
Index: XSLTElementProcessor.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTElementProcessor.java,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -r1.13.2.2 -r1.13.2.3
--- XSLTElementProcessor.java 27 Jan 2003 19:43:50 -0000 1.13.2.2
+++ XSLTElementProcessor.java 30 Jan 2003 18:41:22 -0000 1.13.2.3
@@ -56,23 +56,16 @@
*/
package org.apache.xalan.processor;
-import org.xml.sax.InputSource;
-import org.xml.sax.Attributes;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.ContentHandler;
+import java.util.Vector;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.Constants;
import org.apache.xml.utils.IntStack;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
import org.xml.sax.helpers.AttributesImpl;
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.TransformerException;
-
-import java.util.Vector;
/**
* This class acts as the superclass for all stylesheet element
1.23.10.5 +32 -1
xml-xalan/java/src/org/apache/xalan/processor/XSLTSchema.java
Index: XSLTSchema.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTSchema.java,v
retrieving revision 1.23.10.4
retrieving revision 1.23.10.5
diff -u -r1.23.10.4 -r1.23.10.5
--- XSLTSchema.java 27 Jan 2003 19:43:50 -0000 1.23.10.4
+++ XSLTSchema.java 30 Jan 2003 18:41:22 -0000 1.23.10.5
@@ -58,7 +58,38 @@
import java.util.Hashtable;
-import org.apache.xalan.templates.*;
+import org.apache.xalan.templates.Constants;
+import org.apache.xalan.templates.ElemApplyImport;
+import org.apache.xalan.templates.ElemApplyTemplates;
+import org.apache.xalan.templates.ElemAttribute;
+import org.apache.xalan.templates.ElemCallTemplate;
+import org.apache.xalan.templates.ElemChoose;
+import org.apache.xalan.templates.ElemComment;
+import org.apache.xalan.templates.ElemCopy;
+import org.apache.xalan.templates.ElemCopyOf;
+import org.apache.xalan.templates.ElemElement;
+import org.apache.xalan.templates.ElemExsltFuncResult;
+import org.apache.xalan.templates.ElemExsltFunction;
+import org.apache.xalan.templates.ElemExtensionDecl;
+import org.apache.xalan.templates.ElemExtensionScript;
+import org.apache.xalan.templates.ElemFallback;
+import org.apache.xalan.templates.ElemForEach;
+import org.apache.xalan.templates.ElemIf;
+import org.apache.xalan.templates.ElemLiteralResult;
+import org.apache.xalan.templates.ElemMessage;
+import org.apache.xalan.templates.ElemNumber;
+import org.apache.xalan.templates.ElemOtherwise;
+import org.apache.xalan.templates.ElemPI;
+import org.apache.xalan.templates.ElemParam;
+import org.apache.xalan.templates.ElemSort;
+import org.apache.xalan.templates.ElemTemplate;
+import org.apache.xalan.templates.ElemText;
+import org.apache.xalan.templates.ElemTextLiteral;
+import org.apache.xalan.templates.ElemUnknown;
+import org.apache.xalan.templates.ElemValueOf;
+import org.apache.xalan.templates.ElemVariable;
+import org.apache.xalan.templates.ElemWhen;
+import org.apache.xalan.templates.ElemWithParam;
import org.apache.xml.utils.QName;
/**
No revision
No revision
1.5.16.5 +0 -4 xml-xalan/java/src/org/apache/xalan/res/XSLMessages.java
Index: XSLMessages.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLMessages.java,v
retrieving revision 1.5.16.4
retrieving revision 1.5.16.5
diff -u -r1.5.16.4 -r1.5.16.5
--- XSLMessages.java 27 Jan 2003 19:43:52 -0000 1.5.16.4
+++ XSLMessages.java 30 Jan 2003 18:41:24 -0000 1.5.16.5
@@ -56,11 +56,7 @@
*/
package org.apache.xalan.res;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
import java.util.ListResourceBundle;
-import java.util.MissingResourceException;
import org.apache.xpath.res.XPATHMessages;
1.23.10.6 +2 -7
xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.java
Index: XSLTErrorResources.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.java,v
retrieving revision 1.23.10.5
retrieving revision 1.23.10.6
diff -u -r1.23.10.5 -r1.23.10.6
--- XSLTErrorResources.java 27 Jan 2003 19:43:52 -0000 1.23.10.5
+++ XSLTErrorResources.java 30 Jan 2003 18:41:24 -0000 1.23.10.6
@@ -56,15 +56,10 @@
*/
package org.apache.xalan.res;
-
-import java.util.MissingResourceException;
+import java.util.ListResourceBundle;
import java.util.Locale;
+import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import java.util.ListResourceBundle;
-
-import java.text.DecimalFormat;
-
-import org.apache.xalan.templates.Constants;
/**
* Set up error messages.
1.2.2.3 +0 -10
xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_de.java
Index: XSLTErrorResources_de.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_de.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XSLTErrorResources_de.java 27 Jan 2003 19:43:52 -0000 1.2.2.2
+++ XSLTErrorResources_de.java 30 Jan 2003 18:41:25 -0000 1.2.2.3
@@ -56,16 +56,6 @@
*/
package org.apache.xalan.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-import java.util.MissingResourceException;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import java.text.DecimalFormat;
-
-import org.apache.xalan.templates.Constants;
-
/**
* Set up error messages.
1.2.2.3 +0 -10
xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_es.java
Index: XSLTErrorResources_es.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_es.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XSLTErrorResources_es.java 27 Jan 2003 19:43:53 -0000 1.2.2.2
+++ XSLTErrorResources_es.java 30 Jan 2003 18:41:25 -0000 1.2.2.3
@@ -57,16 +57,6 @@
*/
package org.apache.xalan.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-import java.util.MissingResourceException;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import java.text.DecimalFormat;
-
-import org.apache.xalan.templates.Constants;
-
/**
* Set up error messages.
1.2.2.3 +0 -9
xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_fr.java
Index: XSLTErrorResources_fr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_fr.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XSLTErrorResources_fr.java 27 Jan 2003 19:43:53 -0000 1.2.2.2
+++ XSLTErrorResources_fr.java 30 Jan 2003 18:41:25 -0000 1.2.2.3
@@ -56,15 +56,6 @@
*/
package org.apache.xalan.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-import java.util.MissingResourceException;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import java.text.DecimalFormat;
-
-import org.apache.xalan.templates.Constants;
/**
* Set up error messages.
1.2.2.3 +0 -7
xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_it.java
Index: XSLTErrorResources_it.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_it.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XSLTErrorResources_it.java 27 Jan 2003 19:43:53 -0000 1.2.2.2
+++ XSLTErrorResources_it.java 30 Jan 2003 18:41:25 -0000 1.2.2.3
@@ -57,14 +57,7 @@
*/
package org.apache.xalan.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-import java.util.MissingResourceException;
import java.util.Locale;
-import java.util.ResourceBundle;
-
-
-import org.apache.xalan.templates.Constants;
/**
* Set up error messages.
1.2.2.3 +0 -10
xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_ja.java
Index: XSLTErrorResources_ja.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_ja.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XSLTErrorResources_ja.java 27 Jan 2003 19:43:53 -0000 1.2.2.2
+++ XSLTErrorResources_ja.java 30 Jan 2003 18:41:25 -0000 1.2.2.3
@@ -56,16 +56,6 @@
*/
package org.apache.xalan.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-import java.util.MissingResourceException;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import java.text.DecimalFormat;
-
-import org.apache.xalan.templates.Constants;
-
/**
* Set up error messages.
1.2.2.3 +0 -9
xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_ko.java
Index: XSLTErrorResources_ko.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_ko.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XSLTErrorResources_ko.java 27 Jan 2003 19:43:54 -0000 1.2.2.2
+++ XSLTErrorResources_ko.java 30 Jan 2003 18:41:25 -0000 1.2.2.3
@@ -56,15 +56,6 @@
*/
package org.apache.xalan.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-import java.util.MissingResourceException;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import java.text.DecimalFormat;
-
-import org.apache.xalan.templates.Constants;
/**
* Set up error messages.
1.2.2.3 +0 -10
xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_sv.java
Index: XSLTErrorResources_sv.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_sv.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XSLTErrorResources_sv.java 27 Jan 2003 19:43:54 -0000 1.2.2.2
+++ XSLTErrorResources_sv.java 30 Jan 2003 18:41:26 -0000 1.2.2.3
@@ -56,16 +56,6 @@
*/
package org.apache.xalan.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-import java.util.MissingResourceException;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import java.text.DecimalFormat;
-
-import org.apache.xalan.templates.Constants;
-
/**
* Set up error messages.
1.2.2.3 +0 -10
xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_zh_CN.java
Index: XSLTErrorResources_zh_CN.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_zh_CN.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XSLTErrorResources_zh_CN.java 27 Jan 2003 19:43:54 -0000 1.2.2.2
+++ XSLTErrorResources_zh_CN.java 30 Jan 2003 18:41:26 -0000 1.2.2.3
@@ -57,16 +57,6 @@
*/
package org.apache.xalan.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-import java.util.MissingResourceException;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import java.text.DecimalFormat;
-
-import org.apache.xalan.templates.Constants;
-
/**
* Set up error messages.
1.2.2.3 +0 -9
xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_zh_TW.java
Index: XSLTErrorResources_zh_TW.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources_zh_TW.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XSLTErrorResources_zh_TW.java 27 Jan 2003 19:43:55 -0000 1.2.2.2
+++ XSLTErrorResources_zh_TW.java 30 Jan 2003 18:41:26 -0000 1.2.2.3
@@ -56,15 +56,6 @@
*/
package org.apache.xalan.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-import java.util.MissingResourceException;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import java.text.DecimalFormat;
-
-import org.apache.xalan.templates.Constants;
/**
* Set up error messages.
No revision
No revision
1.12.6.2 +4 -8
xml-xalan/java/src/org/apache/xalan/serialize/CharInfo.java
Index: CharInfo.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/CharInfo.java,v
retrieving revision 1.12.6.1
retrieving revision 1.12.6.2
diff -u -r1.12.6.1 -r1.12.6.2
--- CharInfo.java 27 Jan 2003 19:44:04 -0000 1.12.6.1
+++ CharInfo.java 30 Jan 2003 18:41:27 -0000 1.12.6.2
@@ -56,20 +56,16 @@
*/
package org.apache.xalan.serialize;
-import java.util.BitSet;
-
+import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.BufferedReader;
-
-import java.net.*;
-
+import java.net.URL;
+import java.util.BitSet;
import java.util.Hashtable;
-import org.apache.xml.utils.CharKey;
-
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xml.utils.CharKey;
/**
* This class provides services that tell if a character should have
1.8.10.7 +2 -4
xml-xalan/java/src/org/apache/xalan/serialize/Encodings.java
Index: Encodings.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/Encodings.java,v
retrieving revision 1.8.10.6
retrieving revision 1.8.10.7
diff -u -r1.8.10.6 -r1.8.10.7
--- Encodings.java 27 Jan 2003 19:44:04 -0000 1.8.10.6
+++ Encodings.java 30 Jan 2003 18:41:27 -0000 1.8.10.7
@@ -57,13 +57,11 @@
package org.apache.xalan.serialize;
import java.io.InputStream;
-import java.io.Writer;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
-
+import java.io.Writer;
import java.net.URL;
-
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
1.3.16.2 +2 -2
xml-xalan/java/src/org/apache/xalan/serialize/Serializer.java
Index: Serializer.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/Serializer.java,v
retrieving revision 1.3.16.1
retrieving revision 1.3.16.2
diff -u -r1.3.16.1 -r1.3.16.2
--- Serializer.java 27 Jan 2003 19:44:04 -0000 1.3.16.1
+++ Serializer.java 30 Jan 2003 18:41:27 -0000 1.3.16.2
@@ -56,9 +56,9 @@
*/
package org.apache.xalan.serialize;
-import java.io.Writer;
-import java.io.OutputStream;
import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
import java.util.Properties;
import org.xml.sax.ContentHandler;
1.5.10.2 +1 -7
xml-xalan/java/src/org/apache/xalan/serialize/SerializerFactory.java
Index: SerializerFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/SerializerFactory.java,v
retrieving revision 1.5.10.1
retrieving revision 1.5.10.2
diff -u -r1.5.10.1 -r1.5.10.2
--- SerializerFactory.java 27 Jan 2003 19:44:04 -0000 1.5.10.1
+++ SerializerFactory.java 30 Jan 2003 18:41:27 -0000 1.5.10.2
@@ -56,18 +56,12 @@
*/
package org.apache.xalan.serialize;
-import javax.xml.transform.OutputKeys;
-
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
-import java.util.StringTokenizer;
-import java.io.IOException;
-import java.io.InputStream;
+import javax.xml.transform.OutputKeys;
import org.apache.xalan.templates.OutputProperties;
-import org.apache.xml.utils.WrappedRuntimeException;
/**
* Factory for creating serializers.
1.11.10.2 +5 -14
xml-xalan/java/src/org/apache/xalan/serialize/SerializerToHTML.java
Index: SerializerToHTML.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/SerializerToHTML.java,v
retrieving revision 1.11.10.1
retrieving revision 1.11.10.2
diff -u -r1.11.10.1 -r1.11.10.2
--- SerializerToHTML.java 27 Jan 2003 19:44:04 -0000 1.11.10.1
+++ SerializerToHTML.java 30 Jan 2003 18:41:27 -0000 1.11.10.2
@@ -56,28 +56,19 @@
*/
package org.apache.xalan.serialize;
-import java.util.Stack;
-
-import java.io.Writer;
import java.io.IOException;
-
-import java.util.Hashtable;
-import java.util.Vector;
import java.util.Properties;
-import java.util.BitSet;
-import org.xml.sax.*;
+import javax.xml.transform.Result;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.templates.OutputProperties;
import org.apache.xml.utils.BoolStack;
import org.apache.xml.utils.Trie;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xml.utils.StringToIntTable;
-import org.apache.xalan.templates.OutputProperties;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
/**
* <meta name="usage" content="general"/>
1.4.10.3 +4 -10
xml-xalan/java/src/org/apache/xalan/serialize/SerializerToText.java
Index: SerializerToText.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/SerializerToText.java,v
retrieving revision 1.4.10.2
retrieving revision 1.4.10.3
diff -u -r1.4.10.2 -r1.4.10.3
--- SerializerToText.java 27 Jan 2003 19:44:05 -0000 1.4.10.2
+++ SerializerToText.java 30 Jan 2003 18:41:27 -0000 1.4.10.3
@@ -56,17 +56,11 @@
*/
package org.apache.xalan.serialize;
-import org.xml.sax.*;
+import java.io.IOException;
-import java.util.*;
-
-import java.io.*;
-
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.templates.OutputProperties;
-
-import javax.xml.transform.OutputKeys;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
/**
* <meta name="usage" content="general"/>
1.14.2.7 +17 -21
xml-xalan/java/src/org/apache/xalan/serialize/SerializerToXML.java
Index: SerializerToXML.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/SerializerToXML.java,v
retrieving revision 1.14.2.6
retrieving revision 1.14.2.7
diff -u -r1.14.2.6 -r1.14.2.7
--- SerializerToXML.java 27 Jan 2003 19:44:05 -0000 1.14.2.6
+++ SerializerToXML.java 30 Jan 2003 18:41:27 -0000 1.14.2.7
@@ -56,39 +56,35 @@
*/
package org.apache.xalan.serialize;
-import java.io.Writer;
+import java.io.IOException;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
-import java.io.IOException;
-
-import java.util.Enumeration;
-import java.util.Stack;
-import java.util.Vector;
+import java.io.Writer;
+import java.util.BitSet;
import java.util.Hashtable;
import java.util.Properties;
-import java.util.BitSet;
-
-import org.xml.sax.*;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.ext.DeclHandler;
+import java.util.Vector;
-import org.w3c.dom.Node;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
-import org.apache.xalan.serialize.Serializer;
-import org.apache.xalan.serialize.DOMSerializer;
-import org.apache.xml.utils.QName;
+import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.templates.OutputProperties;
import org.apache.xml.utils.BoolStack;
+import org.apache.xml.utils.QName;
+import org.apache.xml.utils.SystemIDResolver;
import org.apache.xml.utils.TreeWalker;
import org.apache.xml.utils.WrappedRuntimeException;
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.res.XPATHErrorResources;
-import javax.xml.transform.Result;
-import javax.xml.transform.OutputKeys;
+import org.w3c.dom.Node;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.DeclHandler;
+import org.xml.sax.ext.LexicalHandler;
/**
* <meta name="usage" content="general"/>
1.2.12.2 +3 -1
xml-xalan/java/src/org/apache/xalan/serialize/WriterToASCI.java
Index: WriterToASCI.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/WriterToASCI.java,v
retrieving revision 1.2.12.1
retrieving revision 1.2.12.2
diff -u -r1.2.12.1 -r1.2.12.2
--- WriterToASCI.java 27 Jan 2003 19:44:05 -0000 1.2.12.1
+++ WriterToASCI.java 30 Jan 2003 18:41:27 -0000 1.2.12.2
@@ -56,7 +56,9 @@
*/
package org.apache.xalan.serialize;
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
/**
* This class writes ASCII to a byte stream as quickly as possible. For the
1.2.12.2 +4 -1
xml-xalan/java/src/org/apache/xalan/serialize/WriterToUTF8.java
Index: WriterToUTF8.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/WriterToUTF8.java,v
retrieving revision 1.2.12.1
retrieving revision 1.2.12.2
diff -u -r1.2.12.1 -r1.2.12.2
--- WriterToUTF8.java 27 Jan 2003 19:44:05 -0000 1.2.12.1
+++ WriterToUTF8.java 30 Jan 2003 18:41:27 -0000 1.2.12.2
@@ -56,7 +56,10 @@
*/
package org.apache.xalan.serialize;
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
/**
* This class writes ASCII to a byte stream as quickly as possible. For the
1.4.10.2 +4 -1
xml-xalan/java/src/org/apache/xalan/serialize/WriterToUTF8Buffered.java
Index: WriterToUTF8Buffered.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/WriterToUTF8Buffered.java,v
retrieving revision 1.4.10.1
retrieving revision 1.4.10.2
diff -u -r1.4.10.1 -r1.4.10.2
--- WriterToUTF8Buffered.java 27 Jan 2003 19:44:05 -0000 1.4.10.1
+++ WriterToUTF8Buffered.java 30 Jan 2003 18:41:27 -0000 1.4.10.2
@@ -56,7 +56,10 @@
*/
package org.apache.xalan.serialize;
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
No revision
No revision
1.17.2.3 +7 -13 xml-xalan/java/src/org/apache/xalan/templates/AVT.java
Index: AVT.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/AVT.java,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -r1.17.2.2 -r1.17.2.3
--- AVT.java 27 Jan 2003 19:44:06 -0000 1.17.2.2
+++ AVT.java 30 Jan 2003 18:41:28 -0000 1.17.2.3
@@ -56,24 +56,18 @@
*/
package org.apache.xalan.templates;
-import org.apache.xml.dtm.DTM;
-
-import java.util.Vector;
import java.util.StringTokenizer;
-
-import org.apache.xml.utils.StringBufferPool;
-import org.apache.xml.utils.FastStringBuffer;
+import java.util.Vector;
import javax.xml.transform.TransformerException;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.processor.StylesheetHandler;
-
-import javax.xml.transform.ErrorListener;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xml.utils.FastStringBuffer;
+import org.apache.xml.utils.StringBufferPool;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="advanced"/>
1.11.2.2 +1 -4
xml-xalan/java/src/org/apache/xalan/templates/AVTPart.java
Index: AVTPart.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/AVTPart.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- AVTPart.java 27 Jan 2003 19:44:06 -0000 1.11.2.1
+++ AVTPart.java 30 Jan 2003 18:41:28 -0000 1.11.2.2
@@ -56,11 +56,8 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.apache.xpath.XPathContext;
import org.apache.xml.utils.FastStringBuffer;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="internal"/>
1.11.2.2 +1 -3
xml-xalan/java/src/org/apache/xalan/templates/AVTPartSimple.java
Index: AVTPartSimple.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/AVTPartSimple.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- AVTPartSimple.java 27 Jan 2003 19:44:06 -0000 1.11.2.1
+++ AVTPartSimple.java 30 Jan 2003 18:41:28 -0000 1.11.2.2
@@ -56,10 +56,8 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-
-import org.apache.xpath.XPathContext;
import org.apache.xml.utils.FastStringBuffer;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="internal"/>
1.14.2.2 +4 -8
xml-xalan/java/src/org/apache/xalan/templates/AVTPartXPath.java
Index: AVTPartXPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/AVTPartXPath.java,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -r1.14.2.1 -r1.14.2.2
--- AVTPartXPath.java 27 Jan 2003 19:44:06 -0000 1.14.2.1
+++ AVTPartXPath.java 30 Jan 2003 18:41:28 -0000 1.14.2.2
@@ -56,16 +56,12 @@
*/
package org.apache.xalan.templates;
-import org.apache.xpath.*;
-import org.apache.xpath.Expression;
-import org.apache.xpath.objects.XObject;
+import org.apache.xml.utils.FastStringBuffer;
+import org.apache.xpath.XPath;
import org.apache.xpath.XPathContext;
+import org.apache.xpath.XPathFactory;
import org.apache.xpath.compiler.XPathParser;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xpath.ExpressionOwner;
-
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="internal"/>
1.12.16.6 +0 -1
xml-xalan/java/src/org/apache/xalan/templates/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/Constants.java,v
retrieving revision 1.12.16.5
retrieving revision 1.12.16.6
diff -u -r1.12.16.5 -r1.12.16.6
--- Constants.java 27 Jan 2003 19:44:06 -0000 1.12.16.5
+++ Constants.java 30 Jan 2003 18:41:28 -0000 1.12.16.6
@@ -56,7 +56,6 @@
*/
package org.apache.xalan.templates;
-import org.apache.xml.utils.res.XResourceBundle;
/**
* <meta name="usage" content="advanced"/>
1.10.16.2 +0 -12
xml-xalan/java/src/org/apache/xalan/templates/DecimalFormatProperties.java
Index: DecimalFormatProperties.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/DecimalFormatProperties.java,v
retrieving revision 1.10.16.1
retrieving revision 1.10.16.2
diff -u -r1.10.16.1 -r1.10.16.2
--- DecimalFormatProperties.java 27 Jan 2003 19:44:07 -0000
1.10.16.1
+++ DecimalFormatProperties.java 30 Jan 2003 18:41:28 -0000
1.10.16.2
@@ -56,21 +56,9 @@
*/
package org.apache.xalan.templates;
-import org.w3c.dom.*;
-
-import org.xml.sax.*;
-
-import org.apache.xpath.*;
-
-import java.util.*;
-
-import java.text.NumberFormat;
-import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import org.apache.xml.utils.QName;
-import org.apache.xalan.res.*;
-import org.apache.xalan.transformer.TransformerImpl;
/**
* <meta name="usage" content="advanced"/>
1.10.2.2 +1 -5
xml-xalan/java/src/org/apache/xalan/templates/ElemApplyImport.java
Index: ElemApplyImport.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemApplyImport.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- ElemApplyImport.java 27 Jan 2003 19:44:07 -0000 1.10.2.1
+++ ElemApplyImport.java 30 Jan 2003 18:41:28 -0000 1.10.2.2
@@ -56,15 +56,11 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.Node;
-//import org.w3c.dom.DOMException;
-import org.apache.xml.dtm.DTM;
-
import javax.xml.transform.TransformerException;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xml.utils.QName;
+import org.apache.xml.dtm.DTM;
/**
* <meta name="usage" content="advanced"/>
1.23.2.5 +2 -2
xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java
Index: ElemApplyTemplates.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java,v
retrieving revision 1.23.2.4
retrieving revision 1.23.2.5
diff -u -r1.23.2.4 -r1.23.2.5
--- ElemApplyTemplates.java 27 Jan 2003 19:44:07 -0000 1.23.2.4
+++ ElemApplyTemplates.java 30 Jan 2003 18:41:28 -0000 1.23.2.5
@@ -56,15 +56,16 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
import java.util.Vector;
import javax.xml.transform.TransformerException;
+
import org.apache.xalan.transformer.ResultTreeHandler;
import org.apache.xalan.transformer.StackGuard;
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.utils.IntStack;
import org.apache.xml.utils.QName;
import org.apache.xpath.VariableStack;
import org.apache.xpath.XPath;
@@ -72,7 +73,6 @@
import org.apache.xpath.objects.XObject;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import org.apache.xml.utils.IntStack;
/**
* <meta name="usage" content="advanced"/>
1.17.2.4 +2 -8
xml-xalan/java/src/org/apache/xalan/templates/ElemAttribute.java
Index: ElemAttribute.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemAttribute.java,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -u -r1.17.2.3 -r1.17.2.4
--- ElemAttribute.java 27 Jan 2003 19:44:07 -0000 1.17.2.3
+++ ElemAttribute.java 30 Jan 2003 18:41:28 -0000 1.17.2.4
@@ -56,18 +56,12 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.Node;
-//import org.w3c.dom.DOMException;
-import org.apache.xml.dtm.DTM;
-
import javax.xml.transform.TransformerException;
-import org.apache.xml.utils.QName;
import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.transformer.ResultTreeHandler;
-import org.apache.xpath.XPathContext;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.utils.QName;
import org.xml.sax.SAXException;
1.9.12.2 +2 -8
xml-xalan/java/src/org/apache/xalan/templates/ElemAttributeSet.java
Index: ElemAttributeSet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemAttributeSet.java,v
retrieving revision 1.9.12.1
retrieving revision 1.9.12.2
diff -u -r1.9.12.1 -r1.9.12.2
--- ElemAttributeSet.java 27 Jan 2003 19:44:07 -0000 1.9.12.1
+++ ElemAttributeSet.java 30 Jan 2003 18:41:28 -0000 1.9.12.2
@@ -56,18 +56,12 @@
*/
package org.apache.xalan.templates;
-import org.w3c.dom.Node;
-import org.w3c.dom.DOMException;
-
import javax.xml.transform.TransformerException;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.res.XSLMessages;
-
-import java.util.Stack;
-
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.utils.QName;
/**
* <meta name="usage" content="advanced"/>
1.21.2.2 +1 -0
xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java
Index: ElemCallTemplate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- ElemCallTemplate.java 27 Jan 2003 19:44:07 -0000 1.21.2.1
+++ ElemCallTemplate.java 30 Jan 2003 18:41:28 -0000 1.21.2.2
@@ -58,6 +58,7 @@
import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
+
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xml.utils.QName;
1.14.2.2 +3 -10
xml-xalan/java/src/org/apache/xalan/templates/ElemChoose.java
Index: ElemChoose.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemChoose.java,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -r1.14.2.1 -r1.14.2.2
--- ElemChoose.java 27 Jan 2003 19:44:07 -0000 1.14.2.1
+++ ElemChoose.java 30 Jan 2003 18:41:28 -0000 1.14.2.2
@@ -56,19 +56,12 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xpath.objects.XObject;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xml.utils.QName;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.9.2.2 +1 -8
xml-xalan/java/src/org/apache/xalan/templates/ElemComment.java
Index: ElemComment.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemComment.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- ElemComment.java 27 Jan 2003 19:44:07 -0000 1.9.2.1
+++ ElemComment.java 30 Jan 2003 18:41:28 -0000 1.9.2.2
@@ -56,17 +56,10 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xml.utils.QName;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
-
-import javax.xml.transform.TransformerException;
/**
* <meta name="usage" content="advanced"/>
1.15.2.2 +5 -15
xml-xalan/java/src/org/apache/xalan/templates/ElemCopy.java
Index: ElemCopy.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemCopy.java,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- ElemCopy.java 27 Jan 2003 19:44:08 -0000 1.15.2.1
+++ ElemCopy.java 30 Jan 2003 18:41:28 -0000 1.15.2.2
@@ -56,23 +56,13 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
-
-import org.apache.xpath.*;
-
-import java.util.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.trace.*;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.transformer.ResultTreeHandler;
import org.apache.xalan.transformer.ClonerToResultTree;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xalan.transformer.ResultTreeHandler;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.dtm.DTM;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="advanced"/>
1.14.2.2 +8 -14
xml-xalan/java/src/org/apache/xalan/templates/ElemCopyOf.java
Index: ElemCopyOf.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemCopyOf.java,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -r1.14.2.1 -r1.14.2.2
--- ElemCopyOf.java 27 Jan 2003 19:44:08 -0000 1.14.2.1
+++ ElemCopyOf.java 30 Jan 2003 18:41:28 -0000 1.14.2.2
@@ -56,24 +56,18 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-//import org.w3c.dom.traversal.NodeIterator;
+import javax.xml.transform.TransformerException;
+
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.transformer.ResultTreeHandler;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xalan.transformer.TreeWalker2Result;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.ref.DTMTreeWalker;
-
-import org.xml.sax.*;
-
-import org.apache.xpath.*;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.transformer.TreeWalker2Result;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.transformer.ResultTreeHandler;
-
-import javax.xml.transform.TransformerException;
/**
* <meta name="usage" content="advanced"/>
1.25.2.4 +5 -9
xml-xalan/java/src/org/apache/xalan/templates/ElemElement.java
Index: ElemElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemElement.java,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -u -r1.25.2.3 -r1.25.2.4
--- ElemElement.java 27 Jan 2003 19:44:08 -0000 1.25.2.3
+++ ElemElement.java 30 Jan 2003 18:41:28 -0000 1.25.2.4
@@ -56,18 +56,14 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xml.utils.QName;
import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.transformer.ResultTreeHandler;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.utils.QName;
+import org.apache.xpath.XPathContext;
+import org.xml.sax.SAXException;
/**
* <meta name="usage" content="advanced"/>
1.3.16.2 +0 -6
xml-xalan/java/src/org/apache/xalan/templates/ElemEmpty.java
Index: ElemEmpty.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemEmpty.java,v
retrieving revision 1.3.16.1
retrieving revision 1.3.16.2
diff -u -r1.3.16.1 -r1.3.16.2
--- ElemEmpty.java 27 Jan 2003 19:44:08 -0000 1.3.16.1
+++ ElemEmpty.java 30 Jan 2003 18:41:28 -0000 1.3.16.2
@@ -56,12 +56,6 @@
*/
package org.apache.xalan.templates;
-import org.w3c.dom.*;
-
-import org.xml.sax.*;
-
-import org.apache.xpath.*;
-import org.apache.xalan.transformer.TransformerImpl;
/**
* <meta name="usage" content="internal"/>
1.3.2.2 +3 -16
xml-xalan/java/src/org/apache/xalan/templates/ElemExsltFuncResult.java
Index: ElemExsltFuncResult.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExsltFuncResult.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- ElemExsltFuncResult.java 27 Jan 2003 19:44:08 -0000 1.3.2.1
+++ ElemExsltFuncResult.java 30 Jan 2003 18:41:28 -0000 1.3.2.2
@@ -56,24 +56,11 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xpath.Expression;
-import org.apache.xpath.objects.XObjectFactory;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.objects.XRTreeFrag;
-import org.apache.xpath.objects.XRTreeFragSelectWrapper;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XObject;
/**
* Handles the EXSLT result element within an EXSLT function element.
1.3.2.2 +5 -21
xml-xalan/java/src/org/apache/xalan/templates/ElemExsltFunction.java
Index: ElemExsltFunction.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExsltFunction.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- ElemExsltFunction.java 27 Jan 2003 19:44:08 -0000 1.3.2.1
+++ ElemExsltFunction.java 30 Jan 2003 18:41:28 -0000 1.3.2.2
@@ -56,32 +56,16 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xpath.Expression;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XRTreeFrag;
-import org.apache.xpath.objects.XRTreeFragSelectWrapper;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.extensions.ExtensionNamespaceSupport;
import org.apache.xalan.transformer.TransformerImpl;
-
-import org.apache.xalan.extensions.ExtensionsTable;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.VariableStack;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XObject;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
-import org.apache.xalan.extensions.ExtensionNamespaceSupport;
-import org.apache.xalan.extensions.ExtensionHandlerExsltFunction;
/**
1.27.2.5 +4 -22
xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java
Index: ElemExtensionCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java,v
retrieving revision 1.27.2.4
retrieving revision 1.27.2.5
diff -u -r1.27.2.4 -r1.27.2.5
--- ElemExtensionCall.java 27 Jan 2003 19:44:08 -0000 1.27.2.4
+++ ElemExtensionCall.java 30 Jan 2003 18:41:28 -0000 1.27.2.5
@@ -56,32 +56,14 @@
*/
package org.apache.xalan.templates;
-import java.io.*;
-
-import java.util.*;
-
-//import org.w3c.dom.*;
-
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-import java.util.StringTokenizer;
+import javax.xml.transform.TransformerException;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.NameSpace;
-import org.apache.xml.utils.StringToStringTable;
-import org.apache.xpath.XPathContext;
-import org.apache.xml.utils.MutableAttrListImpl;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.XPathContext;
-import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.extensions.ExtensionHandler;
import org.apache.xalan.extensions.ExtensionsTable;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.xml.dtm.DTM;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="advanced"/>
1.16.10.3 +5 -17
xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionDecl.java
Index: ElemExtensionDecl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionDecl.java,v
retrieving revision 1.16.10.2
retrieving revision 1.16.10.3
diff -u -r1.16.10.2 -r1.16.10.3
--- ElemExtensionDecl.java 27 Jan 2003 19:44:08 -0000 1.16.10.2
+++ ElemExtensionDecl.java 30 Jan 2003 18:41:28 -0000 1.16.10.3
@@ -56,26 +56,14 @@
*/
package org.apache.xalan.templates;
-import java.util.Vector;
-
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.NameSpace;
-import org.apache.xml.utils.StringToStringTable;
-import org.apache.xml.utils.StringVector;
-import org.apache.xalan.extensions.ExtensionHandler;
-import org.apache.xalan.extensions.ExtensionHandlerGeneral;
-import org.apache.xalan.extensions.ExtensionsTable;
-import org.apache.xalan.transformer.TransformerImpl;
-
import javax.xml.transform.TransformerException;
-import org.apache.xpath.XPathContext;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
-
-// dml
-import org.apache.xalan.extensions.ExtensionNamespacesManager;
import org.apache.xalan.extensions.ExtensionNamespaceSupport;
+import org.apache.xalan.extensions.ExtensionNamespacesManager;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.utils.StringVector;
/**
* <meta name="usage" content="internal"/>
1.12.2.2 +1 -9
xml-xalan/java/src/org/apache/xalan/templates/ElemFallback.java
Index: ElemFallback.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemFallback.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- ElemFallback.java 27 Jan 2003 19:44:08 -0000 1.12.2.1
+++ ElemFallback.java 30 Jan 2003 18:41:28 -0000 1.12.2.2
@@ -56,17 +56,9 @@
*/
package org.apache.xalan.templates;
-import org.w3c.dom.*;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-// import org.apache.xpath.*;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
-
-import javax.xml.transform.TransformerException;
/**
* <meta name="usage" content="advanced"/>
1.28.2.5 +11 -25
xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java
Index: ElemForEach.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java,v
retrieving revision 1.28.2.4
retrieving revision 1.28.2.5
diff -u -r1.28.2.4 -r1.28.2.5
--- ElemForEach.java 27 Jan 2003 19:44:08 -0000 1.28.2.4
+++ ElemForEach.java 30 Jan 2003 18:41:28 -0000 1.28.2.5
@@ -56,36 +56,22 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-//import org.w3c.dom.traversal.NodeIterator;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMManager;
-
-// Experemental
-import org.apache.xml.dtm.ref.ExpandedNameTable;
-
-import org.xml.sax.*;
-
-import org.apache.xpath.*;
-import org.apache.xpath.Expression;
-import org.apache.xpath.axes.ContextNodeList;
-import org.apache.xpath.objects.XObject;
-
import java.util.Vector;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.IntStack;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
+import javax.xml.transform.TransformerException;
+
import org.apache.xalan.transformer.NodeSorter;
import org.apache.xalan.transformer.ResultTreeHandler;
-import org.apache.xalan.transformer.ClonerToResultTree;
-
-import javax.xml.transform.SourceLocator;
-import javax.xml.transform.TransformerException;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.utils.IntStack;
+import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
+import org.xml.sax.ContentHandler;
/**
* <meta name="usage" content="advanced"/>
1.12.2.2 +4 -11 xml-xalan/java/src/org/apache/xalan/templates/ElemIf.java
Index: ElemIf.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemIf.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- ElemIf.java 27 Jan 2003 19:44:08 -0000 1.12.2.1
+++ ElemIf.java 30 Jan 2003 18:41:28 -0000 1.12.2.2
@@ -56,19 +56,12 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xpath.objects.XObject;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.32.2.2 +6 -20
xml-xalan/java/src/org/apache/xalan/templates/ElemLiteralResult.java
Index: ElemLiteralResult.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemLiteralResult.java,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -r1.32.2.1 -r1.32.2.2
--- ElemLiteralResult.java 27 Jan 2003 19:44:08 -0000 1.32.2.1
+++ ElemLiteralResult.java 30 Jan 2003 18:41:28 -0000 1.32.2.2
@@ -56,29 +56,15 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-import java.util.StringTokenizer;
-
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.NameSpace;
-import org.apache.xpath.XPathContext;
-import org.apache.xml.utils.StringToStringTable;
-import org.apache.xml.utils.NameSpace;
-import org.apache.xml.utils.StringVector;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.transformer.ResultTreeHandler;
+import java.util.Enumeration;
+import java.util.Vector;
import javax.xml.transform.TransformerException;
-import java.io.*;
-
-import java.util.*;
+import org.apache.xalan.transformer.ResultTreeHandler;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.utils.StringVector;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="advanced"/>
1.13.2.2 +2 -8
xml-xalan/java/src/org/apache/xalan/templates/ElemMessage.java
Index: ElemMessage.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemMessage.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- ElemMessage.java 27 Jan 2003 19:44:08 -0000 1.13.2.1
+++ ElemMessage.java 30 Jan 2003 18:41:28 -0000 1.13.2.2
@@ -56,17 +56,11 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
-
-import javax.xml.transform.TransformerException;
/**
* <meta name="usage" content="advanced"/>
1.24.2.3 +19 -27
xml-xalan/java/src/org/apache/xalan/templates/ElemNumber.java
Index: ElemNumber.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemNumber.java,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -r1.24.2.2 -r1.24.2.3
--- ElemNumber.java 27 Jan 2003 19:44:09 -0000 1.24.2.2
+++ ElemNumber.java 30 Jan 2003 18:41:28 -0000 1.24.2.3
@@ -56,40 +56,32 @@
*/
package org.apache.xalan.templates;
-import org.apache.xml.utils.res.XResourceBundle;
-
-//import org.w3c.dom.*;
-//import org.w3c.dom.traversal.NodeIterator;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-//import org.w3c.dom.xpath.XPathResult;
-import org.xml.sax.*;
-
-import java.util.*;
-
+import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
-import java.text.DecimalFormat;
+import java.util.Locale;
+import java.util.NoSuchElementException;
-import org.apache.xpath.*;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.compiler.XPathParser;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.PrefixResolverDefault;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.StringBufferPool;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xalan.res.*;
-import org.apache.xalan.transformer.DecimalToRoman;
+import javax.xml.transform.TransformerException;
+
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.CountersTable;
-import org.apache.xalan.transformer.ResultTreeHandler;
+import org.apache.xalan.transformer.DecimalToRoman;
import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.utils.FastStringBuffer;
import org.apache.xml.utils.NodeVector;
+import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.utils.StringBufferPool;
+import org.apache.xml.utils.res.XResourceBundle;
+import org.apache.xpath.NodeSetDTM;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XObject;
-import javax.xml.transform.TransformerException;
+import org.w3c.dom.Node;
+
+import org.xml.sax.SAXException;
// import org.apache.xalan.dtm.*;
1.4.16.2 +0 -7
xml-xalan/java/src/org/apache/xalan/templates/ElemOtherwise.java
Index: ElemOtherwise.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemOtherwise.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- ElemOtherwise.java 27 Jan 2003 19:44:09 -0000 1.4.16.1
+++ ElemOtherwise.java 30 Jan 2003 18:41:28 -0000 1.4.16.2
@@ -56,13 +56,6 @@
*/
package org.apache.xalan.templates;
-import org.w3c.dom.*;
-
-import org.xml.sax.*;
-
-import org.apache.xpath.*;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
/**
* <meta name="usage" content="advanced"/>
1.12.2.3 +2 -8 xml-xalan/java/src/org/apache/xalan/templates/ElemPI.java
Index: ElemPI.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemPI.java,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- ElemPI.java 27 Jan 2003 19:44:09 -0000 1.12.2.2
+++ ElemPI.java 30 Jan 2003 18:41:28 -0000 1.12.2.3
@@ -56,17 +56,11 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xml.utils.QName;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="advanced"/>
1.12.2.2 +3 -9
xml-xalan/java/src/org/apache/xalan/templates/ElemParam.java
Index: ElemParam.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemParam.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- ElemParam.java 27 Jan 2003 19:44:09 -0000 1.12.2.1
+++ ElemParam.java 30 Jan 2003 18:41:28 -0000 1.12.2.2
@@ -56,17 +56,11 @@
*/
package org.apache.xalan.templates;
-import org.w3c.dom.*;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xpath.objects.XObject;
-import org.apache.xalan.trace.*;
-import org.apache.xml.utils.QName;
import org.apache.xalan.transformer.TransformerImpl;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.VariableStack;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.7.12.2 +4 -6
xml-xalan/java/src/org/apache/xalan/templates/ElemSort.java
Index: ElemSort.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemSort.java,v
retrieving revision 1.7.12.1
retrieving revision 1.7.12.2
diff -u -r1.7.12.1 -r1.7.12.2
--- ElemSort.java 27 Jan 2003 19:44:09 -0000 1.7.12.1
+++ ElemSort.java 30 Jan 2003 18:41:28 -0000 1.7.12.2
@@ -56,13 +56,11 @@
*/
package org.apache.xalan.templates;
-import org.w3c.dom.*;
-
-import org.xml.sax.*;
-
-import org.apache.xpath.*;
import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xpath.XPath;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
/**
* <meta name="usage" content="advanced"/>
1.15.2.3 +5 -9
xml-xalan/java/src/org/apache/xalan/templates/ElemTemplate.java
Index: ElemTemplate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemTemplate.java,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -r1.15.2.2 -r1.15.2.3
--- ElemTemplate.java 27 Jan 2003 19:44:09 -0000 1.15.2.2
+++ ElemTemplate.java 30 Jan 2003 18:41:28 -0000 1.15.2.3
@@ -56,17 +56,13 @@
*/
package org.apache.xalan.templates;
-import org.w3c.dom.*;
-
-import org.xml.sax.*;
-
-import org.apache.xpath.*;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-
import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
+
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.utils.QName;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="advanced"/>
1.48.2.6 +10 -27
xml-xalan/java/src/org/apache/xalan/templates/ElemTemplateElement.java
Index: ElemTemplateElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemTemplateElement.java,v
retrieving revision 1.48.2.5
retrieving revision 1.48.2.6
diff -u -r1.48.2.5 -r1.48.2.6
--- ElemTemplateElement.java 27 Jan 2003 19:44:09 -0000 1.48.2.5
+++ ElemTemplateElement.java 30 Jan 2003 18:41:28 -0000 1.48.2.6
@@ -56,45 +56,28 @@
*/
package org.apache.xalan.templates;
-import java.lang.InstantiationException;
-
import java.io.Serializable;
-
import java.util.Enumeration;
import java.util.Vector;
-// Xalan imports
-import org.apache.xml.utils.UnImplNode;
-import org.apache.xml.utils.NameSpace;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.StringToStringTable;
-import org.apache.xalan.res.XSLTErrorResources;
+import javax.xml.transform.SourceLocator;
+import javax.xml.transform.TransformerException;
+
import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.transformer.ResultNameSpace;
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.ResultTreeHandler;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.WhitespaceStrippingElementMatcher;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.utils.UnImplNode;
import org.apache.xpath.ExpressionNode;
+import org.apache.xpath.WhitespaceStrippingElementMatcher;
-// TRaX imports
-import javax.xml.transform.Templates;
-import javax.xml.transform.SourceLocator;
-
-// DOM Imports
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
-import org.apache.xml.dtm.DTM;
-
-// SAX Imports
-import org.xml.sax.Locator;
-import javax.xml.transform.TransformerException;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import org.xml.sax.helpers.NamespaceSupport;
-import org.apache.xml.utils.NamespaceSupport2;
/**
* <meta name="usage" content="advanced"/>
1.5.12.2 +0 -10
xml-xalan/java/src/org/apache/xalan/templates/ElemText.java
Index: ElemText.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemText.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- ElemText.java 27 Jan 2003 19:44:09 -0000 1.5.12.1
+++ ElemText.java 30 Jan 2003 18:41:29 -0000 1.5.12.2
@@ -56,17 +56,7 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
-
import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-
-import java.io.*;
-
-import java.util.*;
/**
* <meta name="usage" content="advanced"/>
1.10.2.2 +3 -7
xml-xalan/java/src/org/apache/xalan/templates/ElemTextLiteral.java
Index: ElemTextLiteral.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemTextLiteral.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- ElemTextLiteral.java 27 Jan 2003 19:44:09 -0000 1.10.2.1
+++ ElemTextLiteral.java 30 Jan 2003 18:41:29 -0000 1.10.2.2
@@ -56,15 +56,11 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.transformer.ResultTreeHandler;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.xml.sax.SAXException;
/**
* <meta name="usage" content="advanced"/>
1.6.12.2 +1 -20
xml-xalan/java/src/org/apache/xalan/templates/ElemUnknown.java
Index: ElemUnknown.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemUnknown.java,v
retrieving revision 1.6.12.1
retrieving revision 1.6.12.2
diff -u -r1.6.12.1 -r1.6.12.2
--- ElemUnknown.java 27 Jan 2003 19:44:10 -0000 1.6.12.1
+++ ElemUnknown.java 30 Jan 2003 18:41:29 -0000 1.6.12.2
@@ -56,28 +56,9 @@
*/
package org.apache.xalan.templates;
-import org.w3c.dom.*;
-
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-import java.util.StringTokenizer;
+import javax.xml.transform.TransformerException;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.NameSpace;
-import org.apache.xpath.XPathContext;
-import org.apache.xml.utils.StringToStringTable;
-import org.apache.xml.utils.NameSpace;
-import org.apache.xml.utils.StringVector;
-import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.transformer.ResultTreeHandler;
-
-import java.io.*;
-
-import java.util.*;
-
-import javax.xml.transform.TransformerException;
/**
* <meta name="usage" content="advanced"/>
1.13.2.2 +1 -7
xml-xalan/java/src/org/apache/xalan/templates/ElemUse.java
Index: ElemUse.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemUse.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- ElemUse.java 27 Jan 2003 19:44:10 -0000 1.13.2.1
+++ ElemUse.java 30 Jan 2003 18:41:29 -0000 1.13.2.2
@@ -58,16 +58,10 @@
import java.util.Vector;
-import org.apache.xml.dtm.DTM;
-
import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xml.utils.QName;
-
-import java.util.StringTokenizer;
-
import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.utils.QName;
/**
* <meta name="usage" content="advanced"/>
1.18.2.3 +8 -16
xml-xalan/java/src/org/apache/xalan/templates/ElemValueOf.java
Index: ElemValueOf.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemValueOf.java,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -r1.18.2.2 -r1.18.2.3
--- ElemValueOf.java 27 Jan 2003 19:44:10 -0000 1.18.2.2
+++ ElemValueOf.java 30 Jan 2003 18:41:29 -0000 1.18.2.3
@@ -56,25 +56,17 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xpath.objects.XString;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xalan.trace.SelectionEvent;
import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.transformer.ResultTreeHandler;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.XMLString;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.dtm.DTM;
+import org.apache.xpath.Expression;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XObject;
+import org.xml.sax.SAXException;
/**
* <meta name="usage" content="advanced"/>
1.17.2.4 +6 -13
xml-xalan/java/src/org/apache/xalan/templates/ElemVariable.java
Index: ElemVariable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemVariable.java,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -u -r1.17.2.3 -r1.17.2.4
--- ElemVariable.java 27 Jan 2003 19:44:10 -0000 1.17.2.3
+++ ElemVariable.java 30 Jan 2003 18:41:29 -0000 1.17.2.4
@@ -56,23 +56,16 @@
*/
package org.apache.xalan.templates;
-//import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xpath.Expression;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.utils.QName;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XString;
import org.apache.xpath.objects.XRTreeFrag;
import org.apache.xpath.objects.XRTreeFragSelectWrapper;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.objects.XString;
/**
* <meta name="usage" content="advanced"/>
1.2.2.2 +1 -0
xml-xalan/java/src/org/apache/xalan/templates/ElemVariablePsuedo.java
Index: ElemVariablePsuedo.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemVariablePsuedo.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- ElemVariablePsuedo.java 27 Jan 2003 19:44:10 -0000 1.2.2.1
+++ ElemVariablePsuedo.java 30 Jan 2003 18:41:29 -0000 1.2.2.2
@@ -57,6 +57,7 @@
package org.apache.xalan.templates;
import javax.xml.transform.TransformerException;
+
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xpath.XPath;
1.7.2.2 +1 -7
xml-xalan/java/src/org/apache/xalan/templates/ElemWhen.java
Index: ElemWhen.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemWhen.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- ElemWhen.java 27 Jan 2003 19:44:10 -0000 1.7.2.1
+++ ElemWhen.java 30 Jan 2003 18:41:29 -0000 1.7.2.2
@@ -56,13 +56,7 @@
*/
package org.apache.xalan.templates;
-import org.w3c.dom.*;
-
-import org.xml.sax.*;
-
-import org.apache.xpath.*;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xpath.XPath;
/**
* <meta name="usage" content="advanced"/>
1.9.2.2 +6 -9
xml-xalan/java/src/org/apache/xalan/templates/ElemWithParam.java
Index: ElemWithParam.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemWithParam.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- ElemWithParam.java 27 Jan 2003 19:44:10 -0000 1.9.2.1
+++ ElemWithParam.java 30 Jan 2003 18:41:29 -0000 1.9.2.2
@@ -56,18 +56,15 @@
*/
package org.apache.xalan.templates;
-import org.w3c.dom.*;
-
-import org.xml.sax.*;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.*;
-import org.apache.xpath.objects.XString;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.utils.QName;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XRTreeFrag;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.transformer.TransformerImpl;
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.objects.XString;
/**
* <meta name="usage" content="advanced"/>
1.26.2.4 +14 -28
xml-xalan/java/src/org/apache/xalan/templates/FuncDocument.java
Index: FuncDocument.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/FuncDocument.java,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -u -r1.26.2.3 -r1.26.2.4
--- FuncDocument.java 27 Jan 2003 19:44:10 -0000 1.26.2.3
+++ FuncDocument.java 30 Jan 2003 18:41:29 -0000 1.26.2.4
@@ -56,42 +56,28 @@
*/
package org.apache.xalan.templates;
-import java.util.Vector;
-
-import java.io.StringWriter;
-import java.io.PrintWriter;
import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Source;
+import javax.xml.transform.SourceLocator;
+import javax.xml.transform.TransformerException;
+
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMManager;
-
+import org.apache.xml.utils.XMLString;
+import org.apache.xpath.Expression;
import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.functions.Function;
+import org.apache.xpath.SourceTreeManager;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.functions.Function2Args;
import org.apache.xpath.functions.WrongNumberArgsException;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.SourceTreeManager;
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPathContext;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xpath.XPathContext;
-import org.apache.xalan.transformer.TransformerImpl;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.SourceLocator;
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.Source;
-
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xml.utils.XMLString;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.16.10.4 +8 -14
xml-xalan/java/src/org/apache/xalan/templates/FuncFormatNumb.java
Index: FuncFormatNumb.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/FuncFormatNumb.java,v
retrieving revision 1.16.10.3
retrieving revision 1.16.10.4
diff -u -r1.16.10.3 -r1.16.10.4
--- FuncFormatNumb.java 27 Jan 2003 19:44:11 -0000 1.16.10.3
+++ FuncFormatNumb.java 30 Jan 2003 18:41:29 -0000 1.16.10.4
@@ -56,25 +56,19 @@
*/
package org.apache.xalan.templates;
-import java.util.Vector;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.TransformerException;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xml.utils.QName;
-import org.apache.xpath.functions.Function;
-import org.apache.xpath.functions.Function3Args;
+import org.apache.xml.utils.SAXSourceLocator;
+import org.apache.xpath.Expression;
import org.apache.xpath.XPathContext;
+import org.apache.xpath.functions.Function3Args;
+import org.apache.xpath.functions.WrongNumberArgsException;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
-import org.apache.xpath.XPath;
-import org.apache.xpath.Expression;
-import org.apache.xpath.functions.WrongNumberArgsException;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-
-import org.w3c.dom.Node;
-
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.ErrorListener;
-import org.apache.xml.utils.SAXSourceLocator;
/**
* <meta name="usage" content="advanced"/>
1.14.2.3 +7 -15
xml-xalan/java/src/org/apache/xalan/templates/FuncKey.java
Index: FuncKey.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/FuncKey.java,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- FuncKey.java 27 Jan 2003 19:44:11 -0000 1.14.2.2
+++ FuncKey.java 30 Jan 2003 18:41:29 -0000 1.14.2.3
@@ -56,27 +56,19 @@
*/
package org.apache.xalan.templates;
-import java.util.Vector;
import java.util.Hashtable;
-import org.apache.xpath.functions.Function;
-import org.apache.xpath.functions.Function2Args;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.axes.LocPathIterator;
-import org.apache.xpath.axes.UnionPathIterator;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.transformer.KeyManager;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xpath.XPathContext;
-
+import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-
+import org.apache.xml.utils.QName;
import org.apache.xml.utils.XMLString;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.axes.UnionPathIterator;
+import org.apache.xpath.functions.Function2Args;
+import org.apache.xpath.objects.XNodeSet;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.8.12.2 +1 -1
xml-xalan/java/src/org/apache/xalan/templates/KeyDeclaration.java
Index: KeyDeclaration.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/KeyDeclaration.java,v
retrieving revision 1.8.12.1
retrieving revision 1.8.12.2
diff -u -r1.8.12.1 -r1.8.12.2
--- KeyDeclaration.java 27 Jan 2003 19:44:11 -0000 1.8.12.1
+++ KeyDeclaration.java 30 Jan 2003 18:41:29 -0000 1.8.12.2
@@ -56,8 +56,8 @@
*/
package org.apache.xalan.templates;
-import org.apache.xpath.XPath;
import org.apache.xml.utils.QName;
+import org.apache.xpath.XPath;
/**
* <meta name="usage" content="internal"/>
1.20.10.6 +0 -1
xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java
Index: OutputProperties.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java,v
retrieving revision 1.20.10.5
retrieving revision 1.20.10.6
diff -u -r1.20.10.5 -r1.20.10.6
--- OutputProperties.java 27 Jan 2003 19:44:11 -0000 1.20.10.5
+++ OutputProperties.java 30 Jan 2003 18:41:29 -0000 1.20.10.6
@@ -60,7 +60,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.Properties;
import java.util.Vector;
1.2.2.3 +0 -1
xml-xalan/java/src/org/apache/xalan/templates/RedundentExprEliminator.java
Index: RedundentExprEliminator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/RedundentExprEliminator.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- RedundentExprEliminator.java 27 Jan 2003 19:44:11 -0000 1.2.2.2
+++ RedundentExprEliminator.java 30 Jan 2003 18:41:29 -0000 1.2.2.3
@@ -75,7 +75,6 @@
import org.apache.xpath.axes.WalkingIterator;
import org.apache.xpath.operations.Variable;
import org.apache.xpath.operations.VariableSafeAbsRef;
-import org.w3c.dom.DOMException;
/**
* This class eleminates redundent XPaths from a given subtree,
1.25.2.2 +6 -19
xml-xalan/java/src/org/apache/xalan/templates/Stylesheet.java
Index: Stylesheet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/Stylesheet.java,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -r1.25.2.1 -r1.25.2.2
--- Stylesheet.java 27 Jan 2003 19:44:11 -0000 1.25.2.1
+++ Stylesheet.java 30 Jan 2003 18:41:29 -0000 1.25.2.2
@@ -56,33 +56,20 @@
*/
package org.apache.xalan.templates;
-// Java imports
-import java.io.ObjectInputStream;
import java.io.IOException;
+import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-
-import java.text.DecimalFormatSymbols;
-
import java.util.Hashtable;
import java.util.Stack;
import java.util.Vector;
-// Xalan imports
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.StringVector;
-import org.apache.xpath.XPath;
-
-// DOM Imports
-//import org.w3c.dom.Node;
-//import org.w3c.dom.Document;
-import org.apache.xml.dtm.DTM;
-
-// SAX2 Imports
+import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
-import org.xml.sax.Locator;
-import javax.xml.transform.SourceLocator;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.utils.QName;
+import org.apache.xml.utils.StringVector;
+import org.apache.xml.utils.SystemIDResolver;
/**
* Represents a stylesheet element.
1.26.6.2 +0 -14
xml-xalan/java/src/org/apache/xalan/templates/StylesheetComposed.java
Index: StylesheetComposed.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/StylesheetComposed.java,v
retrieving revision 1.26.6.1
retrieving revision 1.26.6.2
diff -u -r1.26.6.1 -r1.26.6.2
--- StylesheetComposed.java 27 Jan 2003 19:44:11 -0000 1.26.6.1
+++ StylesheetComposed.java 30 Jan 2003 18:41:29 -0000 1.26.6.2
@@ -57,22 +57,8 @@
package org.apache.xalan.templates;
import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-import javax.xml.transform.TransformerConfigurationException;
-import org.apache.xpath.XPath;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.XPathContext;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.Element;
import javax.xml.transform.TransformerException;
-
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
/**
* Represents a stylesheet that has methods that resolve includes and
1.46.6.3 +17 -32
xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java
Index: StylesheetRoot.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java,v
retrieving revision 1.46.6.2
retrieving revision 1.46.6.3
diff -u -r1.46.6.2 -r1.46.6.3
--- StylesheetRoot.java 27 Jan 2003 19:44:11 -0000 1.46.6.2
+++ StylesheetRoot.java 30 Jan 2003 18:41:29 -0000 1.46.6.3
@@ -56,44 +56,29 @@
*/
package org.apache.xalan.templates;
-// import org.w3c.dom.*;
-import org.apache.xml.dtm.DTM;
-
-import java.util.*;
-
-import java.net.MalformedURLException;
-
-import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Vector;
-import java.io.*;
-
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-import org.apache.xalan.serialize.*;
-import org.apache.xml.utils.*;
-import org.apache.xpath.*;
-import org.apache.xpath.compiler.XPathParser;
-import org.apache.xalan.trace.*;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.processor.XSLTSchema;
-import org.apache.xalan.transformer.TransformerImpl;
-
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.Templates;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.ErrorListener;
+import javax.xml.transform.TransformerException;
-import org.apache.xml.dtm.ref.ExpandedNameTable;
-//dml
-import org.apache.xml.utils.StringVector;
-import org.apache.xalan.extensions.ExtensionNamespaceSupport;
-import org.apache.xalan.extensions.ExtensionHandler;
import org.apache.xalan.extensions.ExtensionNamespacesManager;
+import org.apache.xalan.processor.XSLTSchema;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.serialize.Method;
+import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.ref.ExpandedNameTable;
+import org.apache.xml.utils.IntStack;
+import org.apache.xml.utils.QName;
+import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="general"/>
1.33.2.2 +5 -12
xml-xalan/java/src/org/apache/xalan/templates/TemplateList.java
Index: TemplateList.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/TemplateList.java,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -r1.33.2.1 -r1.33.2.2
--- TemplateList.java 27 Jan 2003 19:44:12 -0000 1.33.2.1
+++ TemplateList.java 30 Jan 2003 18:41:29 -0000 1.33.2.2
@@ -56,27 +56,20 @@
*/
package org.apache.xalan.templates;
+import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
-import java.util.Enumeration;
-
-import java.io.Serializable;
-
-//import org.w3c.dom.Node;
-import org.apache.xml.dtm.DTM;
-
-import org.apache.xml.dtm.ref.ExpandedNameTable;
import javax.xml.transform.TransformerException;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xml.dtm.DTM;
import org.apache.xml.utils.QName;
-import org.apache.xml.utils.PrefixResolver;
+import org.apache.xpath.Expression;
import org.apache.xpath.XPath;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.compiler.PsuedoNames;
import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.Expression;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xpath.XPathContext;
import org.apache.xpath.patterns.StepPattern;
import org.apache.xpath.patterns.UnionPattern;
1.10.12.2 +1 -3
xml-xalan/java/src/org/apache/xalan/templates/TemplateSubPatternAssociation.java
Index: TemplateSubPatternAssociation.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/TemplateSubPatternAssociation.java,v
retrieving revision 1.10.12.1
retrieving revision 1.10.12.2
diff -u -r1.10.12.1 -r1.10.12.2
--- TemplateSubPatternAssociation.java 27 Jan 2003 19:44:12 -0000
1.10.12.1
+++ TemplateSubPatternAssociation.java 30 Jan 2003 18:41:29 -0000
1.10.12.2
@@ -58,14 +58,12 @@
import java.io.Serializable;
-//import org.w3c.dom.Node;
-
import javax.xml.transform.TransformerException;
+import org.apache.xml.utils.QName;
import org.apache.xpath.XPath;
import org.apache.xpath.XPathContext;
import org.apache.xpath.patterns.StepPattern;
-import org.apache.xml.utils.QName;
/**
* A class to contain a match pattern and it's corresponding template.
1.2.2.2 +0 -1
xml-xalan/java/src/org/apache/xalan/templates/XSLTVisitor.java
Index: XSLTVisitor.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/XSLTVisitor.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- XSLTVisitor.java 27 Jan 2003 19:44:12 -0000 1.2.2.1
+++ XSLTVisitor.java 30 Jan 2003 18:41:29 -0000 1.2.2.2
@@ -57,7 +57,6 @@
package org.apache.xalan.templates;
import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.ExpressionOwner;
/**
* A derivation from this class can be passed to a class that implements
1.6.12.3 +3 -11
xml-xalan/java/src/org/apache/xalan/templates/XUnresolvedVariable.java
Index: XUnresolvedVariable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/XUnresolvedVariable.java,v
retrieving revision 1.6.12.2
retrieving revision 1.6.12.3
diff -u -r1.6.12.2 -r1.6.12.3
--- XUnresolvedVariable.java 27 Jan 2003 19:44:12 -0000 1.6.12.2
+++ XUnresolvedVariable.java 30 Jan 2003 18:41:29 -0000 1.6.12.3
@@ -56,19 +56,11 @@
*/
package org.apache.xalan.templates;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xpath.VariableStack;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XRTreeFrag;
-import org.apache.xpath.objects.XString;
-
-import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
-//import org.w3c.dom.DocumentFragment;
-//import org.w3c.dom.Node;
-import org.apache.xml.dtm.DTM;
/**
* An instance of this class holds unto a variable until
1.2.2.2 +0 -1
xml-xalan/java/src/org/apache/xalan/templates/XUnresolvedVariableSimple.java
Index: XUnresolvedVariableSimple.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/XUnresolvedVariableSimple.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- XUnresolvedVariableSimple.java 27 Jan 2003 19:44:12 -0000 1.2.2.1
+++ XUnresolvedVariableSimple.java 30 Jan 2003 18:41:29 -0000 1.2.2.2
@@ -56,7 +56,6 @@
*/
package org.apache.xalan.templates;
-import javax.xml.transform.TransformerException;
import org.apache.xpath.Expression;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
No revision
No revision
1.2.12.2 +2 -2
xml-xalan/java/src/org/apache/xalan/trace/EndSelectionEvent.java
Index: EndSelectionEvent.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/trace/EndSelectionEvent.java,v
retrieving revision 1.2.12.1
retrieving revision 1.2.12.2
diff -u -r1.2.12.1 -r1.2.12.2
--- EndSelectionEvent.java 27 Jan 2003 19:44:16 -0000 1.2.12.1
+++ EndSelectionEvent.java 30 Jan 2003 18:41:32 -0000 1.2.12.2
@@ -56,12 +56,12 @@
*/
package org.apache.xalan.trace;
-import org.w3c.dom.*;
-
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
+
+import org.w3c.dom.Node;
/**
* <meta name="usage" content="advanced"/>
1.6.16.2 +1 -6
xml-xalan/java/src/org/apache/xalan/trace/GenerateEvent.java
Index: GenerateEvent.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/trace/GenerateEvent.java,v
retrieving revision 1.6.16.1
retrieving revision 1.6.16.2
diff -u -r1.6.16.1 -r1.6.16.2
--- GenerateEvent.java 27 Jan 2003 19:44:16 -0000 1.6.16.1
+++ GenerateEvent.java 30 Jan 2003 18:41:32 -0000 1.6.16.2
@@ -56,13 +56,8 @@
*/
package org.apache.xalan.trace;
-import org.xml.sax.*;
-
-import java.util.*;
-
-import java.io.*;
-
import org.apache.xalan.transformer.TransformerImpl;
+import org.xml.sax.Attributes;
/**
* <meta name="usage" content="advanced"/>
1.13.2.3 +4 -8
xml-xalan/java/src/org/apache/xalan/trace/PrintTraceListener.java
Index: PrintTraceListener.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/trace/PrintTraceListener.java,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -r1.13.2.2 -r1.13.2.3
--- PrintTraceListener.java 27 Jan 2003 19:44:16 -0000 1.13.2.2
+++ PrintTraceListener.java 30 Jan 2003 18:41:32 -0000 1.13.2.3
@@ -56,20 +56,16 @@
*/
package org.apache.xalan.trace;
-import java.io.*;
-
-import org.w3c.dom.*;
-import org.w3c.dom.traversal.NodeIterator;
+import javax.xml.transform.SourceLocator;
+import org.apache.xalan.templates.Constants;
import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xalan.templates.Constants;
-import org.apache.xpath.axes.ContextNodeList;
-
-import javax.xml.transform.SourceLocator;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.ref.DTMNodeProxy;
+
+import org.w3c.dom.Node;
/**
* <meta name="usage" content="advanced"/>
1.5.16.2 +2 -2
xml-xalan/java/src/org/apache/xalan/trace/SelectionEvent.java
Index: SelectionEvent.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/trace/SelectionEvent.java,v
retrieving revision 1.5.16.1
retrieving revision 1.5.16.2
diff -u -r1.5.16.1 -r1.5.16.2
--- SelectionEvent.java 27 Jan 2003 19:44:16 -0000 1.5.16.1
+++ SelectionEvent.java 30 Jan 2003 18:41:32 -0000 1.5.16.2
@@ -56,12 +56,12 @@
*/
package org.apache.xalan.trace;
-import org.w3c.dom.*;
-
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
+
+import org.w3c.dom.Node;
/**
* <meta name="usage" content="advanced"/>
1.4.16.2 +0 -1
xml-xalan/java/src/org/apache/xalan/trace/TraceListener.java
Index: TraceListener.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/trace/TraceListener.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- TraceListener.java 27 Jan 2003 19:44:16 -0000 1.4.16.1
+++ TraceListener.java 30 Jan 2003 18:41:32 -0000 1.4.16.2
@@ -56,7 +56,6 @@
*/
package org.apache.xalan.trace;
-import org.w3c.dom.*;
/**
* <meta name="usage" content="advanced"/>
1.11.2.2 +4 -5
xml-xalan/java/src/org/apache/xalan/trace/TraceManager.java
Index: TraceManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/trace/TraceManager.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- TraceManager.java 27 Jan 2003 19:44:17 -0000 1.11.2.1
+++ TraceManager.java 30 Jan 2003 18:41:32 -0000 1.11.2.2
@@ -56,16 +56,15 @@
*/
package org.apache.xalan.trace;
-import java.util.Vector;
import java.util.TooManyListenersException;
+import java.util.Vector;
-import org.w3c.dom.Node;
-
-import org.apache.xml.utils.QName;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.transformer.TransformerImpl;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.XPath;
+import org.apache.xpath.objects.XObject;
+
+import org.w3c.dom.Node;
/**
* This class manages trace listeners, and acts as an
1.5.16.2 +5 -2
xml-xalan/java/src/org/apache/xalan/trace/TracerEvent.java
Index: TracerEvent.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/trace/TracerEvent.java,v
retrieving revision 1.5.16.1
retrieving revision 1.5.16.2
diff -u -r1.5.16.1 -r1.5.16.2
--- TracerEvent.java 27 Jan 2003 19:44:17 -0000 1.5.16.1
+++ TracerEvent.java 30 Jan 2003 18:41:32 -0000 1.5.16.2
@@ -56,11 +56,14 @@
*/
package org.apache.xalan.trace;
-import org.w3c.dom.*;
-
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xml.utils.QName;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* <meta name="usage" content="advanced"/>
No revision
No revision
1.12.10.3 +1 -9
xml-xalan/java/src/org/apache/xalan/transformer/ClonerToResultTree.java
Index: ClonerToResultTree.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/ClonerToResultTree.java,v
retrieving revision 1.12.10.2
retrieving revision 1.12.10.3
diff -u -r1.12.10.2 -r1.12.10.3
--- ClonerToResultTree.java 27 Jan 2003 19:44:18 -0000 1.12.10.2
+++ ClonerToResultTree.java 30 Jan 2003 18:41:33 -0000 1.12.10.3
@@ -56,18 +56,10 @@
*/
package org.apache.xalan.transformer;
-import org.apache.xalan.templates.Stylesheet;
+import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.utils.XMLString;
-
-import javax.xml.transform.TransformerException;
-import org.xml.sax.Attributes;
-
-import org.apache.xpath.XPathContext;
-import org.apache.xalan.res.XSLTErrorResources;
/**
* <meta name="usage" content="internal"/>
1.10.10.2 +3 -9
xml-xalan/java/src/org/apache/xalan/transformer/Counter.java
Index: Counter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/Counter.java,v
retrieving revision 1.10.10.1
retrieving revision 1.10.10.2
diff -u -r1.10.10.1 -r1.10.10.2
--- Counter.java 27 Jan 2003 19:44:18 -0000 1.10.10.1
+++ Counter.java 30 Jan 2003 18:41:33 -0000 1.10.10.2
@@ -56,18 +56,12 @@
*/
package org.apache.xalan.transformer;
-//import org.w3c.dom.Node;
-import org.apache.xml.dtm.DTM;
-
-import org.apache.xml.utils.NodeVector;
-import org.apache.xpath.NodeSetDTM; // for isNodeAfter support
-import org.apache.xpath.XPathContext;
-
import javax.xml.transform.TransformerException;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.XPath;
import org.apache.xalan.templates.ElemNumber;
+import org.apache.xml.dtm.DTM;
+import org.apache.xpath.NodeSetDTM;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="internal"/>
1.9.10.2 +3 -6
xml-xalan/java/src/org/apache/xalan/transformer/CountersTable.java
Index: CountersTable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/CountersTable.java,v
retrieving revision 1.9.10.1
retrieving revision 1.9.10.2
diff -u -r1.9.10.1 -r1.9.10.2
--- CountersTable.java 27 Jan 2003 19:44:18 -0000 1.9.10.1
+++ CountersTable.java 30 Jan 2003 18:41:33 -0000 1.9.10.2
@@ -59,15 +59,12 @@
import java.util.Hashtable;
import java.util.Vector;
-//import org.w3c.dom.Node;
-import org.apache.xml.dtm.DTM;
-
import javax.xml.transform.TransformerException;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.NodeSetDTM;
import org.apache.xalan.templates.ElemNumber;
+import org.apache.xml.dtm.DTM;
+import org.apache.xpath.NodeSetDTM;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="internal"/>
1.12.2.2 +1 -1
xml-xalan/java/src/org/apache/xalan/transformer/KeyIterator.java
Index: KeyIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/KeyIterator.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- KeyIterator.java 27 Jan 2003 19:44:18 -0000 1.12.2.1
+++ KeyIterator.java 30 Jan 2003 18:41:33 -0000 1.12.2.2
@@ -59,6 +59,7 @@
import java.util.Vector;
import javax.xml.transform.TransformerException;
+
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.templates.KeyDeclaration;
@@ -66,7 +67,6 @@
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.utils.QName;
import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
import org.apache.xpath.axes.OneStepIteratorForward;
/**
1.13.2.2 +1 -6
xml-xalan/java/src/org/apache/xalan/transformer/KeyManager.java
Index: KeyManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/KeyManager.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- KeyManager.java 27 Jan 2003 19:44:18 -0000 1.13.2.1
+++ KeyManager.java 30 Jan 2003 18:41:33 -0000 1.13.2.2
@@ -58,16 +58,11 @@
import java.util.Vector;
-//import org.w3c.dom.Node;
-//import org.w3c.dom.NodeList;
-import org.apache.xml.dtm.DTM;
-
import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xml.utils.QName;
import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.utils.QName;
import org.apache.xml.utils.XMLString;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.axes.LocPathIterator;
import org.apache.xpath.objects.XNodeSet;
/**
1.13.2.2 +6 -6
xml-xalan/java/src/org/apache/xalan/transformer/KeyRefIterator.java
Index: KeyRefIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/KeyRefIterator.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- KeyRefIterator.java 27 Jan 2003 19:44:18 -0000 1.13.2.1
+++ KeyRefIterator.java 30 Jan 2003 18:41:33 -0000 1.13.2.2
@@ -56,17 +56,17 @@
*/
package org.apache.xalan.transformer;
+import java.util.Vector;
+
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.templates.KeyDeclaration;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.NodeVector;
+import org.apache.xml.utils.QName;
import org.apache.xml.utils.XMLString;
import org.apache.xpath.objects.XNodeSet;
import org.apache.xpath.objects.XObject;
-import java.util.Vector;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.templates.KeyDeclaration;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.res.XSLTErrorResources;
/**
* <meta name="usage" content="internal"/>
1.11.2.4 +4 -6
xml-xalan/java/src/org/apache/xalan/transformer/KeyTable.java
Index: KeyTable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/KeyTable.java,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -r1.11.2.3 -r1.11.2.4
--- KeyTable.java 27 Jan 2003 19:44:18 -0000 1.11.2.3
+++ KeyTable.java 30 Jan 2003 18:41:33 -0000 1.11.2.4
@@ -61,18 +61,16 @@
import javax.xml.transform.TransformerException;
-import org.apache.xml.utils.NodeVector;
+import org.apache.xalan.templates.KeyDeclaration;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.QName;
-import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.WrappedRuntimeException;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.utils.XMLString;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XNodeSet;
import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNull;
-import org.apache.xalan.templates.KeyDeclaration;
/**
* <meta name="usage" content="advanced"/>
1.10.16.4 +4 -8
xml-xalan/java/src/org/apache/xalan/transformer/MsgMgr.java
Index: MsgMgr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/MsgMgr.java,v
retrieving revision 1.10.16.3
retrieving revision 1.10.16.4
diff -u -r1.10.16.3 -r1.10.16.4
--- MsgMgr.java 27 Jan 2003 19:44:19 -0000 1.10.16.3
+++ MsgMgr.java 30 Jan 2003 18:41:33 -0000 1.10.16.4
@@ -56,17 +56,13 @@
*/
package org.apache.xalan.transformer;
-import org.apache.xalan.res.XSLMessages;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.SourceLocator;
+import javax.xml.transform.TransformerException;
-import org.xml.sax.Locator;
-import org.xml.sax.helpers.LocatorImpl;
+import org.apache.xalan.res.XSLMessages;
import org.w3c.dom.Node;
-
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.dom.DOMLocator;
-import javax.xml.transform.SourceLocator;
/**
* This class will manage error messages, warning messages, and other types
of
1.9.10.2 +2 -4
xml-xalan/java/src/org/apache/xalan/transformer/NodeSortKey.java
Index: NodeSortKey.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/NodeSortKey.java,v
retrieving revision 1.9.10.1
retrieving revision 1.9.10.2
diff -u -r1.9.10.1 -r1.9.10.2
--- NodeSortKey.java 27 Jan 2003 19:44:19 -0000 1.9.10.1
+++ NodeSortKey.java 30 Jan 2003 18:41:33 -0000 1.9.10.2
@@ -56,13 +56,11 @@
*/
package org.apache.xalan.transformer;
-import java.util.Locale;
-
-import org.apache.xpath.XPath;
-
import java.text.Collator;
+import java.util.Locale;
import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xpath.XPath;
/**
* <meta name="usage" content="internal"/>
1.14.2.2 +3 -11
xml-xalan/java/src/org/apache/xalan/transformer/NodeSorter.java
Index: NodeSorter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/NodeSorter.java,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -r1.14.2.1 -r1.14.2.2
--- NodeSorter.java 27 Jan 2003 19:44:19 -0000 1.14.2.1
+++ NodeSorter.java 30 Jan 2003 18:41:33 -0000 1.14.2.2
@@ -56,24 +56,16 @@
*/
package org.apache.xalan.transformer;
+import java.text.CollationKey;
import java.util.Vector;
-import java.text.NumberFormat;
-import java.text.CollationKey;
+import javax.xml.transform.TransformerException;
-//import org.w3c.dom.Node;
-//import org.w3c.dom.traversal.NodeIterator;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-
-import org.apache.xpath.axes.ContextNodeList;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNodeSet;
-import org.apache.xml.utils.NodeVector;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="internal"/>
1.4.16.2 +2 -3
xml-xalan/java/src/org/apache/xalan/transformer/NumeratorFormatter.java
Index: NumeratorFormatter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/NumeratorFormatter.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- NumeratorFormatter.java 27 Jan 2003 19:44:19 -0000 1.4.16.1
+++ NumeratorFormatter.java 30 Jan 2003 18:41:33 -0000 1.4.16.2
@@ -56,11 +56,10 @@
*/
package org.apache.xalan.transformer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
import java.util.Locale;
import java.util.NoSuchElementException;
+
+import org.w3c.dom.Element;
/**
* <meta name="usage" content="internal"/>
1.10.12.2 +0 -7
xml-xalan/java/src/org/apache/xalan/transformer/QueuedEvents.java
Index: QueuedEvents.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/QueuedEvents.java,v
retrieving revision 1.10.12.1
retrieving revision 1.10.12.2
diff -u -r1.10.12.1 -r1.10.12.2
--- QueuedEvents.java 27 Jan 2003 19:44:19 -0000 1.10.12.1
+++ QueuedEvents.java 30 Jan 2003 18:41:33 -0000 1.10.12.2
@@ -56,16 +56,9 @@
*/
package org.apache.xalan.transformer;
-import java.util.Stack;
import java.util.Vector;
-import org.apache.xml.utils.ObjectPool;
-
-import org.xml.sax.Attributes;
-import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.utils.MutableAttrListImpl;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemTemplate;
/**
1.55.2.5 +13 -21
xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java
Index: ResultTreeHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java,v
retrieving revision 1.55.2.4
retrieving revision 1.55.2.5
diff -u -r1.55.2.4 -r1.55.2.5
--- ResultTreeHandler.java 27 Jan 2003 19:44:19 -0000 1.55.2.4
+++ ResultTreeHandler.java 30 Jan 2003 18:41:33 -0000 1.55.2.5
@@ -58,39 +58,31 @@
import java.util.Enumeration;
-import org.apache.xalan.processor.StylesheetHandler;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+
import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xalan.templates.StylesheetRoot;
import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.trace.TraceManager;
+import org.apache.xalan.templates.StylesheetRoot;
import org.apache.xalan.trace.GenerateEvent;
+import org.apache.xalan.trace.TraceManager;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.utils.MutableAttrListImpl;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.TreeWalker;
-import org.apache.xml.utils.ObjectPool;
+import org.apache.xml.utils.NamespaceSupport2;
import org.apache.xml.utils.XMLCharacterRecognizer;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.XPathContext;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMFilter;
+import org.apache.xpath.objects.XObject;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.SAXException;
import org.xml.sax.ErrorHandler;
-
-import org.xml.sax.helpers.NamespaceSupport;
-import org.apache.xml.utils.NamespaceSupport2;
import org.xml.sax.Locator;
-
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.Transformer;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.NamespaceSupport;
/**
* This class is a layer between the direct calls to the result
1.9.12.2 +5 -8
xml-xalan/java/src/org/apache/xalan/transformer/SerializerSwitcher.java
Index: SerializerSwitcher.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/SerializerSwitcher.java,v
retrieving revision 1.9.12.1
retrieving revision 1.9.12.2
diff -u -r1.9.12.1 -r1.9.12.2
--- SerializerSwitcher.java 27 Jan 2003 19:44:20 -0000 1.9.12.1
+++ SerializerSwitcher.java 30 Jan 2003 18:41:33 -0000 1.9.12.2
@@ -56,22 +56,19 @@
*/
package org.apache.xalan.transformer;
-import java.io.Writer;
import java.io.OutputStream;
-
+import java.io.Writer;
import java.util.Properties;
-import org.apache.xalan.templates.StylesheetRoot;
-
-import org.xml.sax.ContentHandler;
-
-import javax.xml.transform.TransformerException;
import javax.xml.transform.OutputKeys;
+import javax.xml.transform.TransformerException;
+import org.apache.xalan.serialize.Method;
import org.apache.xalan.serialize.Serializer;
import org.apache.xalan.serialize.SerializerFactory;
-import org.apache.xalan.serialize.Method;
import org.apache.xalan.templates.OutputProperties;
+
+import org.xml.sax.ContentHandler;
/**
* This is a helper class that decides if Xalan needs to switch
1.6.12.4 +1 -3
xml-xalan/java/src/org/apache/xalan/transformer/StackGuard.java
Index: StackGuard.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/StackGuard.java,v
retrieving revision 1.6.12.3
retrieving revision 1.6.12.4
diff -u -r1.6.12.3 -r1.6.12.4
--- StackGuard.java 27 Jan 2003 19:44:20 -0000 1.6.12.3
+++ StackGuard.java 30 Jan 2003 18:41:33 -0000 1.6.12.4
@@ -56,10 +56,8 @@
*/
package org.apache.xalan.transformer;
-//import org.w3c.dom.Node;
-//import org.w3c.dom.Text;
-//import org.w3c.dom.Element;
import javax.xml.transform.TransformerException;
+
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.templates.Constants;
import org.apache.xalan.templates.ElemTemplate;
1.9.10.2 +10 -13
xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java
Index: TrAXFilter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java,v
retrieving revision 1.9.10.1
retrieving revision 1.9.10.2
diff -u -r1.9.10.1 -r1.9.10.2
--- TrAXFilter.java 27 Jan 2003 19:44:20 -0000 1.9.10.1
+++ TrAXFilter.java 30 Jan 2003 18:41:33 -0000 1.9.10.2
@@ -58,23 +58,20 @@
import java.io.IOException;
-import javax.xml.transform.TransformerException;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.XMLFilterImpl;
-import org.xml.sax.helpers.XMLReaderFactory;
-
+import javax.xml.transform.ErrorListener;
import javax.xml.transform.Templates;
import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.ErrorListener;
-import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLFilterImpl;
+import org.xml.sax.helpers.XMLReaderFactory;
public class TrAXFilter extends XMLFilterImpl
1.6.10.3 +8 -12
xml-xalan/java/src/org/apache/xalan/transformer/TransformSnapshotImpl.java
Index: TransformSnapshotImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformSnapshotImpl.java,v
retrieving revision 1.6.10.2
retrieving revision 1.6.10.3
diff -u -r1.6.10.2 -r1.6.10.3
--- TransformSnapshotImpl.java 27 Jan 2003 19:44:20 -0000 1.6.10.2
+++ TransformSnapshotImpl.java 30 Jan 2003 18:41:33 -0000 1.6.10.3
@@ -56,23 +56,19 @@
*/
package org.apache.xalan.transformer;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.axes.ContextNodeList;
-import org.apache.xml.utils.NodeVector;
-import org.apache.xml.utils.IntStack;
-import org.apache.xml.utils.BoolStack;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xalan.templates.ElemTemplateElement;
-
+import java.util.Enumeration;
import java.util.Stack;
-
-import org.xml.sax.helpers.NamespaceSupport;
+import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.utils.BoolStack;
+import org.apache.xml.utils.IntStack;
import org.apache.xml.utils.NamespaceSupport2;
+import org.apache.xml.utils.NodeVector;
import org.apache.xml.utils.ObjectStack;
+import org.apache.xpath.VariableStack;
+import org.apache.xpath.XPathContext;
-import java.util.Enumeration;
+import org.xml.sax.helpers.NamespaceSupport;
/**
* This class holds a "snapshot" of it's current transformer state,
1.5.16.2 +2 -2
xml-xalan/java/src/org/apache/xalan/transformer/TransformState.java
Index: TransformState.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformState.java,v
retrieving revision 1.5.16.1
retrieving revision 1.5.16.2
diff -u -r1.5.16.1 -r1.5.16.2
--- TransformState.java 27 Jan 2003 19:44:20 -0000 1.5.16.1
+++ TransformState.java 30 Jan 2003 18:41:33 -0000 1.5.16.2
@@ -56,13 +56,13 @@
*/
package org.apache.xalan.transformer;
+import javax.xml.transform.Transformer;
+
import org.apache.xalan.templates.ElemTemplate;
import org.apache.xalan.templates.ElemTemplateElement;
import org.w3c.dom.Node;
import org.w3c.dom.traversal.NodeIterator;
-
-import javax.xml.transform.Transformer;
/**
* This interface is meant to be used by a consumer of
1.15.2.2 +16 -25
xml-xalan/java/src/org/apache/xalan/transformer/TransformerHandlerImpl.java
Index: TransformerHandlerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerHandlerImpl.java,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- TransformerHandlerImpl.java 27 Jan 2003 19:44:20 -0000 1.15.2.1
+++ TransformerHandlerImpl.java 30 Jan 2003 18:41:33 -0000 1.15.2.2
@@ -58,38 +58,29 @@
import java.io.IOException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.ext.LexicalHandler;
-
-import org.apache.xpath.objects.XString;
-
-// import org.xml.sax.ext.DeclHandler;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.Transformer;
import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.sax.TransformerHandler;
-import org.apache.xpath.XPathContext;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.ref.IncrementalSAXSource;
import org.apache.xml.dtm.ref.IncrementalSAXSource_Filter;
import org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
+import org.apache.xpath.XPathContext;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.ext.DeclHandler;
+import org.xml.sax.ext.LexicalHandler;
/**
1.18.10.4 +37 -19
xml-xalan/java/src/org/apache/xalan/transformer/TransformerIdentityImpl.java
Index: TransformerIdentityImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerIdentityImpl.java,v
retrieving revision 1.18.10.3
retrieving revision 1.18.10.4
diff -u -r1.18.10.3 -r1.18.10.4
--- TransformerIdentityImpl.java 27 Jan 2003 19:44:20 -0000
1.18.10.3
+++ TransformerIdentityImpl.java 30 Jan 2003 18:41:33 -0000
1.18.10.4
@@ -56,31 +56,49 @@
*/
package org.apache.xalan.transformer;
-import java.util.Properties;
-import java.util.Hashtable;
-
import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Properties;
-// TRaX Imports
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-import org.xml.sax.ext.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
-import org.apache.xalan.serialize.*;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.serialize.Method;
+import org.apache.xalan.serialize.Serializer;
+import org.apache.xalan.serialize.SerializerFactory;
+import org.apache.xalan.templates.OutputProperties;
import org.apache.xml.utils.DOMBuilder;
import org.apache.xml.utils.TreeWalker;
-import org.apache.xalan.templates.OutputProperties;
-import org.apache.xalan.serialize.Method;
-import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xalan.res.XSLMessages;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Node;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.ext.DeclHandler;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.XMLReaderFactory;
/**
* This class implements an identity transformer for
1.131.2.8 +6 -18
xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java,v
retrieving revision 1.131.2.7
retrieving revision 1.131.2.8
diff -u -r1.131.2.7 -r1.131.2.8
--- TransformerImpl.java 27 Jan 2003 19:44:21 -0000 1.131.2.7
+++ TransformerImpl.java 30 Jan 2003 18:41:33 -0000 1.131.2.8
@@ -56,14 +56,10 @@
*/
package org.apache.xalan.transformer;
-// Java imports
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.util.Enumeration;
-import java.util.NoSuchElementException;
import java.util.Properties;
import java.util.Stack;
import java.util.StringTokenizer;
@@ -80,7 +76,8 @@
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamResult;
-import org.apache.xalan.processor.TransformerFactoryImpl;
+
+import org.apache.xalan.extensions.ExtensionsTable;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.serialize.Method;
@@ -99,7 +96,6 @@
import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.templates.StylesheetComposed;
import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xalan.templates.WhiteSpaceInfo;
import org.apache.xalan.templates.XUnresolvedVariable;
import org.apache.xalan.trace.TraceManager;
import org.apache.xml.dtm.DTM;
@@ -108,34 +104,26 @@
import org.apache.xml.dtm.DTMWSFilter;
import org.apache.xml.utils.BoolStack;
import org.apache.xml.utils.DOMBuilder;
+import org.apache.xml.utils.DOMHelper;
import org.apache.xml.utils.NodeVector;
import org.apache.xml.utils.ObjectPool;
import org.apache.xml.utils.ObjectStack;
import org.apache.xml.utils.QName;
import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xml.utils.WrappedRuntimeException;
-import org.apache.xml.utils.DOMHelper;
import org.apache.xml.utils.ThreadControllerWrapper;
import org.apache.xpath.Arg;
+import org.apache.xpath.ExtensionsProvider;
import org.apache.xpath.VariableStack;
import org.apache.xpath.XPathContext;
+import org.apache.xpath.functions.FuncExtFunction;
import org.apache.xpath.objects.XObject;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
+
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.SAXParseException;
import org.xml.sax.ext.DeclHandler;
import org.xml.sax.ext.LexicalHandler;
-
-//dml
-import org.apache.xpath.ExtensionsProvider;
-import org.apache.xalan.extensions.ExtensionsTable;
-import org.apache.xpath.functions.FuncExtFunction;
/**
* <meta name="usage" content="advanced"/>
1.12.10.3 +0 -6
xml-xalan/java/src/org/apache/xalan/transformer/TreeWalker2Result.java
Index: TreeWalker2Result.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TreeWalker2Result.java,v
retrieving revision 1.12.10.2
retrieving revision 1.12.10.3
diff -u -r1.12.10.2 -r1.12.10.3
--- TreeWalker2Result.java 27 Jan 2003 19:44:21 -0000 1.12.10.2
+++ TreeWalker2Result.java 30 Jan 2003 18:41:34 -0000 1.12.10.3
@@ -56,14 +56,8 @@
*/
package org.apache.xalan.transformer;
-import org.w3c.dom.Node;
import org.apache.xml.dtm.DTM;
-
-import org.xml.sax.*;
-
import org.apache.xml.dtm.ref.DTMTreeWalker;
-import org.apache.xml.utils.MutableAttrListImpl;
-import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xpath.XPathContext;
/**
No revision
No revision
1.10.6.5 +4 -8
xml-xalan/java/src/org/apache/xalan/xslt/EnvironmentCheck.java
Index: EnvironmentCheck.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xslt/EnvironmentCheck.java,v
retrieving revision 1.10.6.4
retrieving revision 1.10.6.5
diff -u -r1.10.6.4 -r1.10.6.5
--- EnvironmentCheck.java 27 Jan 2003 19:44:23 -0000 1.10.6.4
+++ EnvironmentCheck.java 30 Jan 2003 18:41:35 -0000 1.10.6.5
@@ -59,17 +59,13 @@
import java.io.File;
import java.io.FileWriter;
import java.io.PrintWriter;
-
-import java.lang.reflect.Method;
import java.lang.reflect.Field;
-
+import java.lang.reflect.Method;
import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.Properties;
import java.util.StringTokenizer;
import java.util.Vector;
-// Used in append* methods only
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
1.47.6.6 +3 -13 xml-xalan/java/src/org/apache/xalan/xslt/Process.java
Index: Process.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xslt/Process.java,v
retrieving revision 1.47.6.5
retrieving revision 1.47.6.6
diff -u -r1.47.6.5 -r1.47.6.6
--- Process.java 27 Jan 2003 19:44:23 -0000 1.47.6.5
+++ Process.java 30 Jan 2003 18:41:35 -0000 1.47.6.6
@@ -66,10 +66,6 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
@@ -86,27 +82,21 @@
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.xalan.processor.TransformerFactoryImpl;
+
import org.apache.xalan.processor.XSLProcessorVersion;
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
import org.apache.xalan.trace.PrintTraceListener;
import org.apache.xalan.trace.TraceManager;
-import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.transformer.XalanProperties;
import org.apache.xml.utils.DefaultErrorHandler;
-import org.apache.xml.utils.WrappedRuntimeException;
-import org.apache.xml.utils.res.XResourceBundle;
+
import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
+
import org.xml.sax.ContentHandler;
import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
No revision
No revision
1.9.10.10 +4 -5 xml-xalan/java/src/org/apache/xalan/xsltc/DOM.java
Index: DOM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/DOM.java,v
retrieving revision 1.9.10.9
retrieving revision 1.9.10.10
diff -u -r1.9.10.9 -r1.9.10.10
--- DOM.java 27 Jan 2003 19:44:24 -0000 1.9.10.9
+++ DOM.java 30 Jan 2003 18:41:35 -0000 1.9.10.10
@@ -63,12 +63,11 @@
package org.apache.xalan.xsltc;
+import org.apache.xalan.xsltc.runtime.Hashtable;
+import org.apache.xml.dtm.DTMAxisIterator;
+
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
-import org.apache.xalan.xsltc.runtime.Hashtable;
public interface DOM {
public final static int FIRST_TYPE = 0;
1.2.10.5 +1 -3 xml-xalan/java/src/org/apache/xalan/xsltc/DOMCache.java
Index: DOMCache.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/DOMCache.java,v
retrieving revision 1.2.10.4
retrieving revision 1.2.10.5
diff -u -r1.2.10.4 -r1.2.10.5
--- DOMCache.java 27 Jan 2003 19:44:24 -0000 1.2.10.4
+++ DOMCache.java 30 Jan 2003 18:41:35 -0000 1.2.10.5
@@ -62,8 +62,6 @@
package org.apache.xalan.xsltc;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.dom.DOMImpl;
public interface DOMCache {
1.1.10.2 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/StripFilter.java
Index: StripFilter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/StripFilter.java,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.2
diff -u -r1.1.10.1 -r1.1.10.2
--- StripFilter.java 27 Jan 2003 19:44:25 -0000 1.1.10.1
+++ StripFilter.java 30 Jan 2003 18:41:35 -0000 1.1.10.2
@@ -63,7 +63,6 @@
package org.apache.xalan.xsltc;
-import org.apache.xalan.xsltc.DOM;
public interface StripFilter {
public boolean stripSpace(DOM dom, int node, int type);
1.3.10.5 +2 -3 xml-xalan/java/src/org/apache/xalan/xsltc/Translet.java
Index: Translet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/Translet.java,v
retrieving revision 1.3.10.4
retrieving revision 1.3.10.5
diff -u -r1.3.10.4 -r1.3.10.5
--- Translet.java 27 Jan 2003 19:44:25 -0000 1.3.10.4
+++ Translet.java 30 Jan 2003 18:41:35 -0000 1.3.10.5
@@ -63,8 +63,7 @@
package org.apache.xalan.xsltc;
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
+import org.apache.xml.dtm.DTMAxisIterator;
public interface Translet {
1.7.10.5 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/TransletOutputHandler.java
Index: TransletOutputHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/TransletOutputHandler.java,v
retrieving revision 1.7.10.4
retrieving revision 1.7.10.5
diff -u -r1.7.10.4 -r1.7.10.5
--- TransletOutputHandler.java 27 Jan 2003 19:44:25 -0000 1.7.10.4
+++ TransletOutputHandler.java 30 Jan 2003 18:41:35 -0000 1.7.10.5
@@ -64,7 +64,6 @@
package org.apache.xalan.xsltc;
-import java.io.*;
import org.apache.xalan.xsltc.runtime.Hashtable;
public interface TransletOutputHandler {
No revision
No revision
1.8.10.7 +5 -9
xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/Compile.java
Index: Compile.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/Compile.java,v
retrieving revision 1.8.10.6
retrieving revision 1.8.10.7
diff -u -r1.8.10.6 -r1.8.10.7
--- Compile.java 27 Jan 2003 19:44:25 -0000 1.8.10.6
+++ Compile.java 30 Jan 2003 18:41:36 -0000 1.8.10.7
@@ -65,18 +65,14 @@
package org.apache.xalan.xsltc.cmdline;
-import java.io.*;
-import java.util.Vector;
+import java.io.File;
import java.net.URL;
+import java.util.Vector;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.TransletOutputHandler;
-
+import org.apache.xalan.xsltc.cmdline.getopt.GetOpt;
+import org.apache.xalan.xsltc.cmdline.getopt.GetOptsException;
import org.apache.xalan.xsltc.compiler.XSLTC;
-import org.apache.xalan.xsltc.compiler.util.Util;
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.cmdline.getopt.*;
public final class Compile {
1.15.10.9 +13 -18
xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/Transform.java
Index: Transform.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/Transform.java,v
retrieving revision 1.15.10.8
retrieving revision 1.15.10.9
diff -u -r1.15.10.8 -r1.15.10.9
--- Transform.java 27 Jan 2003 19:44:25 -0000 1.15.10.8
+++ Transform.java 30 Jan 2003 18:41:36 -0000 1.15.10.9
@@ -65,36 +65,31 @@
package org.apache.xalan.xsltc.cmdline;
-import java.io.*;
-import java.io.InputStream;
+import java.io.FileNotFoundException;
import java.net.MalformedURLException;
import java.net.UnknownHostException;
import java.util.Vector;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.sax.SAXSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.SAXException;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.ext.LexicalHandler;
-
-import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.Translet;
import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.TransletOutputHandler;
-
-import org.apache.xalan.xsltc.runtime.*;
-import org.apache.xalan.xsltc.dom.*;
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-
-import org.apache.xalan.xsltc.runtime.output.*;
-
+import org.apache.xalan.xsltc.dom.SAXImpl;
+import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
+import org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import org.apache.xalan.xsltc.runtime.Constants;
+import org.apache.xalan.xsltc.runtime.Parameter;
+import org.apache.xalan.xsltc.runtime.TransletLoader;
+import org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
import org.apache.xml.dtm.DTMManager;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
final public class Transform {
No revision
No revision
1.1.10.4 +2 -4
xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/getopt/GetOpt.java
Index: GetOpt.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/getopt/GetOpt.java,v
retrieving revision 1.1.10.3
retrieving revision 1.1.10.4
diff -u -r1.1.10.3 -r1.1.10.4
--- GetOpt.java 27 Jan 2003 19:44:26 -0000 1.1.10.3
+++ GetOpt.java 30 Jan 2003 18:41:36 -0000 1.1.10.4
@@ -63,11 +63,9 @@
package org.apache.xalan.xsltc.cmdline.getopt;
import java.util.ArrayList;
-import java.util.ListIterator;
import java.util.List;
+import java.util.ListIterator;
-import org.apache.xalan.xsltc.cmdline.getopt.IllegalArgumentException;
-import org.apache.xalan.xsltc.cmdline.getopt.MissingOptArgException;
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
1.1.10.2 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/getopt/IllegalArgumentException.java
Index: IllegalArgumentException.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/getopt/IllegalArgumentException.java,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.2
diff -u -r1.1.10.1 -r1.1.10.2
--- IllegalArgumentException.java 27 Jan 2003 19:44:26 -0000 1.1.10.1
+++ IllegalArgumentException.java 30 Jan 2003 18:41:36 -0000 1.1.10.2
@@ -60,7 +60,6 @@
package org.apache.xalan.xsltc.cmdline.getopt;
-import org.apache.xalan.xsltc.cmdline.getopt.GetOptsException;
class IllegalArgumentException extends GetOptsException{
public IllegalArgumentException(String msg){
1.1.10.2 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/getopt/MissingOptArgException.java
Index: MissingOptArgException.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/getopt/MissingOptArgException.java,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.2
diff -u -r1.1.10.1 -r1.1.10.2
--- MissingOptArgException.java 27 Jan 2003 19:44:27 -0000 1.1.10.1
+++ MissingOptArgException.java 30 Jan 2003 18:41:36 -0000 1.1.10.2
@@ -61,7 +61,6 @@
package org.apache.xalan.xsltc.cmdline.getopt;
-import org.apache.xalan.xsltc.cmdline.getopt.GetOptsException;
class MissingOptArgException extends GetOptsException{
public MissingOptArgException(String msg){
No revision
No revision
1.5.6.2 +10 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java
Index: AbsoluteLocationPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.2
diff -u -r1.5.6.1 -r1.5.6.2
--- AbsoluteLocationPath.java 27 Jan 2003 19:44:27 -0000 1.5.6.1
+++ AbsoluteLocationPath.java 30 Jan 2003 18:41:36 -0000 1.5.6.2
@@ -63,9 +63,16 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NodeType;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class AbsoluteLocationPath extends Expression {
private Expression _path; // may be null
1.5.6.6 +16 -7
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java
Index: AbsolutePathPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java,v
retrieving revision 1.5.6.5
retrieving revision 1.5.6.6
diff -u -r1.5.6.5 -r1.5.6.6
--- AbsolutePathPattern.java 27 Jan 2003 19:44:27 -0000 1.5.6.5
+++ AbsolutePathPattern.java 30 Jan 2003 18:41:36 -0000 1.5.6.6
@@ -63,13 +63,22 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GOTO_W;
+import org.apache.bcel.generic.IF_ICMPEQ;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.LocalVariableGen;
+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.Type;
-
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
-
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
import org.apache.xml.dtm.DTM;
final class AbsolutePathPattern extends LocationPathPattern {
1.2.6.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AlternativePattern.java
Index: AlternativePattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AlternativePattern.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- AlternativePattern.java 27 Jan 2003 19:44:27 -0000 1.2.6.1
+++ AlternativePattern.java 30 Jan 2003 18:41:36 -0000 1.2.6.2
@@ -63,9 +63,13 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.GOTO;
+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.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class AlternativePattern extends Pattern {
private final Pattern _left;
1.4.6.5 +15 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AncestorPattern.java
Index: AncestorPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AncestorPattern.java,v
retrieving revision 1.4.6.4
retrieving revision 1.4.6.5
diff -u -r1.4.6.4 -r1.4.6.5
--- AncestorPattern.java 27 Jan 2003 19:44:27 -0000 1.4.6.4
+++ AncestorPattern.java 30 Jan 2003 18:41:36 -0000 1.4.6.5
@@ -64,9 +64,21 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.IFLT;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.InstructionHandle;
+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.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class AncestorPattern extends RelativePathPattern {
1.9.6.4 +10 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyImports.java
Index: ApplyImports.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyImports.java,v
retrieving revision 1.9.6.3
retrieving revision 1.9.6.4
diff -u -r1.9.6.3 -r1.9.6.4
--- ApplyImports.java 27 Jan 2003 19:44:27 -0000 1.9.6.3
+++ ApplyImports.java 30 Jan 2003 18:41:36 -0000 1.9.6.4
@@ -62,14 +62,18 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
import java.util.Enumeration;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.bcel.generic.*;
-
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class ApplyImports extends Instruction {
1.12.2.5 +15 -10
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
Index: ApplyTemplates.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -u -r1.12.2.4 -r1.12.2.5
--- ApplyTemplates.java 27 Jan 2003 19:44:27 -0000 1.12.2.4
+++ ApplyTemplates.java 30 Jan 2003 18:41:36 -0000 1.12.2.5
@@ -63,18 +63,23 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
import java.util.Enumeration;
+import java.util.Vector;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
-import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+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.NodeSetType;
+import org.apache.xalan.xsltc.compiler.util.NodeType;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.bcel.generic.*;
-
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class ApplyTemplates extends Instruction {
private Expression _select;
1.4.10.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Attribute.java
Index: Attribute.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Attribute.java,v
retrieving revision 1.4.10.1
retrieving revision 1.4.10.2
diff -u -r1.4.10.1 -r1.4.10.2
--- Attribute.java 27 Jan 2003 19:44:28 -0000 1.4.10.1
+++ Attribute.java 30 Jan 2003 18:41:36 -0000 1.4.10.2
@@ -63,7 +63,7 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class Attribute extends Instruction {
private QName _name;
1.10.6.4 +10 -9
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeSet.java
Index: AttributeSet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeSet.java,v
retrieving revision 1.10.6.3
retrieving revision 1.10.6.4
diff -u -r1.10.6.3 -r1.10.6.4
--- AttributeSet.java 27 Jan 2003 19:44:28 -0000 1.10.6.3
+++ AttributeSet.java 30 Jan 2003 18:41:36 -0000 1.10.6.4
@@ -64,17 +64,18 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
import java.util.Enumeration;
-import java.util.StringTokenizer;
-
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
+import java.util.Vector;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.AttributeSetMethodGenerator;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class AttributeSet extends TopLevelElement {
1.1.14.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeValue.java
Index: AttributeValue.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeValue.java,v
retrieving revision 1.1.14.3
retrieving revision 1.1.14.4
diff -u -r1.1.14.3 -r1.1.14.4
--- AttributeValue.java 27 Jan 2003 19:44:28 -0000 1.1.14.3
+++ AttributeValue.java 30 Jan 2003 18:41:36 -0000 1.1.14.4
@@ -62,7 +62,7 @@
*/
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.*;
+
abstract class AttributeValue extends Expression {
1.5.6.4 +13 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java
Index: AttributeValueTemplate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java,v
retrieving revision 1.5.6.3
retrieving revision 1.5.6.4
diff -u -r1.5.6.3 -r1.5.6.4
--- AttributeValueTemplate.java 27 Jan 2003 19:44:28 -0000 1.5.6.3
+++ AttributeValueTemplate.java 30 Jan 2003 18:41:36 -0000 1.5.6.4
@@ -63,12 +63,20 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
import java.util.Enumeration;
-import org.apache.xalan.xsltc.compiler.util.Type;
+import java.util.Vector;
+
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
+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;
final class AttributeValueTemplate extends AttributeValue {
1.7.6.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BinOpExpr.java
Index: BinOpExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BinOpExpr.java,v
retrieving revision 1.7.6.1
retrieving revision 1.7.6.2
diff -u -r1.7.6.1 -r1.7.6.2
--- BinOpExpr.java 27 Jan 2003 19:44:28 -0000 1.7.6.1
+++ BinOpExpr.java 30 Jan 2003 18:41:36 -0000 1.7.6.2
@@ -63,9 +63,13 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.InstructionList;
+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.MethodType;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class BinOpExpr extends Expression {
public static final int PLUS = 0;
1.3.6.2 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BooleanCall.java
Index: BooleanCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BooleanCall.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- BooleanCall.java 27 Jan 2003 19:44:28 -0000 1.3.6.1
+++ BooleanCall.java 30 Jan 2003 18:41:36 -0000 1.3.6.2
@@ -64,9 +64,11 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
+
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class BooleanCall extends FunctionCall {
1.3.6.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BooleanExpr.java
Index: BooleanExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/BooleanExpr.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- BooleanExpr.java 27 Jan 2003 19:44:28 -0000 1.3.6.1
+++ BooleanExpr.java 30 Jan 2003 18:41:36 -0000 1.3.6.2
@@ -63,9 +63,14 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.InstructionList;
+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.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
/**
* This class implements inlined calls to the XSLT standard functions
1.9.6.4 +9 -7
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CallTemplate.java
Index: CallTemplate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CallTemplate.java,v
retrieving revision 1.9.6.3
retrieving revision 1.9.6.4
diff -u -r1.9.6.3 -r1.9.6.4
--- CallTemplate.java 27 Jan 2003 19:44:28 -0000 1.9.6.3
+++ CallTemplate.java 30 Jan 2003 18:41:36 -0000 1.9.6.4
@@ -64,13 +64,15 @@
package org.apache.xalan.xsltc.compiler;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class CallTemplate extends Instruction {
private QName _name;
1.10.6.7 +14 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CastExpr.java
Index: CastExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CastExpr.java,v
retrieving revision 1.10.6.6
retrieving revision 1.10.6.7
diff -u -r1.10.6.6 -r1.10.6.7
--- CastExpr.java 27 Jan 2003 19:44:28 -0000 1.10.6.6
+++ CastExpr.java 30 Jan 2003 18:41:36 -0000 1.10.6.7
@@ -65,11 +65,20 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.dom.Axis;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.IF_ICMPNE;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.SIPUSH;
+import org.apache.xalan.xsltc.compiler.util.BooleanType;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.MultiHashtable;
+import org.apache.xalan.xsltc.compiler.util.NodeType;
+import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.dom.Axis;
final class CastExpr extends Expression {
private final Expression _left;
1.2.6.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CeilingCall.java
Index: CeilingCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CeilingCall.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- CeilingCall.java 27 Jan 2003 19:44:28 -0000 1.2.6.1
+++ CeilingCall.java 30 Jan 2003 18:41:36 -0000 1.2.6.2
@@ -64,8 +64,12 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
final class CeilingCall extends FunctionCall {
public CeilingCall(QName fname, Vector arguments) {
1.6.6.2 +12 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Choose.java
Index: Choose.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Choose.java,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -u -r1.6.6.1 -r1.6.6.2
--- Choose.java 27 Jan 2003 19:44:29 -0000 1.6.6.1
+++ Choose.java 30 Jan 2003 18:41:36 -0000 1.6.6.2
@@ -64,12 +64,20 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
import java.util.Enumeration;
+import java.util.Vector;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.IFEQ;
+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;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class Choose extends Instruction {
1.4.6.2 +9 -13
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Comment.java
Index: Comment.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Comment.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- Comment.java 27 Jan 2003 19:44:29 -0000 1.4.6.1
+++ Comment.java 30 Jan 2003 18:41:36 -0000 1.4.6.2
@@ -64,19 +64,15 @@
package org.apache.xalan.xsltc.compiler;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
-import java.util.Vector;
-import java.util.Enumeration;
-
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GETFIELD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-
-import org.apache.bcel.generic.*;
-import org.apache.bcel.classfile.JavaClass;
-
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class Comment extends Instruction {
1.4.6.2 +12 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ConcatCall.java
Index: ConcatCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ConcatCall.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- ConcatCall.java 27 Jan 2003 19:44:29 -0000 1.4.6.1
+++ ConcatCall.java 30 Jan 2003 18:41:37 -0000 1.4.6.2
@@ -64,11 +64,18 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import java.util.Enumeration;
-import org.apache.xalan.xsltc.compiler.util.Type;
+
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.InstructionList;
+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.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class ConcatCall extends FunctionCall {
public ConcatCall(QName fname, Vector arguments) {
1.4.6.2 +9 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ContainsCall.java
Index: ContainsCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ContainsCall.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- ContainsCall.java 27 Jan 2003 19:44:29 -0000 1.4.6.1
+++ ContainsCall.java 30 Jan 2003 18:41:37 -0000 1.4.6.2
@@ -65,11 +65,16 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
+
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.IFLT;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+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.compiler.util.ErrorMsg;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
final class ContainsCall extends FunctionCall {
1.7.6.2 +18 -11
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Copy.java
Index: Copy.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Copy.java,v
retrieving revision 1.7.6.1
retrieving revision 1.7.6.2
diff -u -r1.7.6.1 -r1.7.6.2
--- Copy.java 27 Jan 2003 19:44:29 -0000 1.7.6.1
+++ Copy.java 30 Jan 2003 18:41:37 -0000 1.7.6.2
@@ -63,17 +63,24 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
+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.IFEQ;
+import org.apache.bcel.generic.IFNULL;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.InstructionHandle;
+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.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class Copy extends Instruction {
private UseAttributeSets _useSets;
1.10.6.3 +15 -8
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CopyOf.java
Index: CopyOf.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CopyOf.java,v
retrieving revision 1.10.6.2
retrieving revision 1.10.6.3
diff -u -r1.10.6.2 -r1.10.6.3
--- CopyOf.java 27 Jan 2003 19:44:30 -0000 1.10.6.2
+++ CopyOf.java 30 Jan 2003 18:41:37 -0000 1.10.6.3
@@ -63,14 +63,21 @@
package org.apache.xalan.xsltc.compiler;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
-import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+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.NodeSetType;
+import org.apache.xalan.xsltc.compiler.util.NodeType;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class CopyOf extends Instruction {
private Expression _select;
1.2.6.2 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CurrentCall.java
Index: CurrentCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/CurrentCall.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- CurrentCall.java 27 Jan 2003 19:44:30 -0000 1.2.6.1
+++ CurrentCall.java 30 Jan 2003 18:41:37 -0000 1.2.6.2
@@ -63,8 +63,8 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
final class CurrentCall extends FunctionCall {
public CurrentCall(QName fname) {
1.8.6.4 +11 -14
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/DecimalFormatting.java
Index: DecimalFormatting.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/DecimalFormatting.java,v
retrieving revision 1.8.6.3
retrieving revision 1.8.6.4
diff -u -r1.8.6.3 -r1.8.6.4
--- DecimalFormatting.java 27 Jan 2003 19:44:30 -0000 1.8.6.3
+++ DecimalFormatting.java 30 Jan 2003 18:41:37 -0000 1.8.6.4
@@ -64,20 +64,17 @@
package org.apache.xalan.xsltc.compiler;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+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.ErrorMsg;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.bcel.generic.*;
-
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-
-import org.apache.xalan.xsltc.runtime.AttributeList;
-import org.apache.xalan.xsltc.compiler.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class DecimalFormatting extends TopLevelElement {
1.12.6.5 +11 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
Index: DocumentCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/DocumentCall.java,v
retrieving revision 1.12.6.4
retrieving revision 1.12.6.5
diff -u -r1.12.6.4 -r1.12.6.5
--- DocumentCall.java 27 Jan 2003 19:44:30 -0000 1.12.6.4
+++ DocumentCall.java 30 Jan 2003 18:41:37 -0000 1.12.6.5
@@ -64,13 +64,18 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import java.util.Enumeration;
+
+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;
+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.compiler.util.ErrorMsg;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
final class DocumentCall extends FunctionCall {
1.4.6.4 +8 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java
Index: ElementAvailableCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java,v
retrieving revision 1.4.6.3
retrieving revision 1.4.6.4
diff -u -r1.4.6.3 -r1.4.6.4
--- ElementAvailableCall.java 27 Jan 2003 19:44:30 -0000 1.4.6.3
+++ ElementAvailableCall.java 30 Jan 2003 18:41:37 -0000 1.4.6.4
@@ -64,10 +64,14 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import java.util.HashSet;
+
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.PUSH;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class ElementAvailableCall extends FunctionCall {
1.8.6.5 +25 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/EqualityExpr.java
Index: EqualityExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/EqualityExpr.java,v
retrieving revision 1.8.6.4
retrieving revision 1.8.6.5
diff -u -r1.8.6.4 -r1.8.6.5
--- EqualityExpr.java 27 Jan 2003 19:44:30 -0000 1.8.6.4
+++ EqualityExpr.java 30 Jan 2003 18:41:37 -0000 1.8.6.5
@@ -65,11 +65,32 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.BranchInstruction;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.IFEQ;
+import org.apache.bcel.generic.IFNE;
+import org.apache.bcel.generic.IF_ICMPEQ;
+import org.apache.bcel.generic.IF_ICMPNE;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
+import org.apache.xalan.xsltc.compiler.util.BooleanType;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.IntType;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import org.apache.xalan.xsltc.compiler.util.NodeType;
+import org.apache.xalan.xsltc.compiler.util.NumberType;
+import org.apache.xalan.xsltc.compiler.util.RealType;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+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.runtime.Operators;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
final class EqualityExpr extends Expression implements Operators {
private final int _op;
1.11.2.6 +15 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Expression.java
Index: Expression.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Expression.java,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- Expression.java 27 Jan 2003 19:44:30 -0000 1.11.2.5
+++ Expression.java 30 Jan 2003 18:41:37 -0000 1.11.2.6
@@ -65,13 +65,22 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.xalan.xsltc.compiler.util.*;
-
import java.util.Vector;
-import org.apache.bcel.generic.*;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GOTO_W;
+import org.apache.bcel.generic.IFEQ;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.BooleanType;
+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.MethodType;
+import org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
abstract class Expression extends SyntaxTreeNode {
/**
1.4.6.2 +6 -11
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Fallback.java
Index: Fallback.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Fallback.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- Fallback.java 27 Jan 2003 19:44:30 -0000 1.4.6.1
+++ Fallback.java 30 Jan 2003 18:41:37 -0000 1.4.6.2
@@ -62,17 +62,12 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class Fallback extends Instruction {
1.6.6.2 +13 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilterExpr.java
Index: FilterExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilterExpr.java,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -u -r1.6.6.1 -r1.6.6.2
--- FilterExpr.java 27 Jan 2003 19:44:30 -0000 1.6.6.1
+++ FilterExpr.java 30 Jan 2003 18:41:37 -0000 1.6.6.2
@@ -65,11 +65,19 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import java.util.Enumeration;
-import org.apache.xalan.xsltc.compiler.util.Type;
+
+import org.apache.bcel.generic.ConstantPoolGen;
+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.NEW;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NodeSetType;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
class FilterExpr extends Expression {
private Expression _primary;
1.9.6.4 +13 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilterParentPath.java
Index: FilterParentPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilterParentPath.java,v
retrieving revision 1.9.6.3
retrieving revision 1.9.6.4
diff -u -r1.9.6.3 -r1.9.6.4
--- FilterParentPath.java 27 Jan 2003 19:44:30 -0000 1.9.6.3
+++ FilterParentPath.java 30 Jan 2003 18:41:37 -0000 1.9.6.4
@@ -63,11 +63,19 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.dom.Axis;
-import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import org.apache.xalan.xsltc.compiler.util.NodeType;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class FilterParentPath extends Expression {
1.3.6.2 +10 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java
Index: FilteredAbsoluteLocationPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- FilteredAbsoluteLocationPath.java 27 Jan 2003 19:44:31 -0000 1.3.6.1
+++ FilteredAbsoluteLocationPath.java 30 Jan 2003 18:41:37 -0000 1.3.6.2
@@ -62,9 +62,16 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NodeType;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class FilteredAbsoluteLocationPath extends Expression {
private Expression _path; // may be null
1.2.6.2 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FloorCall.java
Index: FloorCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FloorCall.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- FloorCall.java 27 Jan 2003 19:44:31 -0000 1.2.6.1
+++ FloorCall.java 30 Jan 2003 18:41:37 -0000 1.2.6.2
@@ -64,8 +64,10 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
final class FloorCall extends FunctionCall {
public FloorCall(QName fname, Vector arguments) {
1.2.6.4 +6 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FlowList.java
Index: FlowList.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FlowList.java,v
retrieving revision 1.2.6.3
retrieving revision 1.2.6.4
diff -u -r1.2.6.3 -r1.2.6.4
--- FlowList.java 27 Jan 2003 19:44:31 -0000 1.2.6.3
+++ FlowList.java 30 Jan 2003 18:41:37 -0000 1.2.6.4
@@ -63,9 +63,12 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
import java.util.Iterator;
-import org.apache.bcel.generic.*;
+import java.util.Vector;
+
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
public final class FlowList {
private Vector _elements;
1.12.6.5 +17 -9
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ForEach.java
Index: ForEach.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ForEach.java,v
retrieving revision 1.12.6.4
retrieving revision 1.12.6.5
diff -u -r1.12.6.4 -r1.12.6.5
--- ForEach.java 27 Jan 2003 19:44:31 -0000 1.12.6.4
+++ ForEach.java 30 Jan 2003 18:41:37 -0000 1.12.6.5
@@ -64,17 +64,25 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
import java.util.Enumeration;
+import java.util.Vector;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
-import org.apache.xalan.xsltc.compiler.util.Type;
+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.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+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.NodeSetType;
+import org.apache.xalan.xsltc.compiler.util.NodeType;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class ForEach extends Instruction {
1.6.2.4 +11 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FormatNumberCall.java
Index: FormatNumberCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FormatNumberCall.java,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -r1.6.2.3 -r1.6.2.4
--- FormatNumberCall.java 27 Jan 2003 19:44:31 -0000 1.6.2.3
+++ FormatNumberCall.java 30 Jan 2003 18:41:37 -0000 1.6.2.4
@@ -66,9 +66,17 @@
import java.util.Vector;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+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.RealType;
+import org.apache.xalan.xsltc.compiler.util.StringType;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class FormatNumberCall extends FunctionCall {
private Expression _value;
1.1.6.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ForwardPositionExpr.java
Index: ForwardPositionExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ForwardPositionExpr.java,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -r1.1.6.1 -r1.1.6.2
--- ForwardPositionExpr.java 27 Jan 2003 19:44:31 -0000 1.1.6.1
+++ ForwardPositionExpr.java 30 Jan 2003 18:41:37 -0000 1.1.6.2
@@ -62,9 +62,14 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
class ForwardPositionExpr extends Expression {
private Expression _expr;
1.5.6.6 +11 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java
Index: FunctionAvailableCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java,v
retrieving revision 1.5.6.5
retrieving revision 1.5.6.6
diff -u -r1.5.6.5 -r1.5.6.6
--- FunctionAvailableCall.java 27 Jan 2003 19:44:31 -0000 1.5.6.5
+++ FunctionAvailableCall.java 30 Jan 2003 18:41:37 -0000 1.5.6.6
@@ -63,12 +63,18 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
-import java.lang.reflect.Modifier;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Vector;
+
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.PUSH;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
import org.apache.xalan.xsltc.runtime.TransletLoader;
final class FunctionAvailableCall extends FunctionCall {
1.14.2.9 +20 -11
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionCall.java
Index: FunctionCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionCall.java,v
retrieving revision 1.14.2.8
retrieving revision 1.14.2.9
diff -u -r1.14.2.8 -r1.14.2.9
--- FunctionCall.java 27 Jan 2003 19:44:31 -0000 1.14.2.8
+++ FunctionCall.java 30 Jan 2003 18:41:37 -0000 1.14.2.9
@@ -66,25 +66,34 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Vector;
-import java.lang.reflect.*;
-
-import org.apache.bcel.generic.NEW;
+import org.apache.bcel.generic.ConstantPoolGen;
import org.apache.bcel.generic.IFEQ;
-import org.apache.bcel.generic.PUSH;
+import org.apache.bcel.generic.INVOKESPECIAL;
import org.apache.bcel.generic.INVOKESTATIC;
import org.apache.bcel.generic.INVOKEVIRTUAL;
-import org.apache.bcel.generic.INVOKESPECIAL;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.InvokeInstruction;
-
+import org.apache.bcel.generic.NEW;
+import org.apache.bcel.generic.PUSH;
+import org.apache.xalan.xsltc.compiler.util.BooleanType;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import org.apache.xalan.xsltc.compiler.util.IntType;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodType;
+import org.apache.xalan.xsltc.compiler.util.MultiHashtable;
+import org.apache.xalan.xsltc.compiler.util.ObjectType;
+import org.apache.xalan.xsltc.compiler.util.ReferenceType;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
import org.apache.xalan.xsltc.runtime.TransletLoader;
class FunctionCall extends Expression {
1.2.6.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/GenerateIdCall.java
Index: GenerateIdCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/GenerateIdCall.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- GenerateIdCall.java 27 Jan 2003 19:44:32 -0000 1.2.6.1
+++ GenerateIdCall.java 30 Jan 2003 18:41:37 -0000 1.2.6.2
@@ -64,8 +64,13 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
final class GenerateIdCall extends FunctionCall {
public GenerateIdCall(QName fname, Vector arguments) {
1.6.6.3 +11 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java
Index: IdKeyPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java,v
retrieving revision 1.6.6.2
retrieving revision 1.6.6.3
diff -u -r1.6.6.2 -r1.6.6.3
--- IdKeyPattern.java 27 Jan 2003 19:44:32 -0000 1.6.6.2
+++ IdKeyPattern.java 30 Jan 2003 18:41:37 -0000 1.6.6.3
@@ -63,9 +63,17 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.bcel.generic.*;
+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;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
abstract class IdKeyPattern extends LocationPathPattern {
1.1.14.2 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/IdPattern.java
Index: IdPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/IdPattern.java,v
retrieving revision 1.1.14.1
retrieving revision 1.1.14.2
diff -u -r1.1.14.1 -r1.1.14.2
--- IdPattern.java 27 Jan 2003 19:44:32 -0000 1.1.14.1
+++ IdPattern.java 30 Jan 2003 18:41:37 -0000 1.1.14.2
@@ -63,7 +63,6 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.*;
final class IdPattern extends IdKeyPattern {
1.9.6.4 +9 -7
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/If.java
Index: If.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/If.java,v
retrieving revision 1.9.6.3
retrieving revision 1.9.6.4
diff -u -r1.9.6.3 -r1.9.6.4
--- If.java 27 Jan 2003 19:44:32 -0000 1.9.6.3
+++ If.java 30 Jan 2003 18:41:37 -0000 1.9.6.4
@@ -64,13 +64,15 @@
package org.apache.xalan.xsltc.compiler;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.BooleanType;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class If extends Instruction {
1.14.6.5 +6 -8
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Import.java
Index: Import.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Import.java,v
retrieving revision 1.14.6.4
retrieving revision 1.14.6.5
diff -u -r1.14.6.4 -r1.14.6.5
--- Import.java 27 Jan 2003 19:44:33 -0000 1.14.6.4
+++ Import.java 30 Jan 2003 18:41:37 -0000 1.14.6.5
@@ -67,17 +67,15 @@
import java.io.File;
import java.net.URL;
-import java.net.MalformedURLException;
import java.util.Enumeration;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
+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.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.bcel.generic.*;
+import org.xml.sax.InputSource;
final class Import extends TopLevelElement {
1.14.2.5 +7 -9
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Include.java
Index: Include.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Include.java,v
retrieving revision 1.14.2.4
retrieving revision 1.14.2.5
diff -u -r1.14.2.4 -r1.14.2.5
--- Include.java 27 Jan 2003 19:44:33 -0000 1.14.2.4
+++ Include.java 30 Jan 2003 18:41:37 -0000 1.14.2.5
@@ -66,18 +66,16 @@
import java.io.File;
import java.io.FileNotFoundException;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Enumeration;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
+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.*;
-
-import org.apache.bcel.generic.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.xml.sax.InputSource;
final class Include extends TopLevelElement {
1.2.10.2 +6 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Instruction.java
Index: Instruction.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Instruction.java,v
retrieving revision 1.2.10.1
retrieving revision 1.2.10.2
diff -u -r1.2.10.1 -r1.2.10.2
--- Instruction.java 27 Jan 2003 19:44:33 -0000 1.2.10.1
+++ Instruction.java 30 Jan 2003 18:41:37 -0000 1.2.10.2
@@ -63,7 +63,11 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.*;
+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;
abstract class Instruction extends SyntaxTreeNode {
/**
1.2.6.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/IntExpr.java
Index: IntExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/IntExpr.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- IntExpr.java 27 Jan 2003 19:44:33 -0000 1.2.6.1
+++ IntExpr.java 30 Jan 2003 18:41:37 -0000 1.2.6.2
@@ -63,9 +63,13 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionList;
+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.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class IntExpr extends Expression {
private final int _value;
1.10.6.7 +22 -9
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Key.java
Index: Key.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Key.java,v
retrieving revision 1.10.6.6
retrieving revision 1.10.6.7
diff -u -r1.10.6.6 -r1.10.6.7
--- Key.java 27 Jan 2003 19:44:33 -0000 1.10.6.6
+++ Key.java 30 Jan 2003 18:41:37 -0000 1.10.6.7
@@ -63,15 +63,28 @@
package org.apache.xalan.xsltc.compiler;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.IFEQ;
+import org.apache.bcel.generic.IFGE;
+import org.apache.bcel.generic.IFGT;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.LocalVariableGen;
+import org.apache.bcel.generic.PUSH;
+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.NodeSetType;
+import org.apache.xalan.xsltc.compiler.util.StringType;
import org.apache.xalan.xsltc.compiler.util.Type;
-
-import org.apache.xalan.xsltc.DOM;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
import org.apache.xalan.xsltc.dom.Axis;
final class Key extends TopLevelElement {
1.7.6.7 +20 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/KeyCall.java
Index: KeyCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/KeyCall.java,v
retrieving revision 1.7.6.6
retrieving revision 1.7.6.7
diff -u -r1.7.6.6 -r1.7.6.7
--- KeyCall.java 27 Jan 2003 19:44:33 -0000 1.7.6.6
+++ KeyCall.java 30 Jan 2003 18:41:37 -0000 1.7.6.7
@@ -65,9 +65,26 @@
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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class KeyCall extends FunctionCall {
1.2.6.2 +10 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LangCall.java
Index: LangCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LangCall.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- LangCall.java 27 Jan 2003 19:44:34 -0000 1.2.6.1
+++ LangCall.java 30 Jan 2003 18:41:37 -0000 1.2.6.2
@@ -64,9 +64,16 @@
import java.util.Vector;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.FilterGenerator;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class LangCall extends FunctionCall {
private Expression _lang;
1.7.6.5 +9 -8
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LastCall.java
Index: LastCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LastCall.java,v
retrieving revision 1.7.6.4
retrieving revision 1.7.6.5
diff -u -r1.7.6.4 -r1.7.6.5
--- LastCall.java 27 Jan 2003 19:44:34 -0000 1.7.6.4
+++ LastCall.java 30 Jan 2003 18:41:37 -0000 1.7.6.5
@@ -63,13 +63,14 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.dom.Axis;
-
-import org.apache.xml.dtm.DTM;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.CompareGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.TestGenerator;
final class LastCall extends FunctionCall {
1.4.6.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralAttribute.java
Index: LiteralAttribute.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralAttribute.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- LiteralAttribute.java 27 Jan 2003 19:44:34 -0000 1.4.6.1
+++ LiteralAttribute.java 30 Jan 2003 18:41:37 -0000 1.4.6.2
@@ -64,9 +64,14 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionList;
+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.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class LiteralAttribute extends Instruction {
1.16.2.4 +9 -8
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralElement.java
Index: LiteralElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralElement.java,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -u -r1.16.2.3 -r1.16.2.4
--- LiteralElement.java 27 Jan 2003 19:44:34 -0000 1.16.2.3
+++ LiteralElement.java 30 Jan 2003 18:41:37 -0000 1.16.2.4
@@ -64,17 +64,18 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Hashtable;
import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Vector;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionList;
+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.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class LiteralElement extends Instruction {
1.4.6.4 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralExpr.java
Index: LiteralExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LiteralExpr.java,v
retrieving revision 1.4.6.3
retrieving revision 1.4.6.4
diff -u -r1.4.6.3 -r1.4.6.4
--- LiteralExpr.java 27 Jan 2003 19:44:34 -0000 1.4.6.3
+++ LiteralExpr.java 30 Jan 2003 18:41:37 -0000 1.4.6.4
@@ -64,9 +64,13 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionList;
+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.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class LiteralExpr extends Expression {
private final String _value;
1.3.6.2 +7 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LocalNameCall.java
Index: LocalNameCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LocalNameCall.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- LocalNameCall.java 27 Jan 2003 19:44:34 -0000 1.3.6.1
+++ LocalNameCall.java 30 Jan 2003 18:41:37 -0000 1.3.6.2
@@ -64,9 +64,12 @@
import java.util.Vector;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
final class LocalNameCall extends NameBase {
1.2.14.3 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LocationPathPattern.java
Index: LocationPathPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LocationPathPattern.java,v
retrieving revision 1.2.14.2
retrieving revision 1.2.14.3
diff -u -r1.2.14.2 -r1.2.14.3
--- LocationPathPattern.java 27 Jan 2003 19:44:34 -0000 1.2.14.2
+++ LocationPathPattern.java 30 Jan 2003 18:41:37 -0000 1.2.14.3
@@ -64,9 +64,11 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.dom.Axis;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.dom.Axis;
public abstract class LocationPathPattern extends Pattern {
private Template _template;
1.9.6.4 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LogicalExpr.java
Index: LogicalExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/LogicalExpr.java,v
retrieving revision 1.9.6.3
retrieving revision 1.9.6.4
diff -u -r1.9.6.3 -r1.9.6.4
--- LogicalExpr.java 27 Jan 2003 19:44:35 -0000 1.9.6.3
+++ LogicalExpr.java 30 Jan 2003 18:41:37 -0000 1.9.6.4
@@ -64,9 +64,14 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.GOTO;
+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.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodType;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class LogicalExpr extends Expression {
1.6.6.2 +11 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Message.java
Index: Message.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Message.java,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -u -r1.6.6.1 -r1.6.6.2
--- Message.java 27 Jan 2003 19:44:35 -0000 1.6.6.1
+++ Message.java 30 Jan 2003 18:41:37 -0000 1.6.6.2
@@ -64,12 +64,17 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+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.Type;
-
-import org.apache.bcel.generic.*;
-import org.apache.bcel.classfile.JavaClass;
-
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class Message extends Instruction {
private boolean _terminate = false;
1.19.6.9 +22 -9
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Mode.java
Index: Mode.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Mode.java,v
retrieving revision 1.19.6.8
retrieving revision 1.19.6.9
diff -u -r1.19.6.8 -r1.19.6.9
--- Mode.java 27 Jan 2003 19:44:35 -0000 1.19.6.8
+++ Mode.java 30 Jan 2003 18:41:37 -0000 1.19.6.9
@@ -65,19 +65,32 @@
package org.apache.xalan.xsltc.compiler;
+import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Iterator;
-import java.util.HashSet;
import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import org.apache.bcel.util.*;
-import org.apache.bcel.generic.*;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.DUP;
+import org.apache.bcel.generic.GOTO_W;
+import org.apache.bcel.generic.IFLT;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.LocalVariableGen;
+import org.apache.bcel.generic.SWITCH;
+import org.apache.bcel.generic.TargetLostException;
+import org.apache.bcel.util.InstructionFinder;
import org.apache.xalan.xsltc.DOM;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NamedMethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.Util;
import org.apache.xalan.xsltc.dom.Axis;
-import org.apache.xalan.xsltc.compiler.util.*;
-import org.apache.xalan.xsltc.compiler.util.Type;
-
import org.apache.xml.dtm.DTM;
/**
1.6.6.5 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NameBase.java
Index: NameBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NameBase.java,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- NameBase.java 27 Jan 2003 19:44:35 -0000 1.6.6.4
+++ NameBase.java 30 Jan 2003 18:41:37 -0000 1.6.6.5
@@ -65,9 +65,13 @@
import java.util.Vector;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
class NameBase extends FunctionCall {
1.3.6.2 +7 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NameCall.java
Index: NameCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NameCall.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- NameCall.java 27 Jan 2003 19:44:35 -0000 1.3.6.1
+++ NameCall.java 30 Jan 2003 18:41:37 -0000 1.3.6.2
@@ -65,9 +65,12 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
-import org.apache.xalan.xsltc.compiler.util.Type;
+
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
final class NameCall extends NameBase {
1.4.6.2 +4 -7
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NamespaceAlias.java
Index: NamespaceAlias.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NamespaceAlias.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- NamespaceAlias.java 27 Jan 2003 19:44:35 -0000 1.4.6.1
+++ NamespaceAlias.java 30 Jan 2003 18:41:37 -0000 1.4.6.2
@@ -63,13 +63,10 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class NamespaceAlias extends TopLevelElement {
1.3.6.2 +6 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java
Index: NamespaceUriCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- NamespaceUriCall.java 27 Jan 2003 19:44:35 -0000 1.3.6.1
+++ NamespaceUriCall.java 30 Jan 2003 18:41:37 -0000 1.3.6.2
@@ -64,9 +64,11 @@
import java.util.Vector;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
final class NamespaceUriCall extends NameBase {
1.1.14.3 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NodeTest.java
Index: NodeTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NodeTest.java,v
retrieving revision 1.1.14.2
retrieving revision 1.1.14.3
diff -u -r1.1.14.2 -r1.1.14.3
--- NodeTest.java 27 Jan 2003 19:44:36 -0000 1.1.14.2
+++ NodeTest.java 30 Jan 2003 18:41:37 -0000 1.1.14.3
@@ -64,7 +64,6 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.DOM;
-
import org.apache.xml.dtm.DTM;
public interface NodeTest {
1.2.6.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NotCall.java
Index: NotCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NotCall.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- NotCall.java 27 Jan 2003 19:44:36 -0000 1.2.6.1
+++ NotCall.java 30 Jan 2003 18:41:37 -0000 1.2.6.2
@@ -64,8 +64,12 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
final class NotCall extends FunctionCall {
public NotCall(QName fname, Vector arguments) {
1.8.6.5 +26 -7
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Number.java
Index: Number.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Number.java,v
retrieving revision 1.8.6.4
retrieving revision 1.8.6.5
diff -u -r1.8.6.4 -r1.8.6.5
--- Number.java 27 Jan 2003 19:44:36 -0000 1.8.6.4
+++ Number.java 30 Jan 2003 18:41:37 -0000 1.8.6.5
@@ -65,13 +65,32 @@
import java.util.ArrayList;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.generic.*;
import org.apache.bcel.classfile.Field;
-
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.ASTORE;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.CHECKCAST;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GETFIELD;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.IFNONNULL;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.L2I;
+import org.apache.bcel.generic.LocalVariableGen;
+import org.apache.bcel.generic.NEW;
+import org.apache.bcel.generic.PUSH;
+import org.apache.bcel.generic.PUTFIELD;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MatchGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NodeCounterGenerator;
+import org.apache.xalan.xsltc.compiler.util.RealType;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class Number extends Instruction implements Closure {
private static final int LEVEL_SINGLE = 0;
1.2.6.2 +6 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NumberCall.java
Index: NumberCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/NumberCall.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- NumberCall.java 27 Jan 2003 19:44:36 -0000 1.2.6.1
+++ NumberCall.java 30 Jan 2003 18:41:37 -0000 1.2.6.2
@@ -64,9 +64,12 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
+
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class NumberCall extends FunctionCall {
1.3.10.2 +5 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Otherwise.java
Index: Otherwise.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Otherwise.java,v
retrieving revision 1.3.10.1
retrieving revision 1.3.10.2
diff -u -r1.3.10.1 -r1.3.10.2
--- Otherwise.java 27 Jan 2003 19:44:36 -0000 1.3.10.1
+++ Otherwise.java 30 Jan 2003 18:41:37 -0000 1.3.10.2
@@ -63,9 +63,12 @@
package org.apache.xalan.xsltc.compiler;
+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.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class Otherwise extends Instruction {
public void display(int indent) {
1.12.6.5 +12 -8
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Output.java
Index: Output.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Output.java,v
retrieving revision 1.12.6.4
retrieving revision 1.12.6.5
diff -u -r1.12.6.4 -r1.12.6.5
--- Output.java 27 Jan 2003 19:44:36 -0000 1.12.6.4
+++ Output.java 30 Jan 2003 18:41:37 -0000 1.12.6.5
@@ -64,17 +64,21 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
+import java.io.OutputStreamWriter;
import java.util.Properties;
-import java.util.Enumeration;
import java.util.StringTokenizer;
-import java.io.OutputStreamWriter;
-import javax.xml.transform.OutputKeys;
-import org.apache.bcel.generic.*;
-import org.apache.bcel.classfile.JavaClass;
+import javax.xml.transform.OutputKeys;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
+import org.apache.bcel.generic.PUTFIELD;
+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.Util;
import org.apache.xalan.xsltc.runtime.output.StreamOutput;
final class Output extends TopLevelElement {
1.19.6.4 +13 -10
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Param.java
Index: Param.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Param.java,v
retrieving revision 1.19.6.3
retrieving revision 1.19.6.4
diff -u -r1.19.6.3 -r1.19.6.4
--- Param.java 27 Jan 2003 19:44:36 -0000 1.19.6.3
+++ Param.java 30 Jan 2003 18:41:37 -0000 1.19.6.4
@@ -66,16 +66,19 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
-
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.*;
import org.apache.bcel.classfile.Field;
-
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.CHECKCAST;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
+import org.apache.bcel.generic.PUTFIELD;
+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.ReferenceType;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class Param extends VariableBase {
1.10.6.5 +9 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParameterRef.java
Index: ParameterRef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParameterRef.java,v
retrieving revision 1.10.6.4
retrieving revision 1.10.6.5
diff -u -r1.10.6.4 -r1.10.6.5
--- ParameterRef.java 27 Jan 2003 19:44:36 -0000 1.10.6.4
+++ ParameterRef.java 30 Jan 2003 18:41:37 -0000 1.10.6.5
@@ -65,9 +65,14 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.CHECKCAST;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GETFIELD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NodeSetType;
final class ParameterRef extends VariableRefBase {
1.16.2.5 +11 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java
Index: ParentLocationPath.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -r1.16.2.4 -r1.16.2.5
--- ParentLocationPath.java 27 Jan 2003 19:44:36 -0000 1.16.2.4
+++ ParentLocationPath.java 30 Jan 2003 18:41:37 -0000 1.16.2.5
@@ -63,12 +63,17 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.dom.Axis;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
-
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.dom.Axis;
import org.apache.xml.dtm.DTM;
final class ParentLocationPath extends RelativeLocationPath {
1.3.6.4 +11 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentPattern.java
Index: ParentPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ParentPattern.java,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -u -r1.3.6.3 -r1.3.6.4
--- ParentPattern.java 27 Jan 2003 19:44:36 -0000 1.3.6.3
+++ ParentPattern.java 30 Jan 2003 18:41:38 -0000 1.3.6.4
@@ -63,9 +63,17 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.ISTORE;
+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.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class ParentPattern extends RelativePathPattern {
private final Pattern _left;
1.39.2.7 +23 -15
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java,v
retrieving revision 1.39.2.6
retrieving revision 1.39.2.7
diff -u -r1.39.2.6 -r1.39.2.7
--- Parser.java 27 Jan 2003 19:44:36 -0000 1.39.2.6
+++ Parser.java 30 Jan 2003 18:41:38 -0000 1.39.2.7
@@ -66,26 +66,34 @@
package org.apache.xalan.xsltc.compiler;
-import java.io.*;
-import java.net.URL;
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Properties;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
import java.util.Dictionary;
import java.util.Enumeration;
-import java.util.StringTokenizer;
+import java.util.Hashtable;
+import java.util.Properties;
import java.util.Stack;
-import java.net.MalformedURLException;
-
-import javax.xml.parsers.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import java.util.StringTokenizer;
+import java.util.Vector;
import java_cup.runtime.Symbol;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import org.apache.xalan.xsltc.compiler.util.MethodType;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
import org.apache.xalan.xsltc.runtime.AttributeList;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
public class Parser implements Constants, ContentHandler {
1.1.14.2 +5 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Pattern.java
Index: Pattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Pattern.java,v
retrieving revision 1.1.14.1
retrieving revision 1.1.14.2
diff -u -r1.1.14.1 -r1.1.14.2
--- Pattern.java 27 Jan 2003 19:44:37 -0000 1.1.14.1
+++ Pattern.java 30 Jan 2003 18:41:38 -0000 1.1.14.2
@@ -63,7 +63,10 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
public abstract class Pattern extends Expression {
/**
1.8.6.4 +9 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/PositionCall.java
Index: PositionCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/PositionCall.java,v
retrieving revision 1.8.6.3
retrieving revision 1.8.6.4
diff -u -r1.8.6.3 -r1.8.6.4
--- PositionCall.java 27 Jan 2003 19:44:37 -0000 1.8.6.3
+++ PositionCall.java 30 Jan 2003 18:41:38 -0000 1.8.6.4
@@ -64,10 +64,14 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
-import org.apache.xalan.xsltc.DOM;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.CompareGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.TestGenerator;
final class PositionCall extends FunctionCall {
1.22.6.7 +23 -7
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Predicate.java
Index: Predicate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Predicate.java,v
retrieving revision 1.22.6.6
retrieving revision 1.22.6.7
diff -u -r1.22.6.6 -r1.22.6.7
--- Predicate.java 27 Jan 2003 19:44:37 -0000 1.22.6.6
+++ Predicate.java 30 Jan 2003 18:41:38 -0000 1.22.6.7
@@ -64,15 +64,31 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
import java.util.ArrayList;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
import org.apache.bcel.classfile.Field;
+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.INVOKESPECIAL;
+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.bcel.generic.PUTFIELD;
+import org.apache.xalan.xsltc.compiler.util.BooleanType;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.FilterGenerator;
+import org.apache.xalan.xsltc.compiler.util.IntType;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NumberType;
+import org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import org.apache.xalan.xsltc.compiler.util.TestGenerator;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class Predicate extends Expression implements Closure {
1.6.2.4 +10 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java
Index: ProcessingInstruction.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -r1.6.2.3 -r1.6.2.4
--- ProcessingInstruction.java 27 Jan 2003 19:44:37 -0000 1.6.2.3
+++ ProcessingInstruction.java 30 Jan 2003 18:41:38 -0000 1.6.2.4
@@ -63,9 +63,16 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GETFIELD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class ProcessingInstruction extends Instruction {
1.2.6.4 +14 -7
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java
Index: ProcessingInstructionPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java,v
retrieving revision 1.2.6.3
retrieving revision 1.2.6.4
diff -u -r1.2.6.3 -r1.2.6.4
--- ProcessingInstructionPattern.java 27 Jan 2003 19:44:37 -0000 1.2.6.3
+++ ProcessingInstructionPattern.java 30 Jan 2003 18:41:38 -0000 1.2.6.4
@@ -62,14 +62,21 @@
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;
+import org.apache.bcel.generic.IFEQ;
+import org.apache.bcel.generic.IF_ICMPEQ;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+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.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
-import org.apache.xalan.xsltc.DOM;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
import org.apache.xalan.xsltc.dom.Axis;
-
import org.apache.xml.dtm.DTM;
final class ProcessingInstructionPattern extends StepPattern {
1.2.6.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RealExpr.java
Index: RealExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RealExpr.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- RealExpr.java 27 Jan 2003 19:44:37 -0000 1.2.6.1
+++ RealExpr.java 30 Jan 2003 18:41:38 -0000 1.2.6.2
@@ -63,9 +63,13 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionList;
+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.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class RealExpr extends Expression {
private double _value;
1.12.6.5 +18 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RelationalExpr.java
Index: RelationalExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RelationalExpr.java,v
retrieving revision 1.12.6.4
retrieving revision 1.12.6.5
diff -u -r1.12.6.4 -r1.12.6.5
--- RelationalExpr.java 27 Jan 2003 19:44:38 -0000 1.12.6.4
+++ RelationalExpr.java 30 Jan 2003 18:41:38 -0000 1.12.6.5
@@ -63,11 +63,25 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.bcel.generic.BranchInstruction;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
+import org.apache.xalan.xsltc.compiler.util.BooleanType;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import org.apache.xalan.xsltc.compiler.util.IntType;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodType;
+import org.apache.xalan.xsltc.compiler.util.NodeSetType;
+import org.apache.xalan.xsltc.compiler.util.NodeType;
+import org.apache.xalan.xsltc.compiler.util.RealType;
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import org.apache.xalan.xsltc.compiler.util.ResultTreeType;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
import org.apache.xalan.xsltc.runtime.Operators;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
final class RelationalExpr extends Expression implements Operators {
private int _op;
1.4.6.2 +9 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RoundCall.java
Index: RoundCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/RoundCall.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- RoundCall.java 27 Jan 2003 19:44:38 -0000 1.4.6.1
+++ RoundCall.java 30 Jan 2003 18:41:38 -0000 1.4.6.2
@@ -64,8 +64,14 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.IFNE;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
final class RoundCall extends FunctionCall {
1.3.6.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java
Index: SimpleAttributeValue.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- SimpleAttributeValue.java 27 Jan 2003 19:44:38 -0000 1.3.6.1
+++ SimpleAttributeValue.java 30 Jan 2003 18:41:38 -0000 1.3.6.2
@@ -63,9 +63,13 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionList;
+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.Type;
-import org.apache.xalan.xsltc.compiler.util.*;
-import org.apache.bcel.generic.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class SimpleAttributeValue extends AttributeValue {
1.14.6.6 +34 -13
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Sort.java
Index: Sort.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Sort.java,v
retrieving revision 1.14.6.5
retrieving revision 1.14.6.6
diff -u -r1.14.6.5 -r1.14.6.6
--- Sort.java 27 Jan 2003 19:44:38 -0000 1.14.6.5
+++ Sort.java 30 Jan 2003 18:41:38 -0000 1.14.6.6
@@ -64,23 +64,44 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
+import java.text.Collator;
import java.util.ArrayList;
-import java.util.StringTokenizer;
import java.util.NoSuchElementException;
-import java.text.Collator;
-
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
+import java.util.StringTokenizer;
+import java.util.Vector;
-import org.apache.bcel.classfile.JavaClass;
import org.apache.bcel.classfile.Field;
import org.apache.bcel.classfile.Method;
-import org.apache.bcel.generic.*;
-import org.apache.bcel.Constants;
-
-import org.apache.xalan.xsltc.dom.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.ANEWARRAY;
+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.NEW;
+import org.apache.bcel.generic.NOP;
+import org.apache.bcel.generic.PUSH;
+import org.apache.bcel.generic.PUTFIELD;
+import org.apache.bcel.generic.TABLESWITCH;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.CompareGenerator;
+import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import org.apache.xalan.xsltc.compiler.util.IntType;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NodeSortRecordFactGenerator;
+import org.apache.xalan.xsltc.compiler.util.NodeSortRecordGenerator;
+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;
+import org.apache.xalan.xsltc.dom.Axis;
final class Sort extends Instruction implements Closure {
1.4.6.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StartsWithCall.java
Index: StartsWithCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StartsWithCall.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- StartsWithCall.java 27 Jan 2003 19:44:38 -0000 1.4.6.1
+++ StartsWithCall.java 30 Jan 2003 18:41:38 -0000 1.4.6.2
@@ -66,9 +66,14 @@
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.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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class StartsWithCall extends FunctionCall {
1.30.2.7 +13 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Step.java
Index: Step.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Step.java,v
retrieving revision 1.30.2.6
retrieving revision 1.30.2.7
diff -u -r1.30.2.6 -r1.30.2.7
--- Step.java 27 Jan 2003 19:44:38 -0000 1.30.2.6
+++ Step.java 30 Jan 2003 18:41:38 -0000 1.30.2.7
@@ -66,12 +66,20 @@
import java.util.Vector;
+import org.apache.bcel.generic.CHECKCAST;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.ICONST;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
+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.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
import org.apache.xalan.xsltc.dom.Axis;
-import org.apache.xalan.xsltc.DOM;
-
import org.apache.xml.dtm.DTM;
final class Step extends RelativeLocationPath {
1.14.2.9 +31 -8
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StepPattern.java
Index: StepPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StepPattern.java,v
retrieving revision 1.14.2.8
retrieving revision 1.14.2.9
diff -u -r1.14.2.8 -r1.14.2.9
--- StepPattern.java 27 Jan 2003 19:44:38 -0000 1.14.2.8
+++ StepPattern.java 30 Jan 2003 18:41:38 -0000 1.14.2.9
@@ -65,15 +65,38 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.dom.Axis;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.Field;
+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.GETFIELD;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.GOTO_W;
+import org.apache.bcel.generic.IFLT;
+import org.apache.bcel.generic.IFNE;
+import org.apache.bcel.generic.IFNONNULL;
+import org.apache.bcel.generic.IF_ICMPEQ;
+import org.apache.bcel.generic.IF_ICMPLT;
+import org.apache.bcel.generic.IF_ICMPNE;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.ISTORE;
+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.bcel.generic.PUTFIELD;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+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.compiler.util.Util;
+import org.apache.xalan.xsltc.dom.Axis;
import org.apache.xml.dtm.DTM;
-
-import org.apache.xalan.xsltc.compiler.util.*;
class StepPattern extends RelativePathPattern {
1.3.6.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StringCall.java
Index: StringCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StringCall.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- StringCall.java 27 Jan 2003 19:44:39 -0000 1.3.6.1
+++ StringCall.java 30 Jan 2003 18:41:38 -0000 1.3.6.2
@@ -64,9 +64,13 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
+
+import org.apache.bcel.generic.InstructionList;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class StringCall extends FunctionCall {
public StringCall(QName fname, Vector arguments) {
1.2.6.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StringLengthCall.java
Index: StringLengthCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/StringLengthCall.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- StringLengthCall.java 27 Jan 2003 19:44:39 -0000 1.2.6.1
+++ StringLengthCall.java 30 Jan 2003 18:41:38 -0000 1.2.6.2
@@ -64,9 +64,13 @@
package org.apache.xalan.xsltc.compiler;
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.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
final class StringLengthCall extends FunctionCall {
public StringLengthCall(QName fname, Vector arguments) {
1.37.2.5 +24 -20
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Stylesheet.java
Index: Stylesheet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Stylesheet.java,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -u -r1.37.2.4 -r1.37.2.5
--- Stylesheet.java 27 Jan 2003 19:44:39 -0000 1.37.2.4
+++ Stylesheet.java 30 Jan 2003 18:41:38 -0000 1.37.2.5
@@ -64,32 +64,36 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
+import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Iterator;
import java.util.Properties;
-import java.util.Enumeration;
import java.util.StringTokenizer;
-import java.util.Iterator;
-import java.net.URL;
-
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
-import org.apache.xalan.xsltc.compiler.util.Type;
-
-import org.apache.bcel.generic.*;
-import org.apache.bcel.util.*;
-import org.apache.bcel.classfile.JavaClass;
+import java.util.Vector;
-import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.bcel.generic.ANEWARRAY;
+import org.apache.bcel.generic.ASTORE;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.FieldGen;
+import org.apache.bcel.generic.GETFIELD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.ISTORE;
+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.bcel.generic.PUTFIELD;
+import org.apache.bcel.generic.TargetLostException;
+import org.apache.bcel.util.InstructionFinder;
import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
-import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
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.compiler.util.Util;
-
-import org.apache.xalan.xsltc.DOM;
-
import org.apache.xml.dtm.DTM;
public final class Stylesheet extends SyntaxTreeNode {
1.6.2.4 +3 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SymbolTable.java
Index: SymbolTable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SymbolTable.java,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -r1.6.2.3 -r1.6.2.4
--- SymbolTable.java 27 Jan 2003 19:44:40 -0000 1.6.2.3
+++ SymbolTable.java 30 Jan 2003 18:41:38 -0000 1.6.2.4
@@ -64,12 +64,11 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
import java.util.Hashtable;
-import java.util.Enumeration;
import java.util.StringTokenizer;
+import java.util.Vector;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.MethodType;
final class SymbolTable {
1.19.2.7 +20 -10
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java
Index: SyntaxTreeNode.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java,v
retrieving revision 1.19.2.6
retrieving revision 1.19.2.7
diff -u -r1.19.2.6 -r1.19.2.7
--- SyntaxTreeNode.java 27 Jan 2003 19:44:40 -0000 1.19.2.6
+++ SyntaxTreeNode.java 30 Jan 2003 18:41:38 -0000 1.19.2.7
@@ -67,19 +67,29 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
import java.util.Enumeration;
import java.util.Hashtable;
-import java.net.URL;
-
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
+import java.util.Vector;
+import org.apache.bcel.generic.ANEWARRAY;
+import org.apache.bcel.generic.CHECKCAST;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.DUP_X1;
+import org.apache.bcel.generic.GETFIELD;
+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.InstructionList;
+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.ErrorMsg;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.xalan.xsltc.compiler.util.ReferenceType;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+
+import org.xml.sax.Attributes;
public abstract class SyntaxTreeNode implements Constants {
1.16.6.5 +10 -8
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Template.java
Index: Template.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Template.java,v
retrieving revision 1.16.6.4
retrieving revision 1.16.6.5
diff -u -r1.16.6.4 -r1.16.6.5
--- Template.java 27 Jan 2003 19:44:40 -0000 1.16.6.4
+++ Template.java 30 Jan 2003 18:41:38 -0000 1.16.6.5
@@ -66,15 +66,17 @@
package org.apache.xalan.xsltc.compiler;
import java.util.Vector;
-import java.util.Enumeration;
-import java.util.Hashtable;
+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;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-
-import org.apache.bcel.generic.*;
-import org.apache.bcel.classfile.JavaClass;
-
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
public final class Template extends TopLevelElement {
1.6.6.5 +7 -7
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TestSeq.java
Index: TestSeq.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TestSeq.java,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- TestSeq.java 27 Jan 2003 19:44:40 -0000 1.6.6.4
+++ TestSeq.java 30 Jan 2003 18:41:38 -0000 1.6.6.5
@@ -65,14 +65,14 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
-import java.util.Hashtable;
import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Iterator;
+import java.util.Vector;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.GOTO_W;
+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.MethodGenerator;
/**
* A test sequence is a sequence of patterns that
1.9.6.4 +8 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Text.java
Index: Text.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Text.java,v
retrieving revision 1.9.6.3
retrieving revision 1.9.6.4
diff -u -r1.9.6.3 -r1.9.6.4
--- Text.java 27 Jan 2003 19:44:40 -0000 1.9.6.3
+++ Text.java 30 Jan 2003 18:41:38 -0000 1.9.6.4
@@ -64,11 +64,13 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
-
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.InstructionList;
+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.Util;
final class Text extends Instruction {
1.4.6.2 +6 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TopLevelElement.java
Index: TopLevelElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TopLevelElement.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- TopLevelElement.java 27 Jan 2003 19:44:40 -0000 1.4.6.1
+++ TopLevelElement.java 30 Jan 2003 18:41:38 -0000 1.4.6.2
@@ -60,12 +60,13 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Enumeration;
-
+import org.apache.bcel.generic.InstructionList;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.Util;
class TopLevelElement extends SyntaxTreeNode {
1.7.6.5 +11 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TransletOutput.java
Index: TransletOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/TransletOutput.java,v
retrieving revision 1.7.6.4
retrieving revision 1.7.6.5
diff -u -r1.7.6.4 -r1.7.6.5
--- TransletOutput.java 27 Jan 2003 19:44:40 -0000 1.7.6.4
+++ TransletOutput.java 30 Jan 2003 18:41:38 -0000 1.7.6.5
@@ -62,9 +62,17 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
+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.StringType;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class TransletOutput extends Instruction {
1.4.6.2 +6 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java
Index: UnaryOpExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- UnaryOpExpr.java 27 Jan 2003 19:44:40 -0000 1.4.6.1
+++ UnaryOpExpr.java 30 Jan 2003 18:41:38 -0000 1.4.6.2
@@ -63,9 +63,12 @@
package org.apache.xalan.xsltc.compiler;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodType;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class UnaryOpExpr extends Expression {
private Expression _left;
1.6.6.3 +11 -8
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnionPathExpr.java
Index: UnionPathExpr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnionPathExpr.java,v
retrieving revision 1.6.6.2
retrieving revision 1.6.6.3
diff -u -r1.6.6.2 -r1.6.6.3
--- UnionPathExpr.java 27 Jan 2003 19:44:40 -0000 1.6.6.2
+++ UnionPathExpr.java 30 Jan 2003 18:41:38 -0000 1.6.6.3
@@ -65,14 +65,17 @@
import java.util.Vector;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.dom.Axis;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
import org.apache.xalan.xsltc.compiler.util.Type;
-
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
-
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.dom.Axis;
import org.apache.xml.dtm.DTM;
final class UnionPathExpr extends Expression {
1.2.6.4 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java
Index: UnparsedEntityUriCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java,v
retrieving revision 1.2.6.3
retrieving revision 1.2.6.4
diff -u -r1.2.6.3 -r1.2.6.4
--- UnparsedEntityUriCall.java 27 Jan 2003 19:44:40 -0000 1.2.6.3
+++ UnparsedEntityUriCall.java 30 Jan 2003 18:41:38 -0000 1.2.6.4
@@ -66,9 +66,14 @@
import java.util.Vector;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.InstructionList;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class UnparsedEntityUriCall extends FunctionCall {
private Expression _entity;
1.2.6.4 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnresolvedRef.java
Index: UnresolvedRef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnresolvedRef.java,v
retrieving revision 1.2.6.3
retrieving revision 1.2.6.4
diff -u -r1.2.6.3 -r1.2.6.4
--- UnresolvedRef.java 27 Jan 2003 19:44:40 -0000 1.2.6.3
+++ UnresolvedRef.java 30 Jan 2003 18:41:38 -0000 1.2.6.4
@@ -62,9 +62,11 @@
package org.apache.xalan.xsltc.compiler;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class UnresolvedRef extends VariableRefBase {
1.3.6.2 +6 -11
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnsupportedElement.java
Index: UnsupportedElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UnsupportedElement.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- UnsupportedElement.java 27 Jan 2003 19:44:40 -0000 1.3.6.1
+++ UnsupportedElement.java 30 Jan 2003 18:41:38 -0000 1.3.6.2
@@ -62,19 +62,14 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Hashtable;
-import java.util.Enumeration;
import java.util.Vector;
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-
+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.ReferenceType;
-
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class UnsupportedElement extends SyntaxTreeNode {
1.7.6.4 +9 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UseAttributeSets.java
Index: UseAttributeSets.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/UseAttributeSets.java,v
retrieving revision 1.7.6.3
retrieving revision 1.7.6.4
diff -u -r1.7.6.3 -r1.7.6.4
--- UseAttributeSets.java 27 Jan 2003 19:44:40 -0000 1.7.6.3
+++ UseAttributeSets.java 30 Jan 2003 18:41:38 -0000 1.7.6.4
@@ -64,14 +64,17 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
-import java.util.Iterator;
-import java.util.Enumeration;
import java.util.StringTokenizer;
+import java.util.Vector;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.InstructionList;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class UseAttributeSets extends Instruction {
1.7.6.3 +11 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ValueOf.java
Index: ValueOf.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ValueOf.java,v
retrieving revision 1.7.6.2
retrieving revision 1.7.6.3
diff -u -r1.7.6.2 -r1.7.6.3
--- ValueOf.java 27 Jan 2003 19:44:41 -0000 1.7.6.2
+++ ValueOf.java 30 Jan 2003 18:41:38 -0000 1.7.6.3
@@ -64,11 +64,17 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.bcel.generic.*;
-
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class ValueOf extends Instruction {
private Expression _select;
1.22.6.4 +16 -8
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Variable.java
Index: Variable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Variable.java,v
retrieving revision 1.22.6.3
retrieving revision 1.22.6.4
diff -u -r1.22.6.3 -r1.22.6.4
--- Variable.java 27 Jan 2003 19:44:41 -0000 1.22.6.3
+++ Variable.java 30 Jan 2003 18:41:38 -0000 1.22.6.4
@@ -66,14 +66,22 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
-
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.*;
import org.apache.bcel.classfile.Field;
-import org.apache.xalan.xsltc.compiler.util.*;
-import org.apache.xalan.xsltc.dom.Axis;
+import org.apache.bcel.generic.ACONST_NULL;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.DCONST;
+import org.apache.bcel.generic.ICONST;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUTFIELD;
+import org.apache.xalan.xsltc.compiler.util.BooleanType;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import org.apache.xalan.xsltc.compiler.util.IntType;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NodeType;
+import org.apache.xalan.xsltc.compiler.util.RealType;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
final class Variable extends VariableBase {
1.13.6.4 +10 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableBase.java
Index: VariableBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableBase.java,v
retrieving revision 1.13.6.3
retrieving revision 1.13.6.4
diff -u -r1.13.6.3 -r1.13.6.4
--- VariableBase.java 27 Jan 2003 19:44:41 -0000 1.13.6.3
+++ VariableBase.java 30 Jan 2003 18:41:38 -0000 1.13.6.4
@@ -68,12 +68,16 @@
import java.util.Vector;
-import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.bcel.generic.ConstantPoolGen;
import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.*;
-import org.apache.bcel.classfile.Field;
-import org.apache.xalan.xsltc.compiler.util.*;
-import org.apache.xalan.xsltc.dom.Axis;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.LocalVariableGen;
+import org.apache.bcel.generic.PUSH;
+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.Util;
class VariableBase extends TopLevelElement {
1.11.6.5 +9 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableRef.java
Index: VariableRef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableRef.java,v
retrieving revision 1.11.6.4
retrieving revision 1.11.6.5
diff -u -r1.11.6.4 -r1.11.6.5
--- VariableRef.java 27 Jan 2003 19:44:41 -0000 1.11.6.4
+++ VariableRef.java 30 Jan 2003 18:41:38 -0000 1.11.6.5
@@ -65,9 +65,14 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.bcel.generic.CHECKCAST;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GETFIELD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.xalan.xsltc.compiler.util.ClassGenerator;
+import org.apache.xalan.xsltc.compiler.util.MethodGenerator;
+import org.apache.xalan.xsltc.compiler.util.NodeSetType;
final class VariableRef extends VariableRefBase {
1.8.6.4 +2 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableRefBase.java
Index: VariableRefBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableRefBase.java,v
retrieving revision 1.8.6.3
retrieving revision 1.8.6.4
diff -u -r1.8.6.3 -r1.8.6.4
--- VariableRefBase.java 27 Jan 2003 19:44:41 -0000 1.8.6.3
+++ VariableRefBase.java 30 Jan 2003 18:41:38 -0000 1.8.6.4
@@ -64,8 +64,7 @@
package org.apache.xalan.xsltc.compiler;
import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
class VariableRefBase extends Expression {
1.9.10.4 +8 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/When.java
Index: When.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/When.java,v
retrieving revision 1.9.10.3
retrieving revision 1.9.10.4
diff -u -r1.9.10.3 -r1.9.10.4
--- When.java 27 Jan 2003 19:44:41 -0000 1.9.10.3
+++ When.java 30 Jan 2003 18:41:39 -0000 1.9.10.4
@@ -64,7 +64,13 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.BooleanType;
+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.compiler.util.Util;
final class When extends Instruction {
1.7.6.2 +17 -11
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Whitespace.java
Index: Whitespace.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Whitespace.java,v
retrieving revision 1.7.6.1
retrieving revision 1.7.6.2
diff -u -r1.7.6.1 -r1.7.6.2
--- Whitespace.java 27 Jan 2003 19:44:41 -0000 1.7.6.1
+++ Whitespace.java 30 Jan 2003 18:41:39 -0000 1.7.6.2
@@ -62,19 +62,25 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
import java.util.StringTokenizer;
+import java.util.Vector;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.IF_ICMPEQ;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
+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.ReferenceType;
-
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.generic.*;
-
-import org.apache.xalan.xsltc.dom.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class Whitespace extends TopLevelElement {
// Three possible actions for the translet:
1.10.6.2 +11 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/WithParam.java
Index: WithParam.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/WithParam.java,v
retrieving revision 1.10.6.1
retrieving revision 1.10.6.2
diff -u -r1.10.6.1 -r1.10.6.2
--- WithParam.java 27 Jan 2003 19:44:41 -0000 1.10.6.1
+++ WithParam.java 30 Jan 2003 18:41:39 -0000 1.10.6.2
@@ -65,10 +65,17 @@
package org.apache.xalan.xsltc.compiler;
-import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
+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.ReferenceType;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.Type;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class WithParam extends Instruction {
1.35.6.8 +20 -21
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XSLTC.java
Index: XSLTC.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XSLTC.java,v
retrieving revision 1.35.6.7
retrieving revision 1.35.6.8
diff -u -r1.35.6.7 -r1.35.6.8
--- XSLTC.java 27 Jan 2003 19:44:41 -0000 1.35.6.7
+++ XSLTC.java 30 Jan 2003 18:41:39 -0000 1.35.6.8
@@ -66,31 +66,30 @@
package org.apache.xalan.xsltc.compiler;
-import java.io.*;
-import java.util.Set;
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Map;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.util.jar.*;
-
-import org.xml.sax.*;
-
-import javax.xml.parsers.*;
+import java.util.Properties;
+import java.util.Vector;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
-import org.apache.xalan.xsltc.compiler.util.*;
-import org.apache.xalan.xsltc.cmdline.getopt.*;
-import org.apache.xalan.xsltc.DOM;
import org.apache.bcel.classfile.JavaClass;
-
+import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import org.apache.xalan.xsltc.compiler.util.Util;
import org.apache.xml.dtm.DTM;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
public final class XSLTC {
1.17.2.4 +11 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslAttribute.java
Index: XslAttribute.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslAttribute.java,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -u -r1.17.2.3 -r1.17.2.4
--- XslAttribute.java 27 Jan 2003 19:44:41 -0000 1.17.2.3
+++ XslAttribute.java 30 Jan 2003 18:41:39 -0000 1.17.2.4
@@ -67,9 +67,17 @@
import java.util.Vector;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GETFIELD;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class XslAttribute extends Instruction {
1.16.2.6 +11 -7
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslElement.java
Index: XslElement.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/XslElement.java,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -r1.16.2.5 -r1.16.2.6
--- XslElement.java 27 Jan 2003 19:44:41 -0000 1.16.2.5
+++ XslElement.java 30 Jan 2003 18:41:39 -0000 1.16.2.6
@@ -64,13 +64,17 @@
package org.apache.xalan.xsltc.compiler;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.LocalVariableGen;
+import org.apache.bcel.generic.PUSH;
+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.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
+import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
+import org.apache.xalan.xsltc.compiler.util.Util;
final class XslElement extends Instruction {
No revision
No revision
1.3.6.2 +6 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java
Index: AttributeSetMethodGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- AttributeSetMethodGenerator.java 27 Jan 2003 19:44:59 -0000 1.3.6.1
+++ AttributeSetMethodGenerator.java 30 Jan 2003 18:41:44 -0000 1.3.6.2
@@ -63,11 +63,11 @@
package org.apache.xalan.xsltc.compiler.util;
-import java.util.Vector;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.Template;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.ASTORE;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionList;
public final class AttributeSetMethodGenerator extends MethodGenerator {
private static int HANDLER_INDEX = 1;
1.3.6.4 +23 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/BooleanType.java
Index: BooleanType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/BooleanType.java,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -u -r1.3.6.3 -r1.3.6.4
--- BooleanType.java 27 Jan 2003 19:44:59 -0000 1.3.6.3
+++ BooleanType.java 30 Jan 2003 18:41:44 -0000 1.3.6.4
@@ -63,9 +63,28 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.BranchInstruction;
+import org.apache.bcel.generic.CHECKCAST;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.IFEQ;
+import org.apache.bcel.generic.IFGE;
+import org.apache.bcel.generic.IFGT;
+import org.apache.bcel.generic.IFLE;
+import org.apache.bcel.generic.IFLT;
+import org.apache.bcel.generic.IF_ICMPGE;
+import org.apache.bcel.generic.IF_ICMPGT;
+import org.apache.bcel.generic.IF_ICMPLE;
+import org.apache.bcel.generic.IF_ICMPLT;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
+import org.apache.bcel.generic.PUSH;
import org.apache.xalan.xsltc.compiler.Constants;
public final class BooleanType extends Type {
1.4.6.2 +5 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ClassGenerator.java
Index: ClassGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ClassGenerator.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- ClassGenerator.java 27 Jan 2003 19:44:59 -0000 1.4.6.1
+++ ClassGenerator.java 30 Jan 2003 18:41:44 -0000 1.4.6.2
@@ -63,9 +63,11 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.Parser;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.Instruction;
import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.bcel.generic.*;
+import org.apache.xalan.xsltc.compiler.Parser;
import org.apache.xalan.xsltc.compiler.Stylesheet;
/**
1.4.6.2 +10 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/CompareGenerator.java
Index: CompareGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/CompareGenerator.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- CompareGenerator.java 27 Jan 2003 19:44:59 -0000 1.4.6.1
+++ CompareGenerator.java 30 Jan 2003 18:41:44 -0000 1.4.6.2
@@ -63,11 +63,17 @@
package org.apache.xalan.xsltc.compiler.util;
+import org.apache.bcel.generic.ACONST_NULL;
+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.ISTORE;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.LocalVariableGen;
import org.apache.bcel.generic.Type;
-import org.apache.bcel.generic.*;
-
import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.compiler.Template;
public final class CompareGenerator extends MethodGenerator {
1.5.10.7 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java
Index: ErrorMessages.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java,v
retrieving revision 1.5.10.6
retrieving revision 1.5.10.7
diff -u -r1.5.10.6 -r1.5.10.7
--- ErrorMessages.java 27 Jan 2003 19:45:00 -0000 1.5.10.6
+++ ErrorMessages.java 30 Jan 2003 18:41:44 -0000 1.5.10.7
@@ -62,9 +62,9 @@
package org.apache.xalan.xsltc.compiler.util;
-import java.util.Vector;
import java.util.Enumeration;
import java.util.ResourceBundle;
+import java.util.Vector;
public class ErrorMessages extends ResourceBundle {
1.5.10.4 +1 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java
Index: ErrorMessages_no.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java,v
retrieving revision 1.5.10.3
retrieving revision 1.5.10.4
diff -u -r1.5.10.3 -r1.5.10.4
--- ErrorMessages_no.java 27 Jan 2003 19:45:00 -0000 1.5.10.3
+++ ErrorMessages_no.java 30 Jan 2003 18:41:44 -0000 1.5.10.4
@@ -62,9 +62,6 @@
package org.apache.xalan.xsltc.compiler.util;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.ResourceBundle;
public final class ErrorMessages_no extends ErrorMessages {
1.12.10.6 +5 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java
Index: ErrorMsg.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java,v
retrieving revision 1.12.10.5
retrieving revision 1.12.10.6
diff -u -r1.12.10.5 -r1.12.10.6
--- ErrorMsg.java 27 Jan 2003 19:45:00 -0000 1.12.10.5
+++ ErrorMsg.java 30 Jan 2003 18:41:44 -0000 1.12.10.6
@@ -66,13 +66,12 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.Stylesheet;
-import org.apache.xalan.xsltc.compiler.SyntaxTreeNode;
-
-import java.net.URL;
+import java.text.MessageFormat;
import java.util.Locale;
import java.util.ResourceBundle;
-import java.text.MessageFormat;
+
+import org.apache.xalan.xsltc.compiler.Stylesheet;
+import org.apache.xalan.xsltc.compiler.SyntaxTreeNode;
public final class ErrorMsg {
1.2.6.2 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/FilterGenerator.java
Index: FilterGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/FilterGenerator.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- FilterGenerator.java 27 Jan 2003 19:45:00 -0000 1.2.6.1
+++ FilterGenerator.java 30 Jan 2003 18:41:44 -0000 1.2.6.2
@@ -63,7 +63,8 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.bcel.generic.*;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.Instruction;
import org.apache.xalan.xsltc.compiler.Stylesheet;
/**
1.3.6.4 +25 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/IntType.java
Index: IntType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/IntType.java,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -u -r1.3.6.3 -r1.3.6.4
--- IntType.java 27 Jan 2003 19:45:00 -0000 1.3.6.3
+++ IntType.java 30 Jan 2003 18:41:44 -0000 1.3.6.4
@@ -63,11 +63,31 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.BranchInstruction;
+import org.apache.bcel.generic.CHECKCAST;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.IFEQ;
+import org.apache.bcel.generic.IFGE;
+import org.apache.bcel.generic.IFGT;
+import org.apache.bcel.generic.IFLE;
+import org.apache.bcel.generic.IFLT;
+import org.apache.bcel.generic.IF_ICMPGE;
+import org.apache.bcel.generic.IF_ICMPGT;
+import org.apache.bcel.generic.IF_ICMPLE;
+import org.apache.bcel.generic.IF_ICMPLT;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
import org.apache.xalan.xsltc.compiler.Constants;
+import org.apache.xalan.xsltc.compiler.FlowList;
public final class IntType extends NumberType {
protected IntType() {}
1.2.6.2 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/MatchGenerator.java
Index: MatchGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/MatchGenerator.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- MatchGenerator.java 27 Jan 2003 19:45:00 -0000 1.2.6.1
+++ MatchGenerator.java 30 Jan 2003 18:41:44 -0000 1.2.6.2
@@ -63,9 +63,13 @@
package org.apache.xalan.xsltc.compiler.util;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Template;
public final class MatchGenerator extends MethodGenerator {
private static int CURRENT_INDEX = 1;
1.8.6.5 +13 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java
Index: MethodGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java,v
retrieving revision 1.8.6.4
retrieving revision 1.8.6.5
diff -u -r1.8.6.4 -r1.8.6.5
--- MethodGenerator.java 27 Jan 2003 19:45:00 -0000 1.8.6.4
+++ MethodGenerator.java 30 Jan 2003 18:41:44 -0000 1.8.6.5
@@ -63,10 +63,19 @@
package org.apache.xalan.xsltc.compiler.util;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.ASTORE;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.ICONST;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.LocalVariableGen;
+import org.apache.bcel.generic.MethodGen;
import org.apache.bcel.generic.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Template;
-import org.apache.xalan.xsltc.dom.SAXImpl;
public class MethodGenerator extends MethodGen
implements org.apache.xalan.xsltc.compiler.Constants {
1.2.10.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/MultiHashtable.java
Index: MultiHashtable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/MultiHashtable.java,v
retrieving revision 1.2.10.3
retrieving revision 1.2.10.4
diff -u -r1.2.10.3 -r1.2.10.4
--- MultiHashtable.java 27 Jan 2003 19:45:01 -0000 1.2.10.3
+++ MultiHashtable.java 30 Jan 2003 18:41:44 -0000 1.2.10.4
@@ -63,8 +63,8 @@
package org.apache.xalan.xsltc.compiler.util;
-import java.util.Vector;
import java.util.Hashtable;
+import java.util.Vector;
public final class MultiHashtable extends Hashtable {
public Object put(Object key, Object value) {
1.2.6.2 +3 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java
Index: NamedMethodGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- NamedMethodGenerator.java 27 Jan 2003 19:45:01 -0000 1.2.6.1
+++ NamedMethodGenerator.java 30 Jan 2003 18:41:44 -0000 1.2.6.2
@@ -63,11 +63,9 @@
package org.apache.xalan.xsltc.compiler.util;
-import java.util.Vector;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.Template;
/**
* This class is used for named templates. Named template methods have access
1.3.6.2 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java
Index: NodeCounterGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- NodeCounterGenerator.java 27 Jan 2003 19:45:01 -0000 1.3.6.1
+++ NodeCounterGenerator.java 30 Jan 2003 18:41:44 -0000 1.3.6.2
@@ -63,7 +63,8 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.bcel.generic.*;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.Instruction;
import org.apache.xalan.xsltc.compiler.Stylesheet;
/**
1.9.6.6 +13 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java
Index: NodeSetType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java,v
retrieving revision 1.9.6.5
retrieving revision 1.9.6.6
diff -u -r1.9.6.5 -r1.9.6.6
--- NodeSetType.java 27 Jan 2003 19:45:01 -0000 1.9.6.5
+++ NodeSetType.java 30 Jan 2003 18:41:44 -0000 1.9.6.6
@@ -63,11 +63,19 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.FlowList;
+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.IFLT;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
import org.apache.xalan.xsltc.compiler.Constants;
+import org.apache.xalan.xsltc.compiler.FlowList;
public final class NodeSetType extends Type {
protected NodeSetType() {}
1.1.6.2 +1 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSortRecordFactGenerator.java
Index: NodeSortRecordFactGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSortRecordFactGenerator.java,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -r1.1.6.1 -r1.1.6.2
--- NodeSortRecordFactGenerator.java 27 Jan 2003 19:45:01 -0000 1.1.6.1
+++ NodeSortRecordFactGenerator.java 30 Jan 2003 18:41:44 -0000 1.1.6.2
@@ -62,10 +62,6 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
-
import org.apache.xalan.xsltc.compiler.Stylesheet;
/**
1.4.6.2 +3 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java
Index: NodeSortRecordGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- NodeSortRecordGenerator.java 27 Jan 2003 19:45:01 -0000 1.4.6.1
+++ NodeSortRecordGenerator.java 30 Jan 2003 18:41:44 -0000 1.4.6.2
@@ -64,10 +64,8 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.util.*;
-
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.Instruction;
import org.apache.xalan.xsltc.compiler.Stylesheet;
/**
1.7.6.5 +17 -6
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeType.java
Index: NodeType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NodeType.java,v
retrieving revision 1.7.6.4
retrieving revision 1.7.6.5
diff -u -r1.7.6.4 -r1.7.6.5
--- NodeType.java 27 Jan 2003 19:45:01 -0000 1.7.6.4
+++ NodeType.java 30 Jan 2003 18:41:44 -0000 1.7.6.5
@@ -63,12 +63,23 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.NodeTest;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.CHECKCAST;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GETFIELD;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.IFEQ;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.ISTORE;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.NEW;
+import org.apache.bcel.generic.PUSH;
import org.apache.xalan.xsltc.compiler.Constants;
+import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.xalan.xsltc.compiler.NodeTest;
public final class NodeType extends Type {
private final int _type;
1.1.14.2 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NumberType.java
Index: NumberType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/NumberType.java,v
retrieving revision 1.1.14.1
retrieving revision 1.1.14.2
diff -u -r1.1.14.1 -r1.1.14.2
--- NumberType.java 27 Jan 2003 19:45:01 -0000 1.1.14.1
+++ NumberType.java 30 Jan 2003 18:41:44 -0000 1.1.14.2
@@ -63,7 +63,6 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
public abstract class NumberType extends Type {
public boolean isNumber() {
1.2.4.2 +11 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ObjectType.java
Index: ObjectType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ObjectType.java,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- ObjectType.java 27 Jan 2003 19:45:01 -0000 1.2.4.1
+++ ObjectType.java 30 Jan 2003 18:41:44 -0000 1.2.4.2
@@ -63,9 +63,16 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
+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.IFNULL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
import org.apache.xalan.xsltc.compiler.Constants;
import org.apache.xalan.xsltc.runtime.TransletLoader;
1.3.6.4 +18 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/RealType.java
Index: RealType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/RealType.java,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -u -r1.3.6.3 -r1.3.6.4
--- RealType.java 27 Jan 2003 19:45:02 -0000 1.3.6.3
+++ RealType.java 30 Jan 2003 18:41:44 -0000 1.3.6.4
@@ -63,11 +63,24 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.bcel.generic.BranchHandle;
+import org.apache.bcel.generic.CHECKCAST;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.DLOAD;
+import org.apache.bcel.generic.DSTORE;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.IFEQ;
+import org.apache.bcel.generic.IFNE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.LocalVariableGen;
+import org.apache.bcel.generic.NEW;
import org.apache.xalan.xsltc.compiler.Constants;
+import org.apache.xalan.xsltc.compiler.FlowList;
public final class RealType extends NumberType {
protected RealType() {}
1.7.6.5 +11 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java
Index: ReferenceType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java,v
retrieving revision 1.7.6.4
retrieving revision 1.7.6.5
diff -u -r1.7.6.4 -r1.7.6.5
--- ReferenceType.java 27 Jan 2003 19:45:02 -0000 1.7.6.4
+++ ReferenceType.java 30 Jan 2003 18:41:44 -0000 1.7.6.5
@@ -64,11 +64,17 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.ASTORE;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.IFEQ;
+import org.apache.bcel.generic.ILOAD;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionList;
import org.apache.xalan.xsltc.compiler.Constants;
+import org.apache.xalan.xsltc.compiler.FlowList;
public final class ReferenceType extends Type {
protected ReferenceType() {}
1.10.6.7 +16 -9
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java
Index: ResultTreeType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java,v
retrieving revision 1.10.6.6
retrieving revision 1.10.6.7
diff -u -r1.10.6.6 -r1.10.6.7
--- ResultTreeType.java 27 Jan 2003 19:45:02 -0000 1.10.6.6
+++ ResultTreeType.java 30 Jan 2003 18:41:45 -0000 1.10.6.7
@@ -64,15 +64,22 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.DOM;
-
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.bcel.generic.ALOAD;
+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.IFEQ;
+import org.apache.bcel.generic.INVOKEINTERFACE;
+import org.apache.bcel.generic.INVOKESPECIAL;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.Instruction;
+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.Constants;
-
-import org.apache.xml.dtm.DTM;
+import org.apache.xalan.xsltc.compiler.FlowList;
public final class ResultTreeType extends Type {
private final String _methodName;
1.2.6.2 +6 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java
Index: RtMethodGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- RtMethodGenerator.java 27 Jan 2003 19:45:02 -0000 1.2.6.1
+++ RtMethodGenerator.java 30 Jan 2003 18:41:45 -0000 1.2.6.2
@@ -63,11 +63,12 @@
package org.apache.xalan.xsltc.compiler.util;
-import java.util.Vector;
+import org.apache.bcel.generic.ALOAD;
+import org.apache.bcel.generic.ASTORE;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.Template;
/**
* This class is used for result trees implemented as methods. These
1.3.6.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java
Index: SlotAllocator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- SlotAllocator.java 27 Jan 2003 19:45:02 -0000 1.3.6.1
+++ SlotAllocator.java 30 Jan 2003 18:41:45 -0000 1.3.6.2
@@ -62,8 +62,8 @@
package org.apache.xalan.xsltc.compiler.util;
+import org.apache.bcel.generic.LocalVariableGen;
import org.apache.bcel.generic.Type;
-import org.apache.bcel.generic.*;
final class SlotAllocator {
1.5.6.5 +14 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/StringType.java
Index: StringType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/StringType.java,v
retrieving revision 1.5.6.4
retrieving revision 1.5.6.5
diff -u -r1.5.6.4 -r1.5.6.5
--- StringType.java 27 Jan 2003 19:45:02 -0000 1.5.6.4
+++ StringType.java 30 Jan 2003 18:41:45 -0000 1.5.6.5
@@ -63,11 +63,20 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.FlowList;
+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.IFEQ;
+import org.apache.bcel.generic.IFNONNULL;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.INVOKEVIRTUAL;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
import org.apache.xalan.xsltc.compiler.Constants;
+import org.apache.xalan.xsltc.compiler.FlowList;
public class StringType extends Type {
protected StringType() {}
1.3.6.2 +8 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/TestGenerator.java
Index: TestGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/TestGenerator.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- TestGenerator.java 27 Jan 2003 19:45:02 -0000 1.3.6.1
+++ TestGenerator.java 30 Jan 2003 18:41:45 -0000 1.3.6.2
@@ -64,9 +64,14 @@
package org.apache.xalan.xsltc.compiler.util;
+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.ISTORE;
+import org.apache.bcel.generic.Instruction;
+import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Template;
public final class TestGenerator extends MethodGenerator {
private static int CONTEXT_NODE_INDEX = 1;
1.9.6.4 +5 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/Type.java
Index: Type.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/Type.java,v
retrieving revision 1.9.6.3
retrieving revision 1.9.6.4
diff -u -r1.9.6.3 -r1.9.6.4
--- Type.java 27 Jan 2003 19:45:02 -0000 1.9.6.3
+++ Type.java 30 Jan 2003 18:41:45 -0000 1.9.6.4
@@ -64,11 +64,11 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
-import org.apache.xalan.xsltc.compiler.NodeTest;
-import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.bcel.generic.BranchInstruction;
+import org.apache.bcel.generic.Instruction;
import org.apache.xalan.xsltc.compiler.Constants;
+import org.apache.xalan.xsltc.compiler.FlowList;
+import org.apache.xalan.xsltc.compiler.NodeTest;
public abstract class Type implements Constants {
public static final Type Int = new IntType();
1.5.2.5 +1 -3
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/Util.java
Index: Util.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/Util.java,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -r1.5.2.4 -r1.5.2.5
--- Util.java 27 Jan 2003 19:45:04 -0000 1.5.2.4
+++ Util.java 30 Jan 2003 18:41:45 -0000 1.5.2.5
@@ -64,8 +64,6 @@
package org.apache.xalan.xsltc.compiler.util;
import org.apache.bcel.generic.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
import org.apache.xalan.xsltc.compiler.Constants;
public final class Util {
1.3.6.2 +3 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/VoidType.java
Index: VoidType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/VoidType.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- VoidType.java 27 Jan 2003 19:45:04 -0000 1.3.6.1
+++ VoidType.java 30 Jan 2003 18:41:45 -0000 1.3.6.2
@@ -63,9 +63,8 @@
package org.apache.xalan.xsltc.compiler.util;
-import org.apache.xalan.xsltc.compiler.util.Type;
-import org.apache.bcel.generic.*;
-import org.apache.xalan.xsltc.compiler.Parser;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.PUSH;
import org.apache.xalan.xsltc.compiler.Constants;
public final class VoidType extends Type {
No revision
No revision
1.6.10.7 +2 -5
xml-xalan/java/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java
Index: AbsoluteIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java,v
retrieving revision 1.6.10.6
retrieving revision 1.6.10.7
diff -u -r1.6.10.6 -r1.6.10.7
--- AbsoluteIterator.java 27 Jan 2003 19:45:07 -0000 1.6.10.6
+++ AbsoluteIterator.java 30 Jan 2003 18:41:46 -0000 1.6.10.7
@@ -63,12 +63,9 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.NodeIterator;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
-import org.apache.xml.dtm.ref.DTMDefaultBaseIterators;
import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
import org.apache.xml.dtm.ref.DTMDefaultBase;
/**
1.1.14.6 +1 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/AnyNodeCounter.java
Index: AnyNodeCounter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/AnyNodeCounter.java,v
retrieving revision 1.1.14.5
retrieving revision 1.1.14.6
diff -u -r1.1.14.5 -r1.1.14.6
--- AnyNodeCounter.java 27 Jan 2003 19:45:08 -0000 1.1.14.5
+++ AnyNodeCounter.java 30 Jan 2003 18:41:46 -0000 1.1.14.6
@@ -65,10 +65,7 @@
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.NodeIterator;
-
import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMDefaultBase;
public abstract class AnyNodeCounter extends NodeCounter {
public AnyNodeCounter(Translet translet,
1.3.10.5 +2 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/BitArray.java
Index: BitArray.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/BitArray.java,v
retrieving revision 1.3.10.4
retrieving revision 1.3.10.5
diff -u -r1.3.10.4 -r1.3.10.5
--- BitArray.java 27 Jan 2003 19:45:08 -0000 1.3.10.4
+++ BitArray.java 30 Jan 2003 18:41:46 -0000 1.3.10.5
@@ -63,12 +63,10 @@
package org.apache.xalan.xsltc.dom;
import java.io.Externalizable;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.IOException;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.NodeIterator;
import org.apache.xml.dtm.DTMAxisIterator;
1.1.2.3 +7 -7
xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/CH2TOH.java
Index: CH2TOH.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/CH2TOH.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- CH2TOH.java 27 Jan 2003 19:45:08 -0000 1.1.2.2
+++ CH2TOH.java 30 Jan 2003 18:41:46 -0000 1.1.2.3
@@ -59,15 +59,15 @@
*/
package org.apache.xalan.xsltc.dom;
-import org.xml.sax.SAXException;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
-import org.xml.sax.ext.LexicalHandler;
-
import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.TransletOutputHandler;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
/**
*
1.1.14.3 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java
Index: CurrentNodeListFilter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java,v
retrieving revision 1.1.14.2
retrieving revision 1.1.14.3
diff -u -r1.1.14.2 -r1.1.14.3
--- CurrentNodeListFilter.java 27 Jan 2003 19:45:08 -0000 1.1.14.2
+++ CurrentNodeListFilter.java 30 Jan 2003 18:41:46 -0000 1.1.14.3
@@ -64,7 +64,6 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.*;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
import org.apache.xml.dtm.DTMAxisIterator;
1.6.2.6 +3 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java
Index: CurrentNodeListIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -r1.6.2.5 -r1.6.2.6
--- CurrentNodeListIterator.java 27 Jan 2003 19:45:08 -0000 1.6.2.5
+++ CurrentNodeListIterator.java 30 Jan 2003 18:41:46 -0000 1.6.2.6
@@ -64,12 +64,11 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.NodeIterator;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xalan.xsltc.util.IntegerArray;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import org.apache.xalan.xsltc.util.IntegerArray;
import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
/**
* Iterators of this kind use a CurrentNodeListFilter to filter a subset of
1.11.10.12 +7 -8
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMAdapter.java
Index: DOMAdapter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMAdapter.java,v
retrieving revision 1.11.10.11
retrieving revision 1.11.10.12
diff -u -r1.11.10.11 -r1.11.10.12
--- DOMAdapter.java 27 Jan 2003 19:45:08 -0000 1.11.10.11
+++ DOMAdapter.java 30 Jan 2003 18:41:46 -0000 1.11.10.12
@@ -63,18 +63,17 @@
package org.apache.xalan.xsltc.dom;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.NodeIterator;
-import org.apache.xalan.xsltc.TransletOutputHandler;
import org.apache.xalan.xsltc.TransletException;
+import org.apache.xalan.xsltc.TransletOutputHandler;
import org.apache.xalan.xsltc.runtime.Hashtable;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.ref.DTMDefaultBase;
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public final class DOMAdapter implements DOM {
1.2.2.4 +1 -3
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMBuilder.java
Index: DOMBuilder.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMBuilder.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- DOMBuilder.java 27 Jan 2003 19:45:08 -0000 1.2.2.3
+++ DOMBuilder.java 30 Jan 2003 18:41:46 -0000 1.2.2.4
@@ -61,7 +61,5 @@
*/
package org.apache.xalan.xsltc.dom;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
public interface DOMBuilder extends ExtendedSAX { }
1.68.2.23 +27 -18
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java
Index: DOMImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java,v
retrieving revision 1.68.2.22
retrieving revision 1.68.2.23
diff -u -r1.68.2.22 -r1.68.2.23
--- DOMImpl.java 27 Jan 2003 19:45:09 -0000 1.68.2.22
+++ DOMImpl.java 30 Jan 2003 18:41:46 -0000 1.68.2.23
@@ -66,34 +66,43 @@
package org.apache.xalan.xsltc.dom;
import java.io.Externalizable;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.IOException;
-import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Stack;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Document;
+import javax.xml.transform.dom.DOMSource;
-import org.xml.sax.*;
-import org.xml.sax.ext.*;
-import org.xml.sax.helpers.AttributesImpl;
-import org.apache.xalan.xsltc.*;
-import org.apache.xalan.xsltc.util.IntegerArray;
+import org.apache.xalan.xsltc.DOM;
+import org.apache.xalan.xsltc.StripFilter;
+import org.apache.xalan.xsltc.TransletException;
+import org.apache.xalan.xsltc.TransletOutputHandler;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xalan.xsltc.runtime.SAXAdapter;
import org.apache.xalan.xsltc.runtime.Hashtable;
-
-import org.apache.xml.dtm.ref.*;
-import org.apache.xml.dtm.*;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.DTMFilter;
+import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.DTMWSFilter;
+import org.apache.xml.dtm.ref.DTMAxisIterNodeList;
+import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import org.apache.xml.dtm.ref.DTMDefaultBase;
+import org.apache.xml.dtm.ref.DTMNamedNodeMap;
+import org.apache.xml.dtm.ref.DTMNodeListBase;
+import org.apache.xml.dtm.ref.DTMNodeProxy;
import org.apache.xml.dtm.ref.dom2dtm.DOM2DTM;
import org.apache.xml.utils.XMLStringFactory;
-import javax.xml.transform.dom.DOMSource;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
public final class DOMImpl extends DOM2DTM implements DOM, Externalizable
{
1.1.2.4 +1 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/DOMWSFilter.java
Index: DOMWSFilter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/DOMWSFilter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DOMWSFilter.java 27 Jan 2003 19:45:10 -0000 1.1.2.3
+++ DOMWSFilter.java 30 Jan 2003 18:41:46 -0000 1.1.2.4
@@ -61,10 +61,7 @@
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.dom.SAXImpl;
-import org.apache.xalan.xsltc.dom.DOMImpl;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMWSFilter;
1.6.10.8 +10 -16
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DocumentCache.java
Index: DocumentCache.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DocumentCache.java,v
retrieving revision 1.6.10.7
retrieving revision 1.6.10.8
diff -u -r1.6.10.7 -r1.6.10.8
--- DocumentCache.java 27 Jan 2003 19:45:10 -0000 1.6.10.7
+++ DocumentCache.java 30 Jan 2003 18:41:47 -0000 1.6.10.8
@@ -62,35 +62,29 @@
package org.apache.xalan.xsltc.dom;
-import java.io.PrintWriter;
import java.io.File;
-import java.io.IOException;
+import java.io.PrintWriter;
import java.net.URL;
-import java.net.URLDecoder;
import java.net.URLConnection;
-import java.net.MalformedURLException;
-import java.util.Hashtable;
+import java.net.URLDecoder;
import java.util.Date;
+import java.util.Hashtable;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.xml.sax.XMLReader;
-import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
+import javax.xml.transform.sax.SAXSource;
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.DOMCache;
import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.dom.DOMImpl;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xalan.xsltc.runtime.Constants;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
+import org.apache.xalan.xsltc.runtime.Constants;
-import org.apache.xml.dtm.DTMManager;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.sax.SAXSource;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
public final class DocumentCache implements DOMCache {
1.8.10.6 +4 -9
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DupFilterIterator.java
Index: DupFilterIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DupFilterIterator.java,v
retrieving revision 1.8.10.5
retrieving revision 1.8.10.6
diff -u -r1.8.10.5 -r1.8.10.6
--- DupFilterIterator.java 27 Jan 2003 19:45:10 -0000 1.8.10.5
+++ DupFilterIterator.java 30 Jan 2003 18:41:47 -0000 1.8.10.6
@@ -62,16 +62,11 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.NodeIterator;
-import org.apache.xalan.xsltc.TransletException;
-
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
+import org.apache.xalan.xsltc.runtime.BasisLibrary;
+import org.apache.xalan.xsltc.util.IntegerArray;
import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
import org.apache.xml.dtm.ref.DTMDefaultBase;
-
-import org.apache.xalan.xsltc.util.IntegerArray;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
/**
* Removes duplicates and sorts a source iterator. The nodes from the
1.1.4.5 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/ExtendedSAX.java
Index: ExtendedSAX.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/ExtendedSAX.java,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -r1.1.4.4 -r1.1.4.5
--- ExtendedSAX.java 27 Jan 2003 19:45:10 -0000 1.1.4.4
+++ ExtendedSAX.java 30 Jan 2003 18:41:47 -0000 1.1.4.5
@@ -63,8 +63,8 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.ext.DeclHandler;
+import org.xml.sax.ext.LexicalHandler;
public interface ExtendedSAX extends ContentHandler, LexicalHandler,
DTDHandler,
DeclHandler
1.4.10.5 +2 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/FilterIterator.java
Index: FilterIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/FilterIterator.java,v
retrieving revision 1.4.10.4
retrieving revision 1.4.10.5
diff -u -r1.4.10.4 -r1.4.10.5
--- FilterIterator.java 27 Jan 2003 19:45:10 -0000 1.4.10.4
+++ FilterIterator.java 30 Jan 2003 18:41:47 -0000 1.4.10.5
@@ -63,13 +63,11 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.NodeIterator;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
-
import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
-import org.apache.xml.dtm.DTMFilter;
/**
* Similar to a CurrentNodeListIterator except that the filter has a
1.5.10.5 +1 -5
xml-xalan/java/src/org/apache/xalan/xsltc/dom/FilteredStepIterator.java
Index: FilteredStepIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/FilteredStepIterator.java,v
retrieving revision 1.5.10.4
retrieving revision 1.5.10.5
diff -u -r1.5.10.4 -r1.5.10.5
--- FilteredStepIterator.java 27 Jan 2003 19:45:10 -0000 1.5.10.4
+++ FilteredStepIterator.java 30 Jan 2003 18:41:47 -0000 1.5.10.5
@@ -64,11 +64,7 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.NodeIterator;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-
import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
/**
* Extends a StepIterator by adding the ability to filter nodes. It
1.1.2.4 +1 -3
xml-xalan/java/src/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java
Index: ForwardPositionIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ForwardPositionIterator.java 27 Jan 2003 19:45:10 -0000 1.1.2.3
+++ ForwardPositionIterator.java 30 Jan 2003 18:41:47 -0000 1.1.2.4
@@ -62,9 +62,7 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.NodeIterator;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
-
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
1.7.10.7 +1 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/KeyIndex.java
Index: KeyIndex.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/KeyIndex.java,v
retrieving revision 1.7.10.6
retrieving revision 1.7.10.7
diff -u -r1.7.10.6 -r1.7.10.7
--- KeyIndex.java 27 Jan 2003 19:45:11 -0000 1.7.10.6
+++ KeyIndex.java 30 Jan 2003 18:41:47 -0000 1.7.10.7
@@ -63,14 +63,11 @@
package org.apache.xalan.xsltc.dom;
-import java.util.Vector;
-import java.util.Enumeration;
import java.util.StringTokenizer;
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.runtime.Hashtable;
import org.apache.xalan.xsltc.util.IntegerArray;
-
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
1.11.10.8 +6 -13
xml-xalan/java/src/org/apache/xalan/xsltc/dom/LoadDocument.java
Index: LoadDocument.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/LoadDocument.java,v
retrieving revision 1.11.10.7
retrieving revision 1.11.10.8
diff -u -r1.11.10.7 -r1.11.10.8
--- LoadDocument.java 27 Jan 2003 19:45:11 -0000 1.11.10.7
+++ LoadDocument.java 30 Jan 2003 18:41:47 -0000 1.11.10.8
@@ -62,31 +62,24 @@
package org.apache.xalan.xsltc.dom;
-import java.net.URL;
import java.io.File;
import java.io.FileNotFoundException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.sax.SAXSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
-
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.DOMCache;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.NodeIterator;
import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-
-import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMDefaultBase;
import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.ref.DTMDefaultBase;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
public final class LoadDocument {
1.6.10.5 +1 -3
xml-xalan/java/src/org/apache/xalan/xsltc/dom/MatchingIterator.java
Index: MatchingIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/MatchingIterator.java,v
retrieving revision 1.6.10.4
retrieving revision 1.6.10.5
diff -u -r1.6.10.4 -r1.6.10.5
--- MatchingIterator.java 27 Jan 2003 19:45:11 -0000 1.6.10.4
+++ MatchingIterator.java 30 Jan 2003 18:41:47 -0000 1.6.10.5
@@ -63,9 +63,7 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.NodeIterator;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
-
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
1.16.10.11 +8 -10
xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java
Index: MultiDOM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java,v
retrieving revision 1.16.10.10
retrieving revision 1.16.10.11
diff -u -r1.16.10.10 -r1.16.10.11
--- MultiDOM.java 27 Jan 2003 19:45:11 -0000 1.16.10.10
+++ MultiDOM.java 30 Jan 2003 18:41:47 -0000 1.16.10.11
@@ -64,22 +64,20 @@
package org.apache.xalan.xsltc.dom;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.NodeIterator;
-import org.apache.xalan.xsltc.TransletOutputHandler;
import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.runtime.Hashtable;
+import org.apache.xalan.xsltc.TransletOutputHandler;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
-
+import org.apache.xalan.xsltc.runtime.Hashtable;
+import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.DTMManager;
import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
import org.apache.xml.dtm.ref.DTMDefaultBase;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMManager;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public final class MultiDOM implements DOM {
1.1.14.4 +1 -3
xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java
Index: MultipleNodeCounter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java,v
retrieving revision 1.1.14.3
retrieving revision 1.1.14.4
diff -u -r1.1.14.3 -r1.1.14.4
--- MultipleNodeCounter.java 27 Jan 2003 19:45:11 -0000 1.1.14.3
+++ MultipleNodeCounter.java 30 Jan 2003 18:41:47 -0000 1.1.14.4
@@ -65,9 +65,7 @@
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.NodeIterator;
import org.apache.xalan.xsltc.util.IntegerArray;
-
import org.apache.xml.dtm.DTMAxisIterator;
public abstract class MultipleNodeCounter extends NodeCounter {
1.6.10.6 +3 -5
xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeCounter.java
Index: NodeCounter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeCounter.java,v
retrieving revision 1.6.10.5
retrieving revision 1.6.10.6
diff -u -r1.6.10.5 -r1.6.10.6
--- NodeCounter.java 27 Jan 2003 19:45:11 -0000 1.6.10.5
+++ NodeCounter.java 30 Jan 2003 18:41:47 -0000 1.6.10.6
@@ -65,13 +65,11 @@
package org.apache.xalan.xsltc.dom;
import java.util.Vector;
+
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.NodeIterator;
-import org.apache.xalan.xsltc.dom.Axis;
-
-import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisIterator;
public abstract class NodeCounter implements Axis {
public static final int END = DTM.NULL;
1.8.10.4 +4 -5
xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java
Index: NodeSortRecord.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java,v
retrieving revision 1.8.10.3
retrieving revision 1.8.10.4
diff -u -r1.8.10.3 -r1.8.10.4
--- NodeSortRecord.java 27 Jan 2003 19:45:12 -0000 1.8.10.3
+++ NodeSortRecord.java 30 Jan 2003 18:41:47 -0000 1.8.10.4
@@ -65,14 +65,13 @@
package org.apache.xalan.xsltc.dom;
-import java.util.Vector;
-import java.util.Locale;
-import java.text.Collator;
import java.text.CollationKey;
+import java.text.Collator;
+import java.util.Locale;
+import org.apache.xalan.xsltc.CollatorFactory;
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.CollatorFactory;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
/**
1.9.10.5 +1 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/NthIterator.java
Index: NthIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/NthIterator.java,v
retrieving revision 1.9.10.4
retrieving revision 1.9.10.5
diff -u -r1.9.10.4 -r1.9.10.5
--- NthIterator.java 27 Jan 2003 19:45:12 -0000 1.9.10.4
+++ NthIterator.java 30 Jan 2003 18:41:47 -0000 1.9.10.5
@@ -63,10 +63,7 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.NodeIterator;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
-
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
1.2.10.4 +2 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/SingleNodeCounter.java
Index: SingleNodeCounter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/SingleNodeCounter.java,v
retrieving revision 1.2.10.3
retrieving revision 1.2.10.4
diff -u -r1.2.10.3 -r1.2.10.4
--- SingleNodeCounter.java 27 Jan 2003 19:45:12 -0000 1.2.10.3
+++ SingleNodeCounter.java 30 Jan 2003 18:41:47 -0000 1.2.10.4
@@ -63,10 +63,8 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.Translet;
import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.NodeIterator;
-
+import org.apache.xalan.xsltc.Translet;
import org.apache.xml.dtm.DTMAxisIterator;
public abstract class SingleNodeCounter extends NodeCounter {
1.2.12.3 +1 -3
xml-xalan/java/src/org/apache/xalan/xsltc/dom/SingletonIterator.java
Index: SingletonIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/SingletonIterator.java,v
retrieving revision 1.2.12.2
retrieving revision 1.2.12.3
diff -u -r1.2.12.2 -r1.2.12.3
--- SingletonIterator.java 27 Jan 2003 19:45:12 -0000 1.2.12.2
+++ SingletonIterator.java 30 Jan 2003 18:41:47 -0000 1.2.12.3
@@ -63,8 +63,6 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.NodeIterator;
-
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
1.2.2.5 +1 -4
xml-xalan/java/src/org/apache/xalan/xsltc/dom/SortingIterator.java
Index: SortingIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/SortingIterator.java,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- SortingIterator.java 27 Jan 2003 19:45:12 -0000 1.2.2.4
+++ SortingIterator.java 30 Jan 2003 18:41:47 -0000 1.2.2.5
@@ -64,10 +64,7 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.NodeIterator;
-import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
-
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
1.11.10.6 +1 -3
xml-xalan/java/src/org/apache/xalan/xsltc/dom/StepIterator.java
Index: StepIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/StepIterator.java,v
retrieving revision 1.11.10.5
retrieving revision 1.11.10.6
diff -u -r1.11.10.5 -r1.11.10.6
--- StepIterator.java 27 Jan 2003 19:45:12 -0000 1.11.10.5
+++ StepIterator.java 30 Jan 2003 18:41:47 -0000 1.11.10.6
@@ -65,9 +65,7 @@
package org.apache.xalan.xsltc.dom;
-import org.apache.xalan.xsltc.NodeIterator;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
-
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
1.11.2.6 +1 -3
xml-xalan/java/src/org/apache/xalan/xsltc/dom/UnionIterator.java
Index: UnionIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/UnionIterator.java,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- UnionIterator.java 27 Jan 2003 19:45:12 -0000 1.11.2.5
+++ UnionIterator.java 30 Jan 2003 18:41:47 -0000 1.11.2.6
@@ -64,9 +64,7 @@
package org.apache.xalan.xsltc.dom;
import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.NodeIterator;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
-
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.ref.DTMAxisIteratorBase;
1.1.2.7 +13 -31
xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/XSLTCDTMManager.java
Index: XSLTCDTMManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/XSLTCDTMManager.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- XSLTCDTMManager.java 27 Jan 2003 19:45:12 -0000 1.1.2.6
+++ XSLTCDTMManager.java 30 Jan 2003 18:41:47 -0000 1.1.2.7
@@ -56,46 +56,28 @@
*/
package org.apache.xalan.xsltc.dom;
-import org.apache.xml.dtm.*;
-
-import java.util.Vector;
-
-// JAXP 1.1
-import javax.xml.parsers.*;
+import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.Source;
-import javax.xml.transform.SourceLocator;
-// Apache XML Utilities
-import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMConfigurationException;
+import org.apache.xml.dtm.DTMException;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.DTMWSFilter;
+import org.apache.xml.dtm.ref.DTMManagerDefault;
+import org.apache.xml.dtm.ref.IncrementalSAXSource;
+import org.apache.xml.dtm.ref.IncrementalSAXSource_Filter;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xml.dtm.ref.dom2dtm.DOM2DTM;
-import org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
-import org.apache.xml.dtm.ref.*;
-
-// W3C DOM
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
+import org.apache.xml.utils.XMLStringFactory;
-// SAX2
import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.helpers.XMLReaderFactory;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ext.LexicalHandler;
-
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
-
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import org.xml.sax.XMLReader;
/**
* The default implementation for the DTMManager.
No revision
No revision
1.33.2.8 +10 -9
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/AbstractTranslet.java
Index: AbstractTranslet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/AbstractTranslet.java,v
retrieving revision 1.33.2.7
retrieving revision 1.33.2.8
diff -u -r1.33.2.7 -r1.33.2.8
--- AbstractTranslet.java 27 Jan 2003 19:45:19 -0000 1.33.2.7
+++ AbstractTranslet.java 30 Jan 2003 18:41:48 -0000 1.33.2.8
@@ -66,21 +66,22 @@
package org.apache.xalan.xsltc.runtime;
import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.Enumeration;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
+import java.util.Enumeration;
-import org.apache.xalan.xsltc.*;
+import org.apache.xalan.xsltc.DOM;
+import org.apache.xalan.xsltc.DOMCache;
+import org.apache.xalan.xsltc.Translet;
+import org.apache.xalan.xsltc.TransletException;
+import org.apache.xalan.xsltc.TransletOutputHandler;
import org.apache.xalan.xsltc.dom.DOMAdapter;
import org.apache.xalan.xsltc.dom.DOMImpl;
-import org.apache.xalan.xsltc.dom.SAXImpl;
import org.apache.xalan.xsltc.dom.KeyIndex;
-import org.apache.xalan.xsltc.util.IntegerArray;
-import org.apache.xalan.xsltc.runtime.output.*;
-
+import org.apache.xalan.xsltc.dom.SAXImpl;
+import org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.ref.DTMNodeIterator;
public abstract class AbstractTranslet implements Translet {
1.4.14.3 +1 -5
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/AttributeList.java
Index: AttributeList.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/AttributeList.java,v
retrieving revision 1.4.14.2
retrieving revision 1.4.14.3
diff -u -r1.4.14.2 -r1.4.14.3
--- AttributeList.java 27 Jan 2003 19:45:19 -0000 1.4.14.2
+++ AttributeList.java 30 Jan 2003 18:41:48 -0000 1.4.14.3
@@ -62,11 +62,7 @@
package org.apache.xalan.xsltc.runtime;
-import org.xml.sax.SAXException;
-import org.xml.sax.Attributes;
-
import java.util.Vector;
-import java.util.Enumeration;
public class AttributeList implements org.xml.sax.Attributes {
1.1.14.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/Attributes.java
Index: Attributes.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/Attributes.java,v
retrieving revision 1.1.14.1
retrieving revision 1.1.14.2
diff -u -r1.1.14.1 -r1.1.14.2
--- Attributes.java 27 Jan 2003 19:45:19 -0000 1.1.14.1
+++ Attributes.java 30 Jan 2003 18:41:48 -0000 1.1.14.2
@@ -63,8 +63,8 @@
package org.apache.xalan.xsltc.runtime;
-import org.xml.sax.AttributeList;
import org.apache.xalan.xsltc.DOM;
+import org.xml.sax.AttributeList;
public final class Attributes implements AttributeList {
private int _element;
1.35.2.14 +18 -23
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java
Index: BasisLibrary.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java,v
retrieving revision 1.35.2.13
retrieving revision 1.35.2.14
diff -u -r1.35.2.13 -r1.35.2.14
--- BasisLibrary.java 27 Jan 2003 19:45:19 -0000 1.35.2.13
+++ BasisLibrary.java 30 Jan 2003 18:41:48 -0000 1.35.2.14
@@ -66,41 +66,36 @@
package org.apache.xalan.xsltc.runtime;
+import java.text.DecimalFormat;
+import java.text.FieldPosition;
+import java.text.MessageFormat;
+import java.text.NumberFormat;
import java.util.Locale;
import java.util.ResourceBundle;
-import java.text.NumberFormat;
-import java.text.MessageFormat;
-import java.text.FieldPosition;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-
-import org.xml.sax.AttributeList;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.dom.DOMSource;
-import org.apache.xalan.xsltc.*;
import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.dom.DOMAdapter;
+import org.apache.xalan.xsltc.Translet;
+import org.apache.xalan.xsltc.TransletException;
+import org.apache.xalan.xsltc.TransletOutputHandler;
+import org.apache.xalan.xsltc.dom.AbsoluteIterator;
import org.apache.xalan.xsltc.dom.Axis;
import org.apache.xalan.xsltc.dom.DOMAdapter;
+import org.apache.xalan.xsltc.dom.DOMImpl;
import org.apache.xalan.xsltc.dom.MultiDOM;
-import org.apache.xalan.xsltc.dom.AbsoluteIterator;
import org.apache.xalan.xsltc.dom.SingletonIterator;
-import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
-
-import org.apache.xalan.xsltc.dom.DOMImpl;
-import org.apache.xalan.xsltc.dom.DOMBuilder;
import org.apache.xalan.xsltc.dom.StepIterator;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.transform.dom.DOMSource;
-
+import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.DTMManager;
import org.apache.xml.dtm.ref.DTMDefaultBase;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
/**
* Standard XSLT functions. All standard functions expect the current node
1.3.2.5 +1 -3
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/Constants.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- Constants.java 27 Jan 2003 19:45:19 -0000 1.3.2.4
+++ Constants.java 30 Jan 2003 18:41:48 -0000 1.3.2.5
@@ -63,8 +63,6 @@
package org.apache.xalan.xsltc.runtime;
-import org.apache.xalan.xsltc.DOM;
-
import org.apache.xml.dtm.DTM;
/**
1.23.2.5 +6 -7
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultSAXOutputHandler.java
Index: DefaultSAXOutputHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/DefaultSAXOutputHandler.java,v
retrieving revision 1.23.2.4
retrieving revision 1.23.2.5
diff -u -r1.23.2.4 -r1.23.2.5
--- DefaultSAXOutputHandler.java 27 Jan 2003 19:45:19 -0000 1.23.2.4
+++ DefaultSAXOutputHandler.java 30 Jan 2003 18:41:48 -0000 1.23.2.5
@@ -63,18 +63,17 @@
package org.apache.xalan.xsltc.runtime;
-import java.util.Vector;
-
-import java.io.IOException;
-import java.io.Writer;
+import java.io.BufferedWriter;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.io.BufferedWriter;
+import java.io.Writer;
+import java.util.Vector;
+import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
1.1.10.5 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/ErrorMessages.java
Index: ErrorMessages.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/ErrorMessages.java,v
retrieving revision 1.1.10.4
retrieving revision 1.1.10.5
diff -u -r1.1.10.4 -r1.1.10.5
--- ErrorMessages.java 27 Jan 2003 19:45:19 -0000 1.1.10.4
+++ ErrorMessages.java 30 Jan 2003 18:41:48 -0000 1.1.10.5
@@ -62,9 +62,9 @@
package org.apache.xalan.xsltc.runtime;
-import java.util.Vector;
import java.util.Enumeration;
import java.util.ResourceBundle;
+import java.util.Vector;
public class ErrorMessages extends ResourceBundle {
1.1.10.2 +1 -4
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/ErrorMessages_no.java
Index: ErrorMessages_no.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/ErrorMessages_no.java,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.2
diff -u -r1.1.10.1 -r1.1.10.2
--- ErrorMessages_no.java 27 Jan 2003 19:45:19 -0000 1.1.10.1
+++ ErrorMessages_no.java 30 Jan 2003 18:41:49 -0000 1.1.10.2
@@ -62,9 +62,6 @@
package org.apache.xalan.xsltc.runtime;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.ResourceBundle;
public class ErrorMessages_no extends ErrorMessages {
1.1.14.2 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/Hashtable.java
Index: Hashtable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/Hashtable.java,v
retrieving revision 1.1.14.1
retrieving revision 1.1.14.2
diff -u -r1.1.14.1 -r1.1.14.2
--- Hashtable.java 27 Jan 2003 19:45:19 -0000 1.1.14.1
+++ Hashtable.java 30 Jan 2003 18:41:49 -0000 1.1.14.2
@@ -61,7 +61,6 @@
package org.apache.xalan.xsltc.runtime;
-import java.io.*;
import java.util.Enumeration;
/**
1.10.2.8 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/SAXAdapter.java
Index: SAXAdapter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/SAXAdapter.java,v
retrieving revision 1.10.2.7
retrieving revision 1.10.2.8
diff -u -r1.10.2.7 -r1.10.2.8
--- SAXAdapter.java 27 Jan 2003 19:45:20 -0000 1.10.2.7
+++ SAXAdapter.java 30 Jan 2003 18:41:49 -0000 1.10.2.8
@@ -64,11 +64,11 @@
package org.apache.xalan.xsltc.runtime;
-import org.xml.sax.*;
-import org.xml.sax.ext.*;
import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.TransletOutputHandler;
import org.apache.xalan.xsltc.dom.DOMBuilder;
+
+import org.xml.sax.SAXException;
public final class SAXAdapter implements TransletOutputHandler {
1.3.2.4 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/StringValueHandler.java
Index: StringValueHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/StringValueHandler.java,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- StringValueHandler.java 27 Jan 2003 19:45:20 -0000 1.3.2.3
+++ StringValueHandler.java 30 Jan 2003 18:41:49 -0000 1.3.2.4
@@ -64,7 +64,7 @@
package org.apache.xalan.xsltc.runtime;
-import org.apache.xalan.xsltc.*;
+import org.apache.xalan.xsltc.TransletException;
public final class StringValueHandler extends TransletOutputBase {
1.54.2.6 +5 -5
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TextOutput.java
Index: TextOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TextOutput.java,v
retrieving revision 1.54.2.5
retrieving revision 1.54.2.6
diff -u -r1.54.2.5 -r1.54.2.6
--- TextOutput.java 27 Jan 2003 19:45:20 -0000 1.54.2.5
+++ TextOutput.java 30 Jan 2003 18:41:49 -0000 1.54.2.6
@@ -65,16 +65,16 @@
package org.apache.xalan.xsltc.runtime;
-import java.io.*;
+import java.io.IOException;
import java.util.Stack;
-import java.util.Enumeration;
+
+import org.apache.xalan.xsltc.TransletException;
+import org.apache.xalan.xsltc.TransletOutputHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
-
-import org.apache.xalan.xsltc.*;
/**
* Serializer for SAX events.
1.2.2.4 +1 -6
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TransletLoader.java
Index: TransletLoader.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TransletLoader.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- TransletLoader.java 27 Jan 2003 19:45:20 -0000 1.2.2.3
+++ TransletLoader.java 30 Jan 2003 18:41:49 -0000 1.2.2.4
@@ -63,11 +63,6 @@
package org.apache.xalan.xsltc.runtime;
-import java.lang.Class;
-import java.lang.ClassLoader;
-import java.lang.Thread;
-
-import java.net.*; // temporary
/**
* This class is intended used when the default Class.forName() method fails.
1.7.10.5 +3 -3
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TransletOutputBase.java
Index: TransletOutputBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TransletOutputBase.java,v
retrieving revision 1.7.10.4
retrieving revision 1.7.10.5
diff -u -r1.7.10.4 -r1.7.10.5
--- TransletOutputBase.java 27 Jan 2003 19:45:20 -0000 1.7.10.4
+++ TransletOutputBase.java 30 Jan 2003 18:41:49 -0000 1.7.10.5
@@ -65,8 +65,8 @@
package org.apache.xalan.xsltc.runtime;
-import org.apache.xalan.xsltc.*;
-import org.apache.xalan.xsltc.runtime.Hashtable;
+import org.apache.xalan.xsltc.TransletException;
+import org.apache.xalan.xsltc.TransletOutputHandler;
public class TransletOutputBase implements TransletOutputHandler {
public void startDocument() throws TransletException {}
No revision
No revision
1.9.4.2 +3 -5
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/OutputBase.java
Index: OutputBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/OutputBase.java,v
retrieving revision 1.9.4.1
retrieving revision 1.9.4.2
diff -u -r1.9.4.1 -r1.9.4.2
--- OutputBase.java 27 Jan 2003 19:45:22 -0000 1.9.4.1
+++ OutputBase.java 30 Jan 2003 18:41:49 -0000 1.9.4.2
@@ -65,12 +65,10 @@
import java.util.Stack;
-import org.apache.xalan.xsltc.*;
-import org.apache.xalan.xsltc.runtime.*;
-import org.apache.xalan.xsltc.runtime.Hashtable;
-
import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.TransletOutputHandler;
+import org.apache.xalan.xsltc.runtime.BasisLibrary;
+import org.apache.xalan.xsltc.runtime.Constants;
import org.apache.xalan.xsltc.runtime.Hashtable;
public abstract class OutputBase implements TransletOutputHandler, Constants
{
1.8.4.5 +3 -6
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXHTMLOutput.java
Index: SAXHTMLOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXHTMLOutput.java,v
retrieving revision 1.8.4.4
retrieving revision 1.8.4.5
diff -u -r1.8.4.4 -r1.8.4.5
--- SAXHTMLOutput.java 27 Jan 2003 19:45:22 -0000 1.8.4.4
+++ SAXHTMLOutput.java 30 Jan 2003 18:41:49 -0000 1.8.4.5
@@ -63,15 +63,12 @@
package org.apache.xalan.xsltc.runtime.output;
-import java.util.Stack;
import java.io.IOException;
-import org.xml.sax.SAXException;
+import org.apache.xalan.xsltc.TransletException;
import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.runtime.BasisLibrary;
-import org.apache.xalan.xsltc.runtime.AttributeList;
public class SAXHTMLOutput extends SAXOutput {
1.12.8.2 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXOutput.java
Index: SAXOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXOutput.java,v
retrieving revision 1.12.8.1
retrieving revision 1.12.8.2
diff -u -r1.12.8.1 -r1.12.8.2
--- SAXOutput.java 27 Jan 2003 19:45:22 -0000 1.12.8.1
+++ SAXOutput.java 30 Jan 2003 18:41:49 -0000 1.12.8.2
@@ -63,13 +63,13 @@
package org.apache.xalan.xsltc.runtime.output;
-import java.util.Stack;
+import org.apache.xalan.xsltc.TransletException;
+import org.apache.xalan.xsltc.runtime.Constants;
+
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.runtime.Constants;
abstract class SAXOutput extends OutputBase implements Constants {
1.1.8.2 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXTextOutput.java
Index: SAXTextOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXTextOutput.java,v
retrieving revision 1.1.8.1
retrieving revision 1.1.8.2
diff -u -r1.1.8.1 -r1.1.8.2
--- SAXTextOutput.java 27 Jan 2003 19:45:22 -0000 1.1.8.1
+++ SAXTextOutput.java 30 Jan 2003 18:41:49 -0000 1.1.8.2
@@ -62,11 +62,11 @@
package org.apache.xalan.xsltc.runtime.output;
+import org.apache.xalan.xsltc.TransletException;
+
import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.SAXException;
-
-import org.apache.xalan.xsltc.TransletException;
+import org.xml.sax.ext.LexicalHandler;
public class SAXTextOutput extends SAXOutput {
1.12.6.2 +6 -6
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXXMLOutput.java
Index: SAXXMLOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/SAXXMLOutput.java,v
retrieving revision 1.12.6.1
retrieving revision 1.12.6.2
diff -u -r1.12.6.1 -r1.12.6.2
--- SAXXMLOutput.java 27 Jan 2003 19:45:22 -0000 1.12.6.1
+++ SAXXMLOutput.java 30 Jan 2003 18:41:49 -0000 1.12.6.2
@@ -63,14 +63,14 @@
package org.apache.xalan.xsltc.runtime.output;
-import java.util.Stack;
import java.io.IOException;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
+
import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.runtime.Hashtable;
-import org.xml.sax.SAXException;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
public class SAXXMLOutput extends SAXOutput {
1.20.2.2 +3 -8
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamHTMLOutput.java
Index: StreamHTMLOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamHTMLOutput.java,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- StreamHTMLOutput.java 27 Jan 2003 19:45:22 -0000 1.20.2.1
+++ StreamHTMLOutput.java 30 Jan 2003 18:41:49 -0000 1.20.2.2
@@ -63,16 +63,11 @@
package org.apache.xalan.xsltc.runtime.output;
-import java.util.Vector;
-
-import java.io.Writer;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
+import java.io.Writer;
-import org.apache.xalan.xsltc.*;
-import org.apache.xalan.xsltc.runtime.*;
+import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.runtime.Hashtable;
public class StreamHTMLOutput extends StreamOutput {
1.23.2.2 +3 -5
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamOutput.java
Index: StreamOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamOutput.java,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -r1.23.2.1 -r1.23.2.2
--- StreamOutput.java 27 Jan 2003 19:45:22 -0000 1.23.2.1
+++ StreamOutput.java 30 Jan 2003 18:41:49 -0000 1.23.2.2
@@ -63,15 +63,13 @@
package org.apache.xalan.xsltc.runtime.output;
-import java.io.Writer;
-import java.io.BufferedWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
-
-import java.util.Vector;
+import java.io.Writer;
import java.util.Hashtable;
+import java.util.Vector;
import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.runtime.BasisLibrary;
1.4.2.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamTextOutput.java
Index: StreamTextOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamTextOutput.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- StreamTextOutput.java 27 Jan 2003 19:45:23 -0000 1.4.2.1
+++ StreamTextOutput.java 30 Jan 2003 18:41:49 -0000 1.4.2.2
@@ -62,9 +62,9 @@
package org.apache.xalan.xsltc.runtime.output;
-import java.io.Writer;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.Writer;
import org.apache.xalan.xsltc.TransletException;
1.7.8.2 +5 -8
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamUnknownOutput.java
Index: StreamUnknownOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamUnknownOutput.java,v
retrieving revision 1.7.8.1
retrieving revision 1.7.8.2
diff -u -r1.7.8.1 -r1.7.8.2
--- StreamUnknownOutput.java 27 Jan 2003 19:45:23 -0000 1.7.8.1
+++ StreamUnknownOutput.java 30 Jan 2003 18:41:49 -0000 1.7.8.2
@@ -63,16 +63,13 @@
package org.apache.xalan.xsltc.runtime.output;
-import java.util.ArrayList;
-
-import java.io.Writer;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.ArrayList;
-import org.apache.xalan.xsltc.*;
-import org.apache.xalan.xsltc.runtime.*;
+import org.apache.xalan.xsltc.TransletException;
+import org.apache.xalan.xsltc.runtime.BasisLibrary;
import org.apache.xalan.xsltc.runtime.Hashtable;
public class StreamUnknownOutput extends StreamOutput {
1.22.2.2 +3 -10
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamXMLOutput.java
Index: StreamXMLOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamXMLOutput.java,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -r1.22.2.1 -r1.22.2.2
--- StreamXMLOutput.java 27 Jan 2003 19:45:23 -0000 1.22.2.1
+++ StreamXMLOutput.java 30 Jan 2003 18:41:49 -0000 1.22.2.2
@@ -63,18 +63,11 @@
package org.apache.xalan.xsltc.runtime.output;
-import java.util.Stack;
-import java.util.Vector;
-
-import java.io.Writer;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
+import java.io.Writer;
-import org.apache.xalan.xsltc.*;
-import org.apache.xalan.xsltc.runtime.*;
-import org.apache.xalan.xsltc.runtime.Hashtable;
+import org.apache.xalan.xsltc.TransletException;
public class StreamXMLOutput extends StreamOutput {
1.1.6.2 +1 -4
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StringOutputBuffer.java
Index: StringOutputBuffer.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StringOutputBuffer.java,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -r1.1.6.1 -r1.1.6.2
--- StringOutputBuffer.java 27 Jan 2003 19:45:23 -0000 1.1.6.1
+++ StringOutputBuffer.java 30 Jan 2003 18:41:49 -0000 1.1.6.2
@@ -62,9 +62,6 @@
package org.apache.xalan.xsltc.runtime.output;
-import java.io.Writer;
-import java.io.BufferedWriter;
-import java.io.IOException;
class StringOutputBuffer implements OutputBuffer {
private StringBuffer _buffer;
1.12.8.2 +10 -9
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java
Index: TransletOutputHandlerFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java,v
retrieving revision 1.12.8.1
retrieving revision 1.12.8.2
diff -u -r1.12.8.1 -r1.12.8.2
--- TransletOutputHandlerFactory.java 27 Jan 2003 19:45:23 -0000 1.12.8.1
+++ TransletOutputHandlerFactory.java 30 Jan 2003 18:41:49 -0000 1.12.8.2
@@ -62,20 +62,21 @@
package org.apache.xalan.xsltc.runtime.output;
-import java.io.Writer;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.Writer;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
-import org.apache.xalan.xsltc.runtime.*;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.TransletOutputHandler;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.xalan.xsltc.TransletOutputHandler;
+import org.apache.xalan.xsltc.runtime.DefaultSAXOutputHandler;
+import org.apache.xalan.xsltc.runtime.TextOutput;
import org.apache.xalan.xsltc.trax.SAX2DOM;
+
+import org.w3c.dom.Node;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ext.LexicalHandler;
public class TransletOutputHandlerFactory {
1.2.6.2 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/WriterOutputBuffer.java
Index: WriterOutputBuffer.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/WriterOutputBuffer.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- WriterOutputBuffer.java 27 Jan 2003 19:45:23 -0000 1.2.6.1
+++ WriterOutputBuffer.java 30 Jan 2003 18:41:50 -0000 1.2.6.2
@@ -62,9 +62,9 @@
package org.apache.xalan.xsltc.runtime.output;
-import java.io.Writer;
import java.io.BufferedWriter;
import java.io.IOException;
+import java.io.Writer;
class WriterOutputBuffer implements OutputBuffer {
private static final int KB = 1024;
No revision
No revision
1.11.2.5 +11 -16
xml-xalan/java/src/org/apache/xalan/xsltc/trax/DOM2SAX.java
Index: DOM2SAX.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/DOM2SAX.java,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -r1.11.2.4 -r1.11.2.5
--- DOM2SAX.java 27 Jan 2003 19:45:24 -0000 1.11.2.4
+++ DOM2SAX.java 30 Jan 2003 18:41:50 -0000 1.11.2.5
@@ -63,31 +63,26 @@
package org.apache.xalan.xsltc.trax;
+import java.io.IOException;
+import java.util.Hashtable;
import java.util.Stack;
import java.util.Vector;
-import java.util.Hashtable;
-import org.xml.sax.XMLReader;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
import org.xml.sax.ContentHandler;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.DTDHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.ErrorHandler;
import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.AttributeList;
-import org.xml.sax.helpers.AttributeListImpl;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import java.io.IOException;
-import org.w3c.dom.Entity;
-import org.w3c.dom.Notation;
public class DOM2SAX implements XMLReader, Locator {
1.3.4.2 +15 -8
xml-xalan/java/src/org/apache/xalan/xsltc/trax/DOM2TO.java
Index: DOM2TO.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/DOM2TO.java,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- DOM2TO.java 27 Jan 2003 19:45:24 -0000 1.3.4.1
+++ DOM2TO.java 30 Jan 2003 18:41:50 -0000 1.3.4.2
@@ -62,16 +62,23 @@
package org.apache.xalan.xsltc.trax;
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
import java.io.IOException;
-import org.w3c.dom.Entity;
-import org.w3c.dom.Notation;
-
-import org.xml.sax.*;
import org.apache.xalan.xsltc.TransletOutputHandler;
+
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.XMLReader;
public class DOM2TO implements XMLReader, Locator {
1.1.10.2 +1 -7
xml-xalan/java/src/org/apache/xalan/xsltc/trax/OutputSettings.java
Index: OutputSettings.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/OutputSettings.java,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.2
diff -u -r1.1.10.1 -r1.1.10.2
--- OutputSettings.java 27 Jan 2003 19:45:24 -0000 1.1.10.1
+++ OutputSettings.java 30 Jan 2003 18:41:50 -0000 1.1.10.2
@@ -62,12 +62,6 @@
package org.apache.xalan.xsltc.trax;
-import javax.xml.transform.*;
-
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.compiler.*;
-import org.apache.xalan.xsltc.runtime.*;
-
import java.util.Properties;
public final class OutputSettings {
1.10.2.5 +10 -13
xml-xalan/java/src/org/apache/xalan/xsltc/trax/SAX2DOM.java
Index: SAX2DOM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/SAX2DOM.java,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -r1.10.2.4 -r1.10.2.5
--- SAX2DOM.java 27 Jan 2003 19:45:24 -0000 1.10.2.4
+++ SAX2DOM.java 30 Jan 2003 18:41:50 -0000 1.10.2.5
@@ -65,24 +65,21 @@
import java.util.Stack;
import java.util.Vector;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.xalan.xsltc.runtime.Constants;
+
+import org.w3c.dom.Comment;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Comment;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-import org.w3c.dom.Attr;
-import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-
-import org.apache.xalan.xsltc.runtime.Constants;
+import org.xml.sax.ext.LexicalHandler;
public class SAX2DOM implements ContentHandler, LexicalHandler, Constants {
1.1.8.2 +7 -7
xml-xalan/java/src/org/apache/xalan/xsltc/trax/SAX2TO.java
Index: SAX2TO.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/SAX2TO.java,v
retrieving revision 1.1.8.1
retrieving revision 1.1.8.2
diff -u -r1.1.8.1 -r1.1.8.2
--- SAX2TO.java 27 Jan 2003 19:45:24 -0000 1.1.8.1
+++ SAX2TO.java 30 Jan 2003 18:41:50 -0000 1.1.8.2
@@ -64,15 +64,15 @@
import java.util.ArrayList;
+import org.apache.xalan.xsltc.TransletException;
+import org.apache.xalan.xsltc.TransletOutputHandler;
+import org.apache.xalan.xsltc.runtime.Constants;
+
+import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.SAXException;
-
-import org.apache.xalan.xsltc.runtime.Constants;
-import org.apache.xalan.xsltc.TransletException;
-import org.apache.xalan.xsltc.TransletOutputHandler;
+import org.xml.sax.ext.LexicalHandler;
public class SAX2TO implements ContentHandler, LexicalHandler, Constants {
1.5.10.2 +19 -8
xml-xalan/java/src/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java
Index: SmartTransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java,v
retrieving revision 1.5.10.1
retrieving revision 1.5.10.2
diff -u -r1.5.10.1 -r1.5.10.2
--- SmartTransformerFactoryImpl.java 27 Jan 2003 19:45:24 -0000 1.5.10.1
+++ SmartTransformerFactoryImpl.java 30 Jan 2003 18:41:50 -0000 1.5.10.2
@@ -63,14 +63,25 @@
package org.apache.xalan.xsltc.trax;
-import javax.xml.transform.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TemplatesHandler;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
import org.xml.sax.XMLFilter;
-import org.xml.sax.InputSource;
-import org.apache.xalan.xsltc.compiler.XSLTC;
-import org.apache.xalan.xsltc.compiler.SourceLoader;
/**
* Implementation of a transformer factory that uses an XSLTC
1.5.2.6 +14 -8
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java
Index: TemplatesHandlerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -r1.5.2.5 -r1.5.2.6
--- TemplatesHandlerImpl.java 27 Jan 2003 19:45:24 -0000 1.5.2.5
+++ TemplatesHandlerImpl.java 30 Jan 2003 18:41:50 -0000 1.5.2.6
@@ -63,15 +63,21 @@
package org.apache.xalan.xsltc.trax;
-import javax.xml.transform.*;
-import javax.xml.transform.sax.*;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.sax.TemplatesHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.InputSource;
+import org.apache.xalan.xsltc.compiler.CompilerException;
+import org.apache.xalan.xsltc.compiler.Parser;
+import org.apache.xalan.xsltc.compiler.SourceLoader;
+import org.apache.xalan.xsltc.compiler.Stylesheet;
+import org.apache.xalan.xsltc.compiler.SyntaxTreeNode;
+import org.apache.xalan.xsltc.compiler.XSLTC;
-import org.apache.xalan.xsltc.compiler.*;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
/**
* Implementation of a JAXP1.1 TemplatesHandler
1.10.2.7 +8 -9
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TemplatesImpl.java
Index: TemplatesImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TemplatesImpl.java,v
retrieving revision 1.10.2.6
retrieving revision 1.10.2.7
diff -u -r1.10.2.6 -r1.10.2.7
--- TemplatesImpl.java 27 Jan 2003 19:45:25 -0000 1.10.2.6
+++ TemplatesImpl.java 30 Jan 2003 18:41:50 -0000 1.10.2.7
@@ -65,20 +65,19 @@
package org.apache.xalan.xsltc.trax;
-import java.io.Serializable;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectInputStream;
import java.io.IOException;
-import java.util.Properties;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Properties;
-import javax.xml.transform.*;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.URIResolver;
import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.compiler.*;
-import org.apache.xalan.xsltc.runtime.*;
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
public final class TemplatesImpl implements Templates, Serializable {
1.1.10.4 +14 -15
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TrAXFilter.java
Index: TrAXFilter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TrAXFilter.java,v
retrieving revision 1.1.10.3
retrieving revision 1.1.10.4
diff -u -r1.1.10.3 -r1.1.10.4
--- TrAXFilter.java 27 Jan 2003 19:45:25 -0000 1.1.10.3
+++ TrAXFilter.java 30 Jan 2003 18:41:50 -0000 1.1.10.4
@@ -64,24 +64,23 @@
package org.apache.xalan.xsltc.trax;
-import org.xml.sax.XMLFilter;
+import java.io.IOException;
+
+import javax.xml.parsers.FactoryConfigurationError;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Templates;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.sax.SAXResult;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.InputSource;
import org.xml.sax.helpers.XMLFilterImpl;
import org.xml.sax.helpers.XMLReaderFactory;
-import org.xml.sax.ContentHandler;
-import javax.xml.transform.Templates;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.sax.SAXResult;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.FactoryConfigurationError;
-import java.io.IOException;
/**
* skeleton extension of XMLFilterImpl for now.
1.34.2.11 +29 -22
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
Index: TransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java,v
retrieving revision 1.34.2.10
retrieving revision 1.34.2.11
diff -u -r1.34.2.10 -r1.34.2.11
--- TransformerFactoryImpl.java 27 Jan 2003 19:45:25 -0000
1.34.2.10
+++ TransformerFactoryImpl.java 30 Jan 2003 18:41:50 -0000
1.34.2.11
@@ -65,38 +65,45 @@
package org.apache.xalan.xsltc.trax;
import java.io.File;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.Reader;
-import java.io.InputStream;
import java.io.FileInputStream;
-import java.io.ByteArrayInputStream;
+import java.io.FileNotFoundException;
import java.io.FilenameFilter;
-import java.net.URL;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
-import java.util.Vector;
+import java.net.URL;
+import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
-import java.util.Enumeration;
-import java.util.zip.ZipFile;
+import java.util.Vector;
import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
-import javax.xml.transform.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TemplatesHandler;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
-import org.xml.sax.*;
-import org.w3c.dom.Document;
-
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-
-import org.apache.xalan.xsltc.compiler.XSLTC;
import org.apache.xalan.xsltc.compiler.SourceLoader;
-import org.apache.xalan.xsltc.compiler.CompilerException;
+import org.apache.xalan.xsltc.compiler.XSLTC;
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLFilter;
+import org.xml.sax.XMLReader;
/**
* Implementation of a JAXP1.1 TransformerFactory for Translets.
1.6.10.11 +19 -18
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java
Index: TransformerHandlerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java,v
retrieving revision 1.6.10.10
retrieving revision 1.6.10.11
diff -u -r1.6.10.10 -r1.6.10.11
--- TransformerHandlerImpl.java 27 Jan 2003 19:45:25 -0000
1.6.10.10
+++ TransformerHandlerImpl.java 30 Jan 2003 18:41:51 -0000
1.6.10.11
@@ -62,28 +62,29 @@
package org.apache.xalan.xsltc.trax;
-import org.xml.sax.*;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.helpers.DefaultHandler;
-
-import javax.xml.transform.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.StreamSource;
-
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMWSFilter;
+import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.sax.TransformerHandler;
-import org.apache.xalan.xsltc.Translet;
-import org.apache.xalan.xsltc.TransletOutputHandler;
import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.dom.DOMImpl;
+import org.apache.xalan.xsltc.TransletOutputHandler;
+import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import org.apache.xalan.xsltc.dom.DOMWSFilter;
import org.apache.xalan.xsltc.dom.SAXImpl;
-import org.apache.xalan.xsltc.dom.DOMBuilder;
import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
-import org.apache.xalan.xsltc.dom.DOMWSFilter;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.DTMWSFilter;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.DeclHandler;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.DefaultHandler;
/**
* Implementation of a JAXP1.1 TransformerHandler
1.37.2.13 +38 -30
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java,v
retrieving revision 1.37.2.12
retrieving revision 1.37.2.13
diff -u -r1.37.2.12 -r1.37.2.13
--- TransformerImpl.java 27 Jan 2003 19:45:25 -0000 1.37.2.12
+++ TransformerImpl.java 30 Jan 2003 18:41:51 -0000 1.37.2.13
@@ -64,49 +64,57 @@
package org.apache.xalan.xsltc.trax;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
import java.net.URL;
import java.net.URLConnection;
-import java.net.MalformedURLException;
-import java.net.UnknownHostException;
import java.net.UnknownServiceException;
-
-import java.lang.IllegalArgumentException;
import java.util.Enumeration;
+import java.util.Properties;
import java.util.StringTokenizer;
-import org.xml.sax.*;
-import org.xml.sax.ext.LexicalHandler;
-
-import org.w3c.dom.Document;
-
-import javax.xml.transform.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import org.apache.xalan.xsltc.DOM;
+import org.apache.xalan.xsltc.DOMCache;
+import org.apache.xalan.xsltc.StripFilter;
import org.apache.xalan.xsltc.Translet;
import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.TransletOutputHandler;
-import org.apache.xalan.xsltc.StripFilter;
-import org.apache.xalan.xsltc.DOMCache;
-import org.apache.xalan.xsltc.DOM;
-import org.apache.xalan.xsltc.dom.*;
-import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xalan.xsltc.runtime.*;
-import org.apache.xalan.xsltc.runtime.output.*;
-import org.apache.xalan.xsltc.compiler.*;
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMManager;
+import org.apache.xalan.xsltc.dom.DOMBuilder;
+import org.apache.xalan.xsltc.dom.DOMImpl;
+import org.apache.xalan.xsltc.dom.DOMWSFilter;
+import org.apache.xalan.xsltc.dom.SAXImpl;
+import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
+import org.apache.xalan.xsltc.runtime.AbstractTranslet;
+import org.apache.xalan.xsltc.runtime.Hashtable;
+import org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
import org.apache.xml.dtm.DTMWSFilter;
-import java.util.Properties;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.ext.LexicalHandler;
public final class TransformerImpl extends Transformer
implements DOMCache, ErrorListener
1.3.2.2 +10 -10 xml-xalan/java/src/org/apache/xalan/xsltc/trax/Util.java
Index: Util.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/Util.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- Util.java 27 Jan 2003 19:45:26 -0000 1.3.2.1
+++ Util.java 30 Jan 2003 18:41:51 -0000 1.3.2.2
@@ -62,20 +62,20 @@
package org.apache.xalan.xsltc.trax;
-import java.io.Reader;
import java.io.InputStream;
+import java.io.Reader;
-import javax.xml.transform.*;
-import javax.xml.transform.sax.*;
-import javax.xml.transform.dom.*;
-import javax.xml.transform.stream.*;
-
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamSource;
import org.apache.xalan.xsltc.compiler.XSLTC;
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-import org.apache.xalan.xsltc.compiler.SourceLoader;
+
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
public final class Util {
1.3.10.5 +11 -13
xml-xalan/java/src/org/apache/xalan/xsltc/trax/XSLTCSource.java
Index: XSLTCSource.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/XSLTCSource.java,v
retrieving revision 1.3.10.4
retrieving revision 1.3.10.5
diff -u -r1.3.10.4 -r1.3.10.5
--- XSLTCSource.java 27 Jan 2003 19:45:26 -0000 1.3.10.4
+++ XSLTCSource.java 30 Jan 2003 18:41:51 -0000 1.3.10.5
@@ -66,25 +66,23 @@
import java.io.File;
import java.io.IOException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
-import org.xml.sax.ext.LexicalHandler;
-
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
import javax.xml.transform.Source;
-import org.apache.xalan.xsltc.*;
-import org.apache.xalan.xsltc.dom.*;
+import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
-
-import org.apache.xml.dtm.DTMManager;
+import org.apache.xalan.xsltc.dom.DOMBuilder;
+import org.apache.xalan.xsltc.dom.SAXImpl;
+import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMManager;
import org.apache.xml.dtm.ref.DTMManagerDefault;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
public final class XSLTCSource implements Source {
No revision
No revision
1.7.2.3 +2 -2 xml-xalan/java/src/org/apache/xml/dtm/DTM.java
Index: DTM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/DTM.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- DTM.java 27 Jan 2003 19:45:27 -0000 1.7.2.2
+++ DTM.java 30 Jan 2003 18:41:51 -0000 1.7.2.3
@@ -56,9 +56,9 @@
*/
package org.apache.xml.dtm;
-import org.apache.xml.utils.XMLString;
-
import javax.xml.transform.SourceLocator;
+
+import org.apache.xml.utils.XMLString;
/**
* <code>DTM</code> is an XML document model expressed as a table
1.3.12.3 +1 -2 xml-xalan/java/src/org/apache/xml/dtm/DTMException.java
Index: DTMException.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/DTMException.java,v
retrieving revision 1.3.12.2
retrieving revision 1.3.12.3
diff -u -r1.3.12.2 -r1.3.12.3
--- DTMException.java 27 Jan 2003 19:45:28 -0000 1.3.12.2
+++ DTMException.java 30 Jan 2003 18:41:52 -0000 1.3.12.3
@@ -57,9 +57,8 @@
package org.apache.xml.dtm;
-import java.lang.reflect.Method;
-import java.lang.IllegalAccessException;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import javax.xml.transform.SourceLocator;
1.9.12.6 +1 -1 xml-xalan/java/src/org/apache/xml/dtm/DTMManager.java
Index: DTMManager.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/DTMManager.java,v
retrieving revision 1.9.12.5
retrieving revision 1.9.12.6
diff -u -r1.9.12.5 -r1.9.12.6
--- DTMManager.java 27 Jan 2003 19:45:28 -0000 1.9.12.5
+++ DTMManager.java 30 Jan 2003 18:41:52 -0000 1.9.12.6
@@ -56,8 +56,8 @@
*/
package org.apache.xml.dtm;
-import org.apache.xml.res.XMLMessages;
import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.XMLStringFactory;
1.1.4.2 +2 -4 xml-xalan/java/src/org/apache/xml/dtm/FactoryFinder.java
Index: FactoryFinder.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/FactoryFinder.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- FactoryFinder.java 27 Jan 2003 19:45:28 -0000 1.1.4.1
+++ FactoryFinder.java 30 Jan 2003 18:41:52 -0000 1.1.4.2
@@ -55,13 +55,11 @@
package org.apache.xml.dtm;
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.io.IOException;
-
-import java.io.BufferedReader;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Properties;
1.1.4.2 +4 -3
xml-xalan/java/src/org/apache/xml/dtm/SecuritySupport.java
Index: SecuritySupport.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/SecuritySupport.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- SecuritySupport.java 27 Jan 2003 19:45:28 -0000 1.1.4.1
+++ SecuritySupport.java 30 Jan 2003 18:41:52 -0000 1.1.4.2
@@ -55,9 +55,10 @@
package org.apache.xml.dtm;
-import java.lang.reflect.*;
-import java.net.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
/**
* This class is duplicated for each JAXP subpackage so keep it in sync.
1.1.4.2 +8 -4
xml-xalan/java/src/org/apache/xml/dtm/SecuritySupport12.java
Index: SecuritySupport12.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/SecuritySupport12.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- SecuritySupport12.java 27 Jan 2003 19:45:28 -0000 1.1.4.1
+++ SecuritySupport12.java 30 Jan 2003 18:41:52 -0000 1.1.4.2
@@ -55,10 +55,14 @@
package org.apache.xml.dtm;
-import java.security.*;
-import java.net.*;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
/**
* This class is duplicated for each JAXP subpackage so keep it in sync.
No revision
No revision
1.3.12.3 +0 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/ChunkedIntArray.java
Index: ChunkedIntArray.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/ChunkedIntArray.java,v
retrieving revision 1.3.12.2
retrieving revision 1.3.12.3
diff -u -r1.3.12.2 -r1.3.12.3
--- ChunkedIntArray.java 27 Jan 2003 19:45:30 -0000 1.3.12.2
+++ ChunkedIntArray.java 30 Jan 2003 18:41:52 -0000 1.3.12.3
@@ -56,9 +56,6 @@
*/
package org.apache.xml.dtm.ref;
-import org.w3c.dom.*;
-import org.apache.xml.dtm.*;
-
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
1.5.12.3 +1 -2
xml-xalan/java/src/org/apache/xml/dtm/ref/CoroutineManager.java
Index: CoroutineManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/CoroutineManager.java,v
retrieving revision 1.5.12.2
retrieving revision 1.5.12.3
diff -u -r1.5.12.2 -r1.5.12.3
--- CoroutineManager.java 27 Jan 2003 19:45:30 -0000 1.5.12.2
+++ CoroutineManager.java 30 Jan 2003 18:41:52 -0000 1.5.12.3
@@ -56,8 +56,7 @@
*/
package org.apache.xml.dtm.ref;
-import java.util.*;
-import org.apache.xml.dtm.*;
+import java.util.BitSet;
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
1.4.12.2 +1 -4
xml-xalan/java/src/org/apache/xml/dtm/ref/CoroutineParser.java
Index: CoroutineParser.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/CoroutineParser.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- CoroutineParser.java 27 Jan 2003 19:45:30 -0000 1.4.12.1
+++ CoroutineParser.java 30 Jan 2003 18:41:52 -0000 1.4.12.2
@@ -57,11 +57,8 @@
package org.apache.xml.dtm.ref;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import java.io.IOException;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
/** <p>CoroutineParser is an API for parser threads that operate as
1.2.14.2 +0 -1
xml-xalan/java/src/org/apache/xml/dtm/ref/CustomStringPool.java
Index: CustomStringPool.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/CustomStringPool.java,v
retrieving revision 1.2.14.1
retrieving revision 1.2.14.2
diff -u -r1.2.14.1 -r1.2.14.2
--- CustomStringPool.java 27 Jan 2003 19:45:30 -0000 1.2.14.1
+++ CustomStringPool.java 30 Jan 2003 18:41:52 -0000 1.2.14.2
@@ -56,7 +56,6 @@
*/
package org.apache.xml.dtm.ref;
-import java.util.Vector;
import java.util.Hashtable;
/** <p>CustomStringPool is an example of appliction provided data structure
1.1.2.4 +2 -4
xml-xalan/java/src/org/apache/xml/dtm/ref/Attic/DTMAxisIterNodeList.java
Index: DTMAxisIterNodeList.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/Attic/DTMAxisIterNodeList.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DTMAxisIterNodeList.java 27 Jan 2003 19:45:30 -0000 1.1.2.3
+++ DTMAxisIterNodeList.java 30 Jan 2003 18:41:52 -0000 1.1.2.4
@@ -56,13 +56,11 @@
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.*;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.utils.IntVector;
import org.w3c.dom.Node;
-import org.w3c.dom.DOMException;
-
-import java.util.Vector;
/**
* <code>DTMAxisNodeList</code> gives us an implementation of the DOM's
1.5.12.4 +1 -1
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java
Index: DTMAxisIteratorBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java,v
retrieving revision 1.5.12.3
retrieving revision 1.5.12.4
diff -u -r1.5.12.3 -r1.5.12.4
--- DTMAxisIteratorBase.java 27 Jan 2003 19:45:30 -0000 1.5.12.3
+++ DTMAxisIteratorBase.java 30 Jan 2003 18:41:52 -0000 1.5.12.4
@@ -56,7 +56,7 @@
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.*;
+import org.apache.xml.dtm.DTMAxisIterator;
/**
* This class serves as a default base for implementations of
DTMAxisIterators.
1.1.2.4 +2 -2
xml-xalan/java/src/org/apache/xml/dtm/ref/Attic/DTMChildIterNodeList.java
Index: DTMChildIterNodeList.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/Attic/DTMChildIterNodeList.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DTMChildIterNodeList.java 27 Jan 2003 19:45:30 -0000 1.1.2.3
+++ DTMChildIterNodeList.java 30 Jan 2003 18:41:52 -0000 1.1.2.4
@@ -55,9 +55,9 @@
* <http://www.apache.org/>.
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.*;
+
+import org.apache.xml.dtm.DTM;
import org.w3c.dom.Node;
-import org.w3c.dom.DOMException;
/**
* <code>DTMNodeList</code> gives us an implementation of the DOM's
1.7.8.2 +8 -10
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDocumentImpl.java
Index: DTMDocumentImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMDocumentImpl.java,v
retrieving revision 1.7.8.1
retrieving revision 1.7.8.2
diff -u -r1.7.8.1 -r1.7.8.2
--- DTMDocumentImpl.java 27 Jan 2003 19:45:32 -0000 1.7.8.1
+++ DTMDocumentImpl.java 30 Jan 2003 18:41:52 -0000 1.7.8.2
@@ -56,23 +56,21 @@
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.*;
-import java.util.Hashtable;
-//import java.util.Stack;
-import java.util.Vector;
-
import javax.xml.transform.SourceLocator;
-import org.apache.xml.dtm.ref.ChunkedIntArray;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.DTMAxisTraverser;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.DTMWSFilter;
import org.apache.xml.utils.FastStringBuffer;
+import org.apache.xml.utils.XMLString;
+import org.apache.xml.utils.XMLStringFactory;
+import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
import org.xml.sax.ext.LexicalHandler;
-
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
/**
* This is the implementation of the DTM document interface. It receives
1.41.4.3 +15 -30
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java
Index: DTMManagerDefault.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMManagerDefault.java,v
retrieving revision 1.41.4.2
retrieving revision 1.41.4.3
diff -u -r1.41.4.2 -r1.41.4.3
--- DTMManagerDefault.java 27 Jan 2003 19:45:32 -0000 1.41.4.2
+++ DTMManagerDefault.java 30 Jan 2003 18:41:52 -0000 1.41.4.3
@@ -56,51 +56,36 @@
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.*;
-
-import java.util.Vector;
-
-// JAXP 1.1
-import javax.xml.parsers.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.Source;
-import javax.xml.transform.SourceLocator;
-// Apache XML Utilities
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.SystemIDResolver;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMException;
+import org.apache.xml.dtm.DTMFilter;
+import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.DTMWSFilter;
import org.apache.xml.dtm.ref.dom2dtm.DOM2DTM;
import org.apache.xml.dtm.ref.sax2dtm.SAX2DTM;
import org.apache.xml.dtm.ref.sax2dtm.SAX2RTFDTM;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
+import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.utils.SystemIDResolver;
+import org.apache.xml.utils.XMLStringFactory;
-/**************************************************************
-// EXPERIMENTAL 3/22/02
-import org.apache.xml.dtm.ref.xni2dtm.XNI2DTM;
-**************************************************************/
-
-// W3C DOM
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-// SAX2
import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
-import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ext.LexicalHandler;
-
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
-
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
/**
* The default implementation for the DTMManager.
1.3.14.3 +4 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNamedNodeMap.java
Index: DTMNamedNodeMap.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNamedNodeMap.java,v
retrieving revision 1.3.14.2
retrieving revision 1.3.14.3
diff -u -r1.3.14.2 -r1.3.14.3
--- DTMNamedNodeMap.java 27 Jan 2003 19:45:32 -0000 1.3.14.2
+++ DTMNamedNodeMap.java 30 Jan 2003 18:41:52 -0000 1.3.14.3
@@ -56,10 +56,11 @@
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.*;
-import org.w3c.dom.*;
+import org.apache.xml.dtm.DTM;
-import java.util.Vector;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
/**
* <meta name="usage" content="internal"/>
1.4.14.3 +7 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeIterator.java
Index: DTMNodeIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeIterator.java,v
retrieving revision 1.4.14.2
retrieving revision 1.4.14.3
diff -u -r1.4.14.2 -r1.4.14.3
--- DTMNodeIterator.java 27 Jan 2003 19:45:32 -0000 1.4.14.2
+++ DTMNodeIterator.java 30 Jan 2003 18:41:52 -0000 1.4.14.3
@@ -55,10 +55,14 @@
* <http://www.apache.org/>.
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.*;
-import org.w3c.dom.Node;
+
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMDOMException;
+import org.apache.xml.dtm.DTMIterator;
+
import org.w3c.dom.DOMException;
-import org.w3c.dom.traversal.*;
+import org.w3c.dom.Node;
+import org.w3c.dom.traversal.NodeFilter;
/**
* <code>DTMNodeIterator</code> gives us an implementation of the
1.5.12.6 +3 -2
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeList.java
Index: DTMNodeList.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeList.java,v
retrieving revision 1.5.12.5
retrieving revision 1.5.12.6
diff -u -r1.5.12.5 -r1.5.12.6
--- DTMNodeList.java 27 Jan 2003 19:45:32 -0000 1.5.12.5
+++ DTMNodeList.java 30 Jan 2003 18:41:52 -0000 1.5.12.6
@@ -55,9 +55,10 @@
* <http://www.apache.org/>.
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.*;
+
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMIterator;
import org.w3c.dom.Node;
-import org.w3c.dom.DOMException;
/**
* <code>DTMNodeList</code> gives us an implementation of the DOM's
1.1.2.3 +0 -2
xml-xalan/java/src/org/apache/xml/dtm/ref/Attic/DTMNodeListBase.java
Index: DTMNodeListBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/Attic/DTMNodeListBase.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DTMNodeListBase.java 27 Jan 2003 19:45:32 -0000 1.1.2.2
+++ DTMNodeListBase.java 30 Jan 2003 18:41:52 -0000 1.1.2.3
@@ -55,9 +55,7 @@
* <http://www.apache.org/>.
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.*;
import org.w3c.dom.Node;
-import org.w3c.dom.DOMException;
/**
* <code>DTMNodeList</code> gives us an implementation of the DOM's
1.13.8.5 +18 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeProxy.java
Index: DTMNodeProxy.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMNodeProxy.java,v
retrieving revision 1.13.8.4
retrieving revision 1.13.8.5
diff -u -r1.13.8.4 -r1.13.8.5
--- DTMNodeProxy.java 27 Jan 2003 19:45:32 -0000 1.13.8.4
+++ DTMNodeProxy.java 30 Jan 2003 18:41:52 -0000 1.13.8.5
@@ -56,9 +56,24 @@
*/
package org.apache.xml.dtm.ref;
-import org.w3c.dom.*;
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMDOMException;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Comment;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.EntityReference;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
/**
* <meta name="usage" content="internal"/>
1.3.12.2 +1 -1
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMSafeStringPool.java
Index: DTMSafeStringPool.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMSafeStringPool.java,v
retrieving revision 1.3.12.1
retrieving revision 1.3.12.2
diff -u -r1.3.12.1 -r1.3.12.2
--- DTMSafeStringPool.java 27 Jan 2003 19:45:32 -0000 1.3.12.1
+++ DTMSafeStringPool.java 30 Jan 2003 18:41:52 -0000 1.3.12.2
@@ -56,7 +56,7 @@
*/
package org.apache.xml.dtm.ref;
-import java.util.Vector;
+
/** <p>Like DTMStringPool, but threadsafe. It's been proposed that DTMs
* share their string pool(s); that raises threadsafety issues which
1.4.12.2 +2 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMStringPool.java
Index: DTMStringPool.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMStringPool.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- DTMStringPool.java 27 Jan 2003 19:45:33 -0000 1.4.12.1
+++ DTMStringPool.java 30 Jan 2003 18:41:52 -0000 1.4.12.2
@@ -57,10 +57,9 @@
package org.apache.xml.dtm.ref;
-// %REVIEW% Should this be based on SuballocatedIntVector instead?
-// (Unclear. Pools will rarely be huge. But if they ever are...)
-import org.apache.xml.utils.IntVector;
import java.util.Vector;
+
+import org.apache.xml.utils.IntVector;
/** <p>DTMStringPool is an "interning" mechanism for strings. It will
* create a stable 1:1 mapping between a set of string values and a set of
1.2.14.2 +4 -6
xml-xalan/java/src/org/apache/xml/dtm/ref/DTMTreeWalker.java
Index: DTMTreeWalker.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/DTMTreeWalker.java,v
retrieving revision 1.2.14.1
retrieving revision 1.2.14.2
diff -u -r1.2.14.1 -r1.2.14.2
--- DTMTreeWalker.java 27 Jan 2003 19:45:33 -0000 1.2.14.1
+++ DTMTreeWalker.java 30 Jan 2003 18:41:52 -0000 1.2.14.2
@@ -56,14 +56,12 @@
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.*;
-import org.w3c.dom.*;
-
-import org.xml.sax.*;
-import org.xml.sax.ext.LexicalHandler;
-
+import org.apache.xml.dtm.DTM;
import org.apache.xml.utils.NodeConsumer;
import org.apache.xml.utils.XMLString;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ext.LexicalHandler;
/**
* <meta name="usage" content="advanced"/>
1.4.2.7 +2 -4
xml-xalan/java/src/org/apache/xml/dtm/ref/ExpandedNameTable.java
Index: ExpandedNameTable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/ExpandedNameTable.java,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -r1.4.2.6 -r1.4.2.7
--- ExpandedNameTable.java 27 Jan 2003 19:45:33 -0000 1.4.2.6
+++ ExpandedNameTable.java 30 Jan 2003 18:41:52 -0000 1.4.2.7
@@ -56,11 +56,9 @@
*/
package org.apache.xml.dtm.ref;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.utils.IntVector;
-
-import java.util.Vector;
import java.util.Hashtable;
+
+import org.apache.xml.dtm.DTM;
/**
* This is a default implementation of a table that manages mappings from
1.3.8.2 +1 -3
xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource.java
Index: IncrementalSAXSource.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource.java,v
retrieving revision 1.3.8.1
retrieving revision 1.3.8.2
diff -u -r1.3.8.1 -r1.3.8.2
--- IncrementalSAXSource.java 27 Jan 2003 19:45:33 -0000 1.3.8.1
+++ IncrementalSAXSource.java 30 Jan 2003 18:41:52 -0000 1.3.8.2
@@ -57,11 +57,9 @@
package org.apache.xml.dtm.ref;
+import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.XMLReader;
/** <p>IncrementalSAXSource is an API that delivers a small number of
* SAX events each time a request is made from a "controller"
1.7.8.3 +13 -13
xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
Index: IncrementalSAXSource_Filter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java,v
retrieving revision 1.7.8.2
retrieving revision 1.7.8.3
diff -u -r1.7.8.2 -r1.7.8.3
--- IncrementalSAXSource_Filter.java 27 Jan 2003 19:45:33 -0000 1.7.8.2
+++ IncrementalSAXSource_Filter.java 30 Jan 2003 18:41:52 -0000 1.7.8.3
@@ -57,24 +57,24 @@
package org.apache.xml.dtm.ref;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.ext.LexicalHandler;
+import java.io.IOException;
+
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
+import org.apache.xml.utils.ThreadControllerWrapper;
+
+import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
-import java.io.IOException;
-import org.apache.xml.dtm.ref.IncrementalSAXSource;
-
-import org.apache.xml.utils.ThreadControllerWrapper;
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
+import org.xml.sax.ext.LexicalHandler;
/** <p>IncrementalSAXSource_Filter implements IncrementalSAXSource, using a
* standard SAX2 event source as its input and parcelling out those
1.8.8.3 +7 -6
xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java
Index: IncrementalSAXSource_Xerces.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java,v
retrieving revision 1.8.8.2
retrieving revision 1.8.8.3
diff -u -r1.8.8.2 -r1.8.8.3
--- IncrementalSAXSource_Xerces.java 27 Jan 2003 19:45:33 -0000 1.8.8.2
+++ IncrementalSAXSource_Xerces.java 30 Jan 2003 18:41:52 -0000 1.8.8.3
@@ -57,16 +57,17 @@
package org.apache.xml.dtm.ref;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
import java.io.IOException;
-import org.apache.xerces.parsers.SAXParser;
-import org.xml.sax.XMLReader;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import org.apache.xerces.parsers.SAXParser;
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
/** <p>IncrementalSAXSource_Xerces takes advantage of the fact that Xerces1
No revision
No revision
1.28.2.7 +23 -19
xml-xalan/java/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
Index: DOM2DTM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java,v
retrieving revision 1.28.2.6
retrieving revision 1.28.2.7
diff -u -r1.28.2.6 -r1.28.2.7
--- DOM2DTM.java 27 Jan 2003 19:45:35 -0000 1.28.2.6
+++ DOM2DTM.java 30 Jan 2003 18:41:53 -0000 1.28.2.7
@@ -56,31 +56,35 @@
*/
package org.apache.xml.dtm.ref.dom2dtm;
-import org.apache.xml.dtm.ref.*;
-import org.apache.xml.dtm.*;
-import org.apache.xml.utils.SuballocatedIntVector;
-import org.apache.xml.utils.IntStack;
-import org.apache.xml.utils.BoolStack;
-import org.apache.xml.utils.StringBufferPool;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.TreeWalker;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.XMLCharacterRecognizer;
-
-import org.w3c.dom.*;
-
import java.util.Vector;
-import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.SourceLocator;
-import org.xml.sax.ContentHandler;
-
-import org.apache.xml.utils.NodeVector;
+import javax.xml.transform.dom.DOMSource;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.DTMWSFilter;
+import org.apache.xml.dtm.ref.DTMDefaultBaseIterators;
+import org.apache.xml.dtm.ref.DTMManagerDefault;
+import org.apache.xml.dtm.ref.ExpandedNameTable;
+import org.apache.xml.dtm.ref.IncrementalSAXSource;
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
+import org.apache.xml.utils.FastStringBuffer;
+import org.apache.xml.utils.QName;
+import org.apache.xml.utils.StringBufferPool;
+import org.apache.xml.utils.TreeWalker;
+import org.apache.xml.utils.XMLCharacterRecognizer;
+import org.apache.xml.utils.XMLString;
+import org.apache.xml.utils.XMLStringFactory;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.Entity;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.xml.sax.ContentHandler;
/** The <code>DOM2DTM</code> class serves up a DOM's contents via the
* DTM API.
1.2.12.2 +8 -4
xml-xalan/java/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
Index: DOM2DTMdefaultNamespaceDeclarationNode.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java,v
retrieving revision 1.2.12.1
retrieving revision 1.2.12.2
diff -u -r1.2.12.1 -r1.2.12.2
--- DOM2DTMdefaultNamespaceDeclarationNode.java 27 Jan 2003 19:45:35
-0000 1.2.12.1
+++ DOM2DTMdefaultNamespaceDeclarationNode.java 30 Jan 2003 18:41:54
-0000 1.2.12.2
@@ -57,10 +57,14 @@
package org.apache.xml.dtm.ref.dom2dtm;
-import org.w3c.dom.*;
-import org.apache.xml.dtm.ref.dom2dtm.DOM2DTM;
-import org.apache.xml.dtm.ref.*;
-import org.apache.xml.dtm.*;
+import org.apache.xml.dtm.DTMException;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/** This is a kluge to let us shove a declaration for xml: into the
* DOM2DTM model. Basically, it creates a proxy node in DOM space to
No revision
No revision
1.3.8.4 +7 -15
xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
Index: SAX2RTFDTM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java,v
retrieving revision 1.3.8.3
retrieving revision 1.3.8.4
diff -u -r1.3.8.3 -r1.3.8.4
--- SAX2RTFDTM.java 27 Jan 2003 19:45:36 -0000 1.3.8.3
+++ SAX2RTFDTM.java 30 Jan 2003 18:41:54 -0000 1.3.8.4
@@ -56,25 +56,17 @@
*/
package org.apache.xml.dtm.ref.sax2dtm;
-import java.util.Hashtable;
-import java.util.Vector;
import javax.xml.transform.Source;
-import javax.xml.transform.SourceLocator;
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
-import org.apache.xml.utils.StringVector;
-import org.apache.xml.utils.IntVector;
-import org.apache.xml.utils.FastStringBuffer;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.DTMWSFilter;
import org.apache.xml.utils.IntStack;
-import org.apache.xml.utils.SuballocatedIntVector;
-import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xml.utils.WrappedRuntimeException;
-import org.apache.xml.utils.XMLCharacterRecognizer;
-import org.apache.xml.utils.XMLString;
+import org.apache.xml.utils.IntVector;
+import org.apache.xml.utils.StringVector;
import org.apache.xml.utils.XMLStringFactory;
-import org.xml.sax.*;
-import org.xml.sax.ext.*;
+
+import org.xml.sax.SAXException;
/**
* This is a subclass of SAX2DTM which has been modified to meet the needs of
No revision
No revision
1.1.2.3 +2 -4
xml-xalan/java/src/org/apache/xml/res/XMLErrorResources.java
Index: XMLErrorResources.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/res/XMLErrorResources.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XMLErrorResources.java 27 Jan 2003 19:45:36 -0000 1.1.2.2
+++ XMLErrorResources.java 30 Jan 2003 18:41:54 -0000 1.1.2.3
@@ -57,12 +57,10 @@
package org.apache.xml.res;
-import java.util.MissingResourceException;
+import java.util.ListResourceBundle;
import java.util.Locale;
+import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import java.util.ListResourceBundle;
-
-import java.text.DecimalFormat;
/**
* Set up error messages.
1.1.2.3 +2 -2 xml-xalan/java/src/org/apache/xml/res/XMLMessages.java
Index: XMLMessages.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/res/XMLMessages.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XMLMessages.java 27 Jan 2003 19:45:37 -0000 1.1.2.2
+++ XMLMessages.java 30 Jan 2003 18:41:54 -0000 1.1.2.3
@@ -56,10 +56,10 @@
*/
package org.apache.xml.res;
-import java.util.Locale;
-import java.util.ResourceBundle;
import java.util.ListResourceBundle;
+import java.util.Locale;
import java.util.MissingResourceException;
+import java.util.ResourceBundle;
/**
* <meta name="usage" content="internal"/>
No revision
No revision
1.7.10.3 +4 -5 xml-xalan/java/src/org/apache/xml/utils/AttList.java
Index: AttList.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/AttList.java,v
retrieving revision 1.7.10.2
retrieving revision 1.7.10.3
diff -u -r1.7.10.2 -r1.7.10.3
--- AttList.java 27 Jan 2003 19:45:38 -0000 1.7.10.2
+++ AttList.java 30 Jan 2003 18:41:54 -0000 1.7.10.3
@@ -56,12 +56,11 @@
*/
package org.apache.xml.utils;
-import org.w3c.dom.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
-import org.xml.sax.*;
-
-import org.apache.xml.utils.DOMHelper;
-import org.apache.xml.utils.DOM2Helper;
+import org.xml.sax.Attributes;
/**
* <meta name="usage" content="internal"/>
1.5.12.2 +0 -1 xml-xalan/java/src/org/apache/xml/utils/BoolStack.java
Index: BoolStack.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/BoolStack.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- BoolStack.java 27 Jan 2003 19:45:38 -0000 1.5.12.1
+++ BoolStack.java 30 Jan 2003 18:41:54 -0000 1.5.12.2
@@ -56,7 +56,6 @@
*/
package org.apache.xml.utils;
-import java.util.EmptyStackException;
/**
* <meta name="usage" content="internal"/>
1.1.2.3 +7 -9 xml-xalan/java/src/org/apache/xml/utils/DOM2Helper.java
Index: DOM2Helper.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/DOM2Helper.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DOM2Helper.java 27 Jan 2003 19:45:38 -0000 1.1.2.2
+++ DOM2Helper.java 30 Jan 2003 18:41:54 -0000 1.1.2.3
@@ -58,19 +58,17 @@
import java.io.IOException;
-import java.util.StringTokenizer;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
-import org.w3c.dom.Node;
+import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-import org.w3c.dom.Attr;
-import org.xml.sax.InputSource;
-import org.xml.sax.Parser;
-
-import javax.xml.parsers.*;
+import org.w3c.dom.Node;
-import javax.xml.transform.TransformerException;
+import org.xml.sax.InputSource;
/**
* @deprecated Since the introduction of the DTM, this class will be removed.
1.10.10.4 +11 -8 xml-xalan/java/src/org/apache/xml/utils/DOMBuilder.java
Index: DOMBuilder.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/DOMBuilder.java,v
retrieving revision 1.10.10.3
retrieving revision 1.10.10.4
diff -u -r1.10.10.3 -r1.10.10.4
--- DOMBuilder.java 27 Jan 2003 19:45:38 -0000 1.10.10.3
+++ DOMBuilder.java 30 Jan 2003 18:41:54 -0000 1.10.10.4
@@ -56,18 +56,21 @@
*/
package org.apache.xml.utils;
-import org.apache.xml.res.XMLMessages;
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.utils.NodeVector;
import java.util.Stack;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
-import org.w3c.dom.*; // we pretty much use everything in the DOM here.
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.ext.LexicalHandler;
/**
* <meta name="usage" content="general"/>
* This class takes SAX events (in addition to some extra events
1.1.2.3 +12 -8 xml-xalan/java/src/org/apache/xml/utils/DOMHelper.java
Index: DOMHelper.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/DOMHelper.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DOMHelper.java 27 Jan 2003 19:45:38 -0000 1.1.2.2
+++ DOMHelper.java 30 Jan 2003 18:41:54 -0000 1.1.2.3
@@ -59,19 +59,23 @@
import java.util.Hashtable;
import java.util.Vector;
-import org.w3c.dom.*;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
-
-// Imported JAVA API for XML Parsing 1.0 classes
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.xml.dtm.ref.DTMNodeProxy;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.Entity;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
/**
* @deprecated Since the introduction of the DTM, this class will be removed.
1.8.6.4 +9 -6
xml-xalan/java/src/org/apache/xml/utils/DefaultErrorHandler.java
Index: DefaultErrorHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/DefaultErrorHandler.java,v
retrieving revision 1.8.6.3
retrieving revision 1.8.6.4
diff -u -r1.8.6.3 -r1.8.6.4
--- DefaultErrorHandler.java 27 Jan 2003 19:45:39 -0000 1.8.6.3
+++ DefaultErrorHandler.java 30 Jan 2003 18:41:54 -0000 1.8.6.4
@@ -56,16 +56,19 @@
*/
package org.apache.xml.utils;
-import org.xml.sax.*;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
import javax.xml.transform.ErrorListener;
-import javax.xml.transform.TransformerException;
import javax.xml.transform.SourceLocator;
+import javax.xml.transform.TransformerException;
-import org.apache.xml.res.XMLMessages;
import org.apache.xml.res.XMLErrorResources;
-
-import java.io.PrintWriter;
-import java.io.PrintStream;
+import org.apache.xml.res.XMLMessages;
+
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
/**
1.1.6.2 +1 -2
xml-xalan/java/src/org/apache/xml/utils/Hashtree2Node.java
Index: Hashtree2Node.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/Hashtree2Node.java,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -r1.1.6.1 -r1.1.6.2
--- Hashtree2Node.java 27 Jan 2003 19:45:39 -0000 1.1.6.1
+++ Hashtree2Node.java 30 Jan 2003 18:41:54 -0000 1.1.6.2
@@ -59,7 +59,6 @@
import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.StringTokenizer;
import java.util.Vector;
import org.w3c.dom.Document;
1.1.10.5 +4 -3
xml-xalan/java/src/org/apache/xml/utils/ListingErrorHandler.java
Index: ListingErrorHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/ListingErrorHandler.java,v
retrieving revision 1.1.10.4
retrieving revision 1.1.10.5
diff -u -r1.1.10.4 -r1.1.10.5
--- ListingErrorHandler.java 27 Jan 2003 19:45:40 -0000 1.1.10.4
+++ ListingErrorHandler.java 30 Jan 2003 18:41:54 -0000 1.1.10.5
@@ -61,15 +61,16 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import javax.xml.transform.ErrorListener;
import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
-import org.apache.xml.res.XMLMessages;
+
import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
+
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
1.3.16.2 +1 -4
xml-xalan/java/src/org/apache/xml/utils/MutableAttrListImpl.java
Index: MutableAttrListImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/MutableAttrListImpl.java,v
retrieving revision 1.3.16.1
retrieving revision 1.3.16.2
diff -u -r1.3.16.1 -r1.3.16.2
--- MutableAttrListImpl.java 27 Jan 2003 19:45:40 -0000 1.3.16.1
+++ MutableAttrListImpl.java 30 Jan 2003 18:41:54 -0000 1.3.16.2
@@ -56,12 +56,9 @@
*/
package org.apache.xml.utils;
-import org.apache.xml.utils.StringVector;
-
-import org.xml.sax.Attributes;
-
import java.io.Serializable;
+import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
/**
1.5.10.3 +1 -1 xml-xalan/java/src/org/apache/xml/utils/ObjectPool.java
Index: ObjectPool.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/ObjectPool.java,v
retrieving revision 1.5.10.2
retrieving revision 1.5.10.3
diff -u -r1.5.10.2 -r1.5.10.3
--- ObjectPool.java 27 Jan 2003 19:45:40 -0000 1.5.10.2
+++ ObjectPool.java 30 Jan 2003 18:41:54 -0000 1.5.10.3
@@ -56,7 +56,7 @@
*/
package org.apache.xml.utils;
-import java.util.*;
+import java.util.Vector;
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
1.2.16.4 +1 -1
xml-xalan/java/src/org/apache/xml/utils/PrefixResolverDefault.java
Index: PrefixResolverDefault.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/PrefixResolverDefault.java,v
retrieving revision 1.2.16.3
retrieving revision 1.2.16.4
diff -u -r1.2.16.3 -r1.2.16.4
--- PrefixResolverDefault.java 27 Jan 2003 19:45:41 -0000 1.2.16.3
+++ PrefixResolverDefault.java 30 Jan 2003 18:41:54 -0000 1.2.16.4
@@ -56,8 +56,8 @@
*/
package org.apache.xml.utils;
-import org.w3c.dom.Node;
import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
/**
* <meta name="usage" content="general"/>
1.7.10.4 +2 -2 xml-xalan/java/src/org/apache/xml/utils/QName.java
Index: QName.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/QName.java,v
retrieving revision 1.7.10.3
retrieving revision 1.7.10.4
diff -u -r1.7.10.3 -r1.7.10.4
--- QName.java 27 Jan 2003 19:45:41 -0000 1.7.10.3
+++ QName.java 30 Jan 2003 18:41:54 -0000 1.7.10.4
@@ -59,10 +59,10 @@
import java.util.Stack;
import java.util.StringTokenizer;
-import org.w3c.dom.Element;
-
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
+
+import org.w3c.dom.Element;
/**
* <meta name="usage" content="general"/>
1.5.2.2 +3 -3
xml-xalan/java/src/org/apache/xml/utils/SAXSourceLocator.java
Index: SAXSourceLocator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/SAXSourceLocator.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- SAXSourceLocator.java 27 Jan 2003 19:45:41 -0000 1.5.2.1
+++ SAXSourceLocator.java 30 Jan 2003 18:41:54 -0000 1.5.2.2
@@ -56,13 +56,13 @@
*/
package org.apache.xml.utils;
+import java.io.Serializable;
+
import javax.xml.transform.SourceLocator;
-import org.xml.sax.helpers.LocatorImpl;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
-
-import java.io.Serializable;
+import org.xml.sax.helpers.LocatorImpl;
/**
* Class SAXSourceLocator extends org.xml.sax.helpers.LocatorImpl
1.15.2.5 +3 -5
xml-xalan/java/src/org/apache/xml/utils/SystemIDResolver.java
Index: SystemIDResolver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/SystemIDResolver.java,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -r1.15.2.4 -r1.15.2.5
--- SystemIDResolver.java 27 Jan 2003 19:45:42 -0000 1.15.2.4
+++ SystemIDResolver.java 30 Jan 2003 18:41:54 -0000 1.15.2.5
@@ -56,13 +56,11 @@
*/
package org.apache.xml.utils;
-import javax.xml.transform.TransformerException;
-import org.apache.xml.utils.URI;
-import org.apache.xml.utils.URI.MalformedURIException;
+import java.io.File;
-import java.io.*;
+import javax.xml.transform.TransformerException;
-import java.lang.StringBuffer;
+import org.apache.xml.utils.URI.MalformedURIException;
/**
* <meta name="usage" content="internal"/>
1.14.10.4 +9 -4 xml-xalan/java/src/org/apache/xml/utils/TreeWalker.java
Index: TreeWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/TreeWalker.java,v
retrieving revision 1.14.10.3
retrieving revision 1.14.10.4
diff -u -r1.14.10.3 -r1.14.10.4
--- TreeWalker.java 27 Jan 2003 19:45:42 -0000 1.14.10.3
+++ TreeWalker.java 30 Jan 2003 18:41:54 -0000 1.14.10.4
@@ -56,13 +56,18 @@
*/
package org.apache.xml.utils;
-import org.w3c.dom.*;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Element;
+import org.w3c.dom.EntityReference;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
-import org.xml.sax.*;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.LocatorImpl;
-
-import org.apache.xml.utils.NodeConsumer;
/**
* <meta name="usage" content="advanced"/>
1.4.10.4 +16 -2 xml-xalan/java/src/org/apache/xml/utils/UnImplNode.java
Index: UnImplNode.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/UnImplNode.java,v
retrieving revision 1.4.10.3
retrieving revision 1.4.10.4
diff -u -r1.4.10.3 -r1.4.10.4
--- UnImplNode.java 27 Jan 2003 19:45:43 -0000 1.4.10.3
+++ UnImplNode.java 30 Jan 2003 18:41:54 -0000 1.4.10.4
@@ -56,10 +56,24 @@
*/
package org.apache.xml.utils;
-import org.w3c.dom.*;
-
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Comment;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.EntityReference;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
/**
* <meta name="usage" content="internal"/>
No revision
No revision
1.2.16.3 +4 -1
xml-xalan/java/src/org/apache/xml/utils/res/XResourceBundle.java
Index: XResourceBundle.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResourceBundle.java,v
retrieving revision 1.2.16.2
retrieving revision 1.2.16.3
diff -u -r1.2.16.2 -r1.2.16.3
--- XResourceBundle.java 27 Jan 2003 19:45:47 -0000 1.2.16.2
+++ XResourceBundle.java 30 Jan 2003 18:41:56 -0000 1.2.16.3
@@ -56,7 +56,10 @@
*/
package org.apache.xml.utils.res;
-import java.util.*;
+import java.util.ListResourceBundle;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
/**
* <meta name="usage" content="internal"/>
1.3.10.2 +0 -5
xml-xalan/java/src/org/apache/xml/utils/res/XResources_cy.java
Index: XResources_cy.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_cy.java,v
retrieving revision 1.3.10.1
retrieving revision 1.3.10.2
diff -u -r1.3.10.1 -r1.3.10.2
--- XResources_cy.java 27 Jan 2003 19:45:47 -0000 1.3.10.1
+++ XResources_cy.java 30 Jan 2003 18:41:56 -0000 1.3.10.2
@@ -56,11 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
-
/**
* <meta name="usage" content="internal"/>
1.2.2.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_de.java
Index: XResources_de.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_de.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- XResources_de.java 27 Jan 2003 19:45:47 -0000 1.2.2.1
+++ XResources_de.java 30 Jan 2003 18:41:56 -0000 1.2.2.2
@@ -57,10 +57,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_de.properties
//
1.3.10.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_el.java
Index: XResources_el.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_el.java,v
retrieving revision 1.3.10.1
retrieving revision 1.3.10.2
diff -u -r1.3.10.1 -r1.3.10.2
--- XResources_el.java 27 Jan 2003 19:45:47 -0000 1.3.10.1
+++ XResources_el.java 30 Jan 2003 18:41:56 -0000 1.3.10.2
@@ -56,10 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_en.properties
//
1.2.16.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_en.java
Index: XResources_en.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_en.java,v
retrieving revision 1.2.16.1
retrieving revision 1.2.16.2
diff -u -r1.2.16.1 -r1.2.16.2
--- XResources_en.java 27 Jan 2003 19:45:47 -0000 1.2.16.1
+++ XResources_en.java 30 Jan 2003 18:41:56 -0000 1.2.16.2
@@ -56,10 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_en.properties
//
1.2.2.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_es.java
Index: XResources_es.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_es.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- XResources_es.java 27 Jan 2003 19:45:47 -0000 1.2.2.1
+++ XResources_es.java 30 Jan 2003 18:41:56 -0000 1.2.2.2
@@ -57,10 +57,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_es.properties
//
1.2.2.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_fr.java
Index: XResources_fr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_fr.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- XResources_fr.java 27 Jan 2003 19:45:47 -0000 1.2.2.1
+++ XResources_fr.java 30 Jan 2003 18:41:56 -0000 1.2.2.2
@@ -57,10 +57,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_fr.properties
//
1.2.16.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_he.java
Index: XResources_he.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_he.java,v
retrieving revision 1.2.16.1
retrieving revision 1.2.16.2
diff -u -r1.2.16.1 -r1.2.16.2
--- XResources_he.java 27 Jan 2003 19:45:47 -0000 1.2.16.1
+++ XResources_he.java 30 Jan 2003 18:41:56 -0000 1.2.16.2
@@ -56,10 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_en.properties
//
1.2.16.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_hy.java
Index: XResources_hy.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_hy.java,v
retrieving revision 1.2.16.1
retrieving revision 1.2.16.2
diff -u -r1.2.16.1 -r1.2.16.2
--- XResources_hy.java 27 Jan 2003 19:45:47 -0000 1.2.16.1
+++ XResources_hy.java 30 Jan 2003 18:41:56 -0000 1.2.16.2
@@ -56,10 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_en.properties
//
1.2.2.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_it.java
Index: XResources_it.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_it.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- XResources_it.java 27 Jan 2003 19:45:47 -0000 1.2.2.1
+++ XResources_it.java 30 Jan 2003 18:41:56 -0000 1.2.2.2
@@ -57,10 +57,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_it.properties
//
1.3.10.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_ja_JP_A.java
Index: XResources_ja_JP_A.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_ja_JP_A.java,v
retrieving revision 1.3.10.1
retrieving revision 1.3.10.2
diff -u -r1.3.10.1 -r1.3.10.2
--- XResources_ja_JP_A.java 27 Jan 2003 19:45:48 -0000 1.3.10.1
+++ XResources_ja_JP_A.java 30 Jan 2003 18:41:56 -0000 1.3.10.2
@@ -56,10 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_en.properties
//
1.3.10.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_ja_JP_HA.java
Index: XResources_ja_JP_HA.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_ja_JP_HA.java,v
retrieving revision 1.3.10.1
retrieving revision 1.3.10.2
diff -u -r1.3.10.1 -r1.3.10.2
--- XResources_ja_JP_HA.java 27 Jan 2003 19:45:48 -0000 1.3.10.1
+++ XResources_ja_JP_HA.java 30 Jan 2003 18:41:56 -0000 1.3.10.2
@@ -56,10 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_en.properties
//
1.4.10.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_ja_JP_HI.java
Index: XResources_ja_JP_HI.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_ja_JP_HI.java,v
retrieving revision 1.4.10.1
retrieving revision 1.4.10.2
diff -u -r1.4.10.1 -r1.4.10.2
--- XResources_ja_JP_HI.java 27 Jan 2003 19:45:48 -0000 1.4.10.1
+++ XResources_ja_JP_HI.java 30 Jan 2003 18:41:56 -0000 1.4.10.2
@@ -56,10 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_en.properties
//
1.4.10.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_ja_JP_I.java
Index: XResources_ja_JP_I.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_ja_JP_I.java,v
retrieving revision 1.4.10.1
retrieving revision 1.4.10.2
diff -u -r1.4.10.1 -r1.4.10.2
--- XResources_ja_JP_I.java 27 Jan 2003 19:45:48 -0000 1.4.10.1
+++ XResources_ja_JP_I.java 30 Jan 2003 18:41:56 -0000 1.4.10.2
@@ -56,10 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_en.properties
//
1.2.16.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_ka.java
Index: XResources_ka.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_ka.java,v
retrieving revision 1.2.16.1
retrieving revision 1.2.16.2
diff -u -r1.2.16.1 -r1.2.16.2
--- XResources_ka.java 27 Jan 2003 19:45:48 -0000 1.2.16.1
+++ XResources_ka.java 30 Jan 2003 18:41:56 -0000 1.2.16.2
@@ -56,10 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_en.properties
//
1.2.2.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_ko.java
Index: XResources_ko.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_ko.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- XResources_ko.java 27 Jan 2003 19:45:48 -0000 1.2.2.1
+++ XResources_ko.java 30 Jan 2003 18:41:56 -0000 1.2.2.2
@@ -58,10 +58,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_ko.properties
//
1.2.2.2 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_sv.java
Index: XResources_sv.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_sv.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- XResources_sv.java 27 Jan 2003 19:45:48 -0000 1.2.2.1
+++ XResources_sv.java 30 Jan 2003 18:41:56 -0000 1.2.2.2
@@ -58,10 +58,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_sv.properties
//
1.3.10.3 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_zh_CN.java
Index: XResources_zh_CN.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_zh_CN.java,v
retrieving revision 1.3.10.2
retrieving revision 1.3.10.3
diff -u -r1.3.10.2 -r1.3.10.3
--- XResources_zh_CN.java 27 Jan 2003 19:45:48 -0000 1.3.10.2
+++ XResources_zh_CN.java 30 Jan 2003 18:41:56 -0000 1.3.10.3
@@ -56,10 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_en.properties
//
1.3.10.3 +0 -4
xml-xalan/java/src/org/apache/xml/utils/res/XResources_zh_TW.java
Index: XResources_zh_TW.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/res/XResources_zh_TW.java,v
retrieving revision 1.3.10.2
retrieving revision 1.3.10.3
diff -u -r1.3.10.2 -r1.3.10.3
--- XResources_zh_TW.java 27 Jan 2003 19:45:48 -0000 1.3.10.2
+++ XResources_zh_TW.java 30 Jan 2003 18:41:56 -0000 1.3.10.3
@@ -56,10 +56,6 @@
*/
package org.apache.xml.utils.res;
-import org.apache.xml.utils.res.XResourceBundle;
-
-import java.util.*;
-
//
// LangResources_en.properties
//
No revision
No revision
1.4.16.2 +3 -4
xml-xalan/java/src/org/apache/xml/utils/synthetic/Class.java
Index: Class.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/synthetic/Class.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- Class.java 27 Jan 2003 19:45:49 -0000 1.4.16.1
+++ Class.java 30 Jan 2003 18:41:57 -0000 1.4.16.2
@@ -56,12 +56,11 @@
*/
package org.apache.xml.utils.synthetic;
-import org.apache.xml.utils.synthetic.SynthesisException;
+import java.lang.reflect.Modifier;
+
import org.apache.xml.utils.synthetic.reflection.Constructor;
-import org.apache.xml.utils.synthetic.reflection.Method;
import org.apache.xml.utils.synthetic.reflection.Field;
-
-import java.lang.reflect.Modifier;
+import org.apache.xml.utils.synthetic.reflection.Method;
/* WORK NEEDED:
Factories/Libraries: We currently have forClass and
1.2.16.2 +1 -2
xml-xalan/java/src/org/apache/xml/utils/synthetic/TestDriver.java
Index: TestDriver.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/synthetic/TestDriver.java,v
retrieving revision 1.2.16.1
retrieving revision 1.2.16.2
diff -u -r1.2.16.1 -r1.2.16.2
--- TestDriver.java 27 Jan 2003 19:45:50 -0000 1.2.16.1
+++ TestDriver.java 30 Jan 2003 18:41:57 -0000 1.2.16.2
@@ -63,8 +63,7 @@
*/
package org.apache.xml.utils.synthetic;
-import org.apache.xml.utils.synthetic.Class;
-import org.apache.xml.utils.synthetic.reflection.*;
+import org.apache.xml.utils.synthetic.reflection.Method;
/**
* <meta name="usage" content="internal"/>
No revision
No revision
1.3.16.2 +0 -3
xml-xalan/java/src/org/apache/xml/utils/synthetic/reflection/Constructor.java
Index: Constructor.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/synthetic/reflection/Constructor.java,v
retrieving revision 1.3.16.1
retrieving revision 1.3.16.2
diff -u -r1.3.16.1 -r1.3.16.2
--- Constructor.java 27 Jan 2003 19:45:50 -0000 1.3.16.1
+++ Constructor.java 30 Jan 2003 18:41:57 -0000 1.3.16.2
@@ -56,9 +56,6 @@
*/
package org.apache.xml.utils.synthetic.reflection;
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.xml.utils.synthetic.SynthesisException;
/**
* <meta name="usage" content="internal"/>
1.3.16.2 +0 -2
xml-xalan/java/src/org/apache/xml/utils/synthetic/reflection/EntryPoint.java
Index: EntryPoint.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/synthetic/reflection/EntryPoint.java,v
retrieving revision 1.3.16.1
retrieving revision 1.3.16.2
diff -u -r1.3.16.1 -r1.3.16.2
--- EntryPoint.java 27 Jan 2003 19:45:52 -0000 1.3.16.1
+++ EntryPoint.java 30 Jan 2003 18:41:57 -0000 1.3.16.2
@@ -56,8 +56,6 @@
*/
package org.apache.xml.utils.synthetic.reflection;
-import java.lang.reflect.InvocationTargetException;
-
import org.apache.xml.utils.synthetic.SynthesisException;
/*
1.3.16.2 +0 -2
xml-xalan/java/src/org/apache/xml/utils/synthetic/reflection/Method.java
Index: Method.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/synthetic/reflection/Method.java,v
retrieving revision 1.3.16.1
retrieving revision 1.3.16.2
diff -u -r1.3.16.1 -r1.3.16.2
--- Method.java 27 Jan 2003 19:45:52 -0000 1.3.16.1
+++ Method.java 30 Jan 2003 18:41:57 -0000 1.3.16.2
@@ -56,8 +56,6 @@
*/
package org.apache.xml.utils.synthetic.reflection;
-import java.lang.reflect.InvocationTargetException;
-
import org.apache.xml.utils.synthetic.SynthesisException;
/**
No revision
No revision
1.2.10.2 +6 -14 xml-xalan/java/src/org/apache/xpath/CachedXPathAPI.java
Index: CachedXPathAPI.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/CachedXPathAPI.java,v
retrieving revision 1.2.10.1
retrieving revision 1.2.10.2
diff -u -r1.2.10.1 -r1.2.10.2
--- CachedXPathAPI.java 27 Jan 2003 19:45:53 -0000 1.2.10.1
+++ CachedXPathAPI.java 30 Jan 2003 18:41:58 -0000 1.2.10.2
@@ -58,22 +58,14 @@
import javax.xml.transform.TransformerException;
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-import org.w3c.dom.traversal.NodeIterator;
-import org.w3c.dom.NodeList;
-
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.compiler.XPathParser;
-import org.apache.xpath.XPathContext;
-import org.apache.xml.utils.PrefixResolverDefault;
import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.utils.PrefixResolverDefault;
import org.apache.xpath.objects.XObject;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.ref.DTMNodeIterator;
-import org.apache.xml.dtm.ref.DTMNodeList;
-import org.apache.xml.dtm.ref.DTMManagerDefault;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.traversal.NodeIterator;
/**
* The methods in this class are convenience methods into the
1.18.2.3 +8 -16 xml-xalan/java/src/org/apache/xpath/Expression.java
Index: Expression.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/Expression.java,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -r1.18.2.2 -r1.18.2.3
--- Expression.java 27 Jan 2003 19:45:55 -0000 1.18.2.2
+++ Expression.java 30 Jan 2003 18:41:58 -0000 1.18.2.3
@@ -56,26 +56,18 @@
*/
package org.apache.xpath;
-//import org.w3c.dom.Node;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
-
-import org.xml.sax.XMLReader;
-import org.xml.sax.ContentHandler;
-
-import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.ErrorListener;
import javax.xml.transform.TransformerException;
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.dtm.DTMIterator;
+import org.apache.xalan.res.XSLMessages;
import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.utils.XMLString;
+import org.apache.xpath.objects.XNodeSet;
+import org.apache.xpath.objects.XObject;
+import org.apache.xpath.res.XPATHErrorResources;
-import javax.xml.transform.SourceLocator;
-import javax.xml.transform.ErrorListener;
+import org.xml.sax.ContentHandler;
/**
* This abstract class serves as the base for all expression objects. An
1.3.2.2 +2 -1
xml-xalan/java/src/org/apache/xpath/ExtensionsProvider.java
Index: ExtensionsProvider.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/ExtensionsProvider.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- ExtensionsProvider.java 27 Jan 2003 19:45:55 -0000 1.3.2.1
+++ ExtensionsProvider.java 30 Jan 2003 18:41:58 -0000 1.3.2.2
@@ -56,8 +56,9 @@
*/
package org.apache.xpath;
-import org.apache.xpath.functions.FuncExtFunction;
import java.util.Vector;
+
+import org.apache.xpath.functions.FuncExtFunction;
/**
* Interface that XPath objects can call to obtain access to an
1.14.10.4 +7 -10 xml-xalan/java/src/org/apache/xpath/NodeSet.java
Index: NodeSet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/NodeSet.java,v
retrieving revision 1.14.10.3
retrieving revision 1.14.10.4
diff -u -r1.14.10.3 -r1.14.10.4
--- NodeSet.java 27 Jan 2003 19:45:55 -0000 1.14.10.3
+++ NodeSet.java 30 Jan 2003 18:41:58 -0000 1.14.10.4
@@ -56,19 +56,16 @@
*/
package org.apache.xpath;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.traversal.NodeIterator;
-import org.w3c.dom.traversal.NodeFilter;
-import org.w3c.dom.DOMException;
-
-import org.apache.xml.utils.NodeVector;
+import org.apache.xalan.res.XSLMessages;
import org.apache.xml.utils.DOM2Helper;
import org.apache.xpath.axes.ContextNodeList;
-
import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.traversal.NodeFilter;
+import org.w3c.dom.traversal.NodeIterator;
/**
1.9.10.4 +5 -11 xml-xalan/java/src/org/apache/xpath/NodeSetDTM.java
Index: NodeSetDTM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/NodeSetDTM.java,v
retrieving revision 1.9.10.3
retrieving revision 1.9.10.4
diff -u -r1.9.10.3 -r1.9.10.4
--- NodeSetDTM.java 27 Jan 2003 19:45:57 -0000 1.9.10.3
+++ NodeSetDTM.java 30 Jan 2003 18:41:58 -0000 1.9.10.4
@@ -56,23 +56,17 @@
*/
package org.apache.xpath;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-//import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.traversal.NodeIterator;
-//import org.w3c.dom.traversal.NodeFilter;
-//import org.w3c.dom.DOMException;
-
+import org.apache.xalan.res.XSLMessages;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.DTMManager;
-
import org.apache.xml.utils.NodeVector;
-import org.apache.xpath.axes.ContextNodeList;
-
import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.traversal.NodeIterator;
/**
1.4.12.2 +0 -1 xml-xalan/java/src/org/apache/xpath/SourceTree.java
Index: SourceTree.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/SourceTree.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- SourceTree.java 27 Jan 2003 19:45:57 -0000 1.4.12.1
+++ SourceTree.java 30 Jan 2003 18:41:58 -0000 1.4.12.2
@@ -56,7 +56,6 @@
*/
package org.apache.xpath;
-//import org.w3c.dom.Node;
/**
* <meta name="usage" content="internal"/>
1.30.6.2 +8 -29
xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java
Index: SourceTreeManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/SourceTreeManager.java,v
retrieving revision 1.30.6.1
retrieving revision 1.30.6.2
diff -u -r1.30.6.1 -r1.30.6.2
--- SourceTreeManager.java 27 Jan 2003 19:45:57 -0000 1.30.6.1
+++ SourceTreeManager.java 30 Jan 2003 18:41:58 -0000 1.30.6.2
@@ -56,42 +56,21 @@
*/
package org.apache.xpath;
-import java.net.MalformedURLException;
-
-import java.io.File;
import java.io.IOException;
-
-import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.xpath.objects.XString;
-
-//import org.w3c.dom.Node;
-//import org.w3c.dom.Document;
-
-import org.apache.xml.dtm.DTM;
-
-import javax.xml.transform.URIResolver;
+import javax.xml.transform.Source;
+import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamSource;
-import org.xml.sax.InputSource;
-import org.xml.sax.helpers.XMLReaderFactory;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-
-// import org.xml.sax.Locator;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.dtm.DTM;
import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xpath.res.XPATHErrorResources;
-import javax.xml.transform.SourceLocator;
-import javax.xml.transform.Source;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.TransformerException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
/**
* This class bottlenecks all management of source trees. The methods
1.40.2.3 +3 -6 xml-xalan/java/src/org/apache/xpath/VariableStack.java
Index: VariableStack.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/VariableStack.java,v
retrieving revision 1.40.2.2
retrieving revision 1.40.2.3
diff -u -r1.40.2.2 -r1.40.2.3
--- VariableStack.java 27 Jan 2003 19:45:58 -0000 1.40.2.2
+++ VariableStack.java 30 Jan 2003 18:41:58 -0000 1.40.2.3
@@ -56,14 +56,11 @@
*/
package org.apache.xpath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
+import javax.xml.transform.TransformerException;
-import org.apache.xpath.res.XPATHErrorResources;
import org.apache.xalan.res.XSLMessages;
-
-
-import javax.xml.transform.TransformerException;
+import org.apache.xpath.objects.XObject;
+import org.apache.xpath.res.XPATHErrorResources;
/**
* <meta name="usage" content="internal"/>
1.1.16.2 +2 -1
xml-xalan/java/src/org/apache/xpath/WhitespaceStrippingElementMatcher.java
Index: WhitespaceStrippingElementMatcher.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/WhitespaceStrippingElementMatcher.java,v
retrieving revision 1.1.16.1
retrieving revision 1.1.16.2
diff -u -r1.1.16.1 -r1.1.16.2
--- WhitespaceStrippingElementMatcher.java 27 Jan 2003 19:45:58 -0000
1.1.16.1
+++ WhitespaceStrippingElementMatcher.java 30 Jan 2003 18:41:58 -0000
1.1.16.2
@@ -56,8 +56,9 @@
*/
package org.apache.xpath;
-import org.w3c.dom.Element;
import javax.xml.transform.TransformerException;
+
+import org.w3c.dom.Element;
/**
* A class that implements this interface can tell if a given element should
1.23.2.5 +1 -3 xml-xalan/java/src/org/apache/xpath/XPath.java
Index: XPath.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPath.java,v
retrieving revision 1.23.2.4
retrieving revision 1.23.2.5
diff -u -r1.23.2.4 -r1.23.2.5
--- XPath.java 27 Jan 2003 19:45:58 -0000 1.23.2.4
+++ XPath.java 30 Jan 2003 18:41:58 -0000 1.23.2.5
@@ -57,23 +57,21 @@
package org.apache.xpath;
import java.io.Serializable;
-import java.util.Vector;
import javax.xml.transform.ErrorListener;
import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
+
import org.apache.xalan.res.XSLMessages;
import org.apache.xml.dtm.DTM;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xml.utils.WrappedRuntimeException;
import org.apache.xpath.compiler.Compiler;
import org.apache.xpath.compiler.FunctionTable;
import org.apache.xpath.compiler.XPathParser;
import org.apache.xpath.functions.Function;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.res.XPATHErrorResources;
-import org.w3c.dom.Node;
/**
* <meta name="usage" content="advanced"/>
1.14.10.2 +6 -14 xml-xalan/java/src/org/apache/xpath/XPathAPI.java
Index: XPathAPI.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathAPI.java,v
retrieving revision 1.14.10.1
retrieving revision 1.14.10.2
diff -u -r1.14.10.1 -r1.14.10.2
--- XPathAPI.java 27 Jan 2003 19:45:59 -0000 1.14.10.1
+++ XPathAPI.java 30 Jan 2003 18:41:58 -0000 1.14.10.2
@@ -58,22 +58,14 @@
import javax.xml.transform.TransformerException;
-import org.w3c.dom.Node;
-import org.w3c.dom.Document;
-import org.w3c.dom.traversal.NodeIterator;
-import org.w3c.dom.NodeList;
-
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.compiler.XPathParser;
-import org.apache.xpath.XPathContext;
-import org.apache.xml.utils.PrefixResolverDefault;
import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.utils.PrefixResolverDefault;
import org.apache.xpath.objects.XObject;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.ref.DTMNodeIterator;
-import org.apache.xml.dtm.ref.DTMNodeList;
-import org.apache.xml.dtm.ref.DTMManagerDefault;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.traversal.NodeIterator;
/**
* The methods in this class are convenience methods into the
1.37.2.7 +18 -46 xml-xalan/java/src/org/apache/xpath/XPathContext.java
Index: XPathContext.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathContext.java,v
retrieving revision 1.37.2.6
retrieving revision 1.37.2.7
diff -u -r1.37.2.6 -r1.37.2.7
--- XPathContext.java 27 Jan 2003 19:45:59 -0000 1.37.2.6
+++ XPathContext.java 30 Jan 2003 18:41:58 -0000 1.37.2.7
@@ -56,64 +56,36 @@
*/
package org.apache.xpath;
-// Java lib imports
-import java.io.File;
-import java.io.IOException;
-
+import java.lang.reflect.Method;
import java.util.Stack;
import java.util.Vector;
-import java.lang.reflect.Method;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.SourceLocator;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
-// Xalan imports
+import org.apache.xalan.extensions.ExpressionContext;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMFilter;
+import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.DTMWSFilter;
+import org.apache.xml.dtm.ref.sax2dtm.SAX2RTFDTM;
import org.apache.xml.utils.IntStack;
+import org.apache.xml.utils.NodeVector;
import org.apache.xml.utils.ObjectStack;
-import org.apache.xml.utils.NSInfo;
import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.NodeVector;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xpath.axes.ContextNodeList;
+import org.apache.xml.utils.SAXSourceLocator;
+import org.apache.xml.utils.XMLString;
import org.apache.xpath.axes.SubContextList;
import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNodeSet;
import org.apache.xpath.objects.XString;
+import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.extensions.ExpressionContext;
-
-// SAX2 imports
-import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
-// import org.xml.sax.Locator;
-
-// TRaX imports
-import javax.xml.transform.URIResolver;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.dom.DOMSource;
-
-import javax.xml.transform.SourceLocator;
-import javax.xml.transform.Source;
-import javax.xml.transform.ErrorListener;
-
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMWSFilter;
-import org.apache.xml.dtm.Axis;
-
-// Utility imports.
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xml.utils.IntStack;
-
-import org.apache.xpath.axes.DescendantIterator;
-
-// For handling.
-import org.apache.xml.dtm.ref.sax2dtm.SAX2RTFDTM;
/**
* <meta name="usage" content="advanced"/>
1.8.2.2 +1 -3 xml-xalan/java/src/org/apache/xpath/XPathException.java
Index: XPathException.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathException.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- XPathException.java 27 Jan 2003 19:46:00 -0000 1.8.2.1
+++ XPathException.java 30 Jan 2003 18:41:58 -0000 1.8.2.2
@@ -56,10 +56,8 @@
*/
package org.apache.xpath;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
import javax.xml.transform.TransformerException;
+
import org.w3c.dom.Node;
/**
1.5.16.2 +1 -3 xml-xalan/java/src/org/apache/xpath/XPathFactory.java
Index: XPathFactory.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathFactory.java,v
retrieving revision 1.5.16.1
retrieving revision 1.5.16.2
diff -u -r1.5.16.1 -r1.5.16.2
--- XPathFactory.java 27 Jan 2003 19:46:00 -0000 1.5.16.1
+++ XPathFactory.java 30 Jan 2003 18:41:58 -0000 1.5.16.2
@@ -56,11 +56,9 @@
*/
package org.apache.xpath;
-// import org.xml.sax.Locator;
+import javax.xml.transform.SourceLocator;
import org.apache.xml.utils.PrefixResolver;
-
-import javax.xml.transform.SourceLocator;
/**
* <meta name="usage" content="advanced"/>
1.1.2.2 +1 -1 xml-xalan/java/src/org/apache/xpath/XPathVisitor.java
Index: XPathVisitor.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathVisitor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XPathVisitor.java 27 Jan 2003 19:46:00 -0000 1.1.2.1
+++ XPathVisitor.java 30 Jan 2003 18:41:58 -0000 1.1.2.2
@@ -56,7 +56,6 @@
*/
package org.apache.xpath;
-import org.apache.xpath.patterns.NodeTest;
import org.apache.xpath.axes.LocPathIterator;
import org.apache.xpath.axes.UnionPathIterator;
import org.apache.xpath.functions.Function;
@@ -65,6 +64,7 @@
import org.apache.xpath.operations.Operation;
import org.apache.xpath.operations.UnaryOperation;
import org.apache.xpath.operations.Variable;
+import org.apache.xpath.patterns.NodeTest;
import org.apache.xpath.patterns.StepPattern;
import org.apache.xpath.patterns.UnionPattern;
No revision
No revision
1.10.2.2 +1 -9
xml-xalan/java/src/org/apache/xpath/axes/AttributeIterator.java
Index: AttributeIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/AttributeIterator.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- AttributeIterator.java 27 Jan 2003 19:46:03 -0000 1.10.2.1
+++ AttributeIterator.java 30 Jan 2003 18:41:59 -0000 1.10.2.2
@@ -56,16 +56,8 @@
*/
package org.apache.xpath.axes;
-import javax.xml.transform.TransformerException;
-
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.objects.XObject;
-
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMFilter;
+import org.apache.xpath.compiler.Compiler;
/**
* <meta name="usage" content="advanced"/>
1.23.2.4 +1 -4 xml-xalan/java/src/org/apache/xpath/axes/AxesWalker.java
Index: AxesWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/AxesWalker.java,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -u -r1.23.2.3 -r1.23.2.4
--- AxesWalker.java 27 Jan 2003 19:46:03 -0000 1.23.2.3
+++ AxesWalker.java 30 Jan 2003 18:41:59 -0000 1.23.2.4
@@ -58,7 +58,7 @@
import java.util.Vector;
-import javax.xml.transform.TransformerException;
+import org.apache.xalan.res.XSLMessages;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMAxisTraverser;
import org.apache.xml.dtm.DTMIterator;
@@ -67,10 +67,7 @@
import org.apache.xpath.XPathContext;
import org.apache.xpath.XPathVisitor;
import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.patterns.NodeTest;
-
import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
/**
* Serves as common interface for axes Walkers, and stores common
1.2.2.3 +0 -2
xml-xalan/java/src/org/apache/xpath/axes/BasicTestIterator.java
Index: BasicTestIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/BasicTestIterator.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- BasicTestIterator.java 27 Jan 2003 19:46:03 -0000 1.2.2.2
+++ BasicTestIterator.java 30 Jan 2003 18:41:59 -0000 1.2.2.3
@@ -56,12 +56,10 @@
*/
package org.apache.xpath.axes;
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.VariableStack;
import org.apache.xpath.compiler.Compiler;
/**
1.10.2.2 +2 -10
xml-xalan/java/src/org/apache/xpath/axes/ChildIterator.java
Index: ChildIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/ChildIterator.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- ChildIterator.java 27 Jan 2003 19:46:03 -0000 1.10.2.1
+++ ChildIterator.java 30 Jan 2003 18:41:59 -0000 1.10.2.2
@@ -56,17 +56,9 @@
*/
package org.apache.xpath.axes;
-import javax.xml.transform.TransformerException;
-
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.XPathContext;
-import org.apache.xml.utils.PrefixResolver;
-
-//import org.w3c.dom.Node;
-//import org.w3c.dom.DOMException;
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.compiler.Compiler;
/**
* <meta name="usage" content="advanced"/>
1.14.2.3 +3 -9
xml-xalan/java/src/org/apache/xpath/axes/ChildTestIterator.java
Index: ChildTestIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/ChildTestIterator.java,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- ChildTestIterator.java 27 Jan 2003 19:46:03 -0000 1.14.2.2
+++ ChildTestIterator.java 30 Jan 2003 18:41:59 -0000 1.14.2.3
@@ -56,17 +56,11 @@
*/
package org.apache.xpath.axes;
-import javax.xml.transform.TransformerException;
-
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.objects.XObject;
-
+import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTMIterator;
+import org.apache.xpath.compiler.Compiler;
/**
* <meta name="usage" content="advanced"/>
1.15.2.3 +0 -2
xml-xalan/java/src/org/apache/xpath/axes/DescendantIterator.java
Index: DescendantIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/DescendantIterator.java,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -r1.15.2.2 -r1.15.2.3
--- DescendantIterator.java 27 Jan 2003 19:46:03 -0000 1.15.2.2
+++ DescendantIterator.java 30 Jan 2003 18:41:59 -0000 1.15.2.3
@@ -56,14 +56,12 @@
*/
package org.apache.xpath.axes;
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMAxisTraverser;
import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xpath.Expression;
-import org.apache.xpath.VariableStack;
import org.apache.xpath.XPathContext;
import org.apache.xpath.compiler.Compiler;
import org.apache.xpath.compiler.OpCodes;
1.2.2.2 +0 -2
xml-xalan/java/src/org/apache/xpath/axes/FilterExprIterator.java
Index: FilterExprIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/FilterExprIterator.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- FilterExprIterator.java 27 Jan 2003 19:46:03 -0000 1.2.2.1
+++ FilterExprIterator.java 30 Jan 2003 18:41:59 -0000 1.2.2.2
@@ -56,8 +56,6 @@
*/
package org.apache.xpath.axes;
-import java.util.Vector;
-
import org.apache.xml.dtm.DTM;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
1.2.2.2 +0 -3
xml-xalan/java/src/org/apache/xpath/axes/FilterExprIteratorSimple.java
Index: FilterExprIteratorSimple.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/FilterExprIteratorSimple.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- FilterExprIteratorSimple.java 27 Jan 2003 19:46:03 -0000 1.2.2.1
+++ FilterExprIteratorSimple.java 30 Jan 2003 18:41:59 -0000 1.2.2.2
@@ -56,9 +56,6 @@
*/
package org.apache.xpath.axes;
-import java.util.Vector;
-
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
import org.apache.xml.utils.PrefixResolver;
1.20.2.2 +0 -6
xml-xalan/java/src/org/apache/xpath/axes/FilterExprWalker.java
Index: FilterExprWalker.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/FilterExprWalker.java,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- FilterExprWalker.java 27 Jan 2003 19:46:03 -0000 1.20.2.1
+++ FilterExprWalker.java 30 Jan 2003 18:41:59 -0000 1.20.2.2
@@ -56,17 +56,11 @@
*/
package org.apache.xpath.axes;
-import java.util.Vector;
-
-import javax.xml.transform.TransformerException;
-import org.apache.xalan.templates.FuncKey;
import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.PrefixResolver;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.VariableStack;
import org.apache.xpath.XPathContext;
import org.apache.xpath.XPathVisitor;
import org.apache.xpath.compiler.Compiler;
1.4.2.2 +2 -1
xml-xalan/java/src/org/apache/xpath/axes/IteratorPool.java
Index: IteratorPool.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/IteratorPool.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- IteratorPool.java 27 Jan 2003 19:46:04 -0000 1.4.2.1
+++ IteratorPool.java 30 Jan 2003 18:42:00 -0000 1.4.2.2
@@ -56,7 +56,8 @@
*/
package org.apache.xpath.axes;
-import java.util.*;
+import java.util.Vector;
+
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.utils.WrappedRuntimeException;
1.34.2.4 +1 -9
xml-xalan/java/src/org/apache/xpath/axes/LocPathIterator.java
Index: LocPathIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/LocPathIterator.java,v
retrieving revision 1.34.2.3
retrieving revision 1.34.2.4
diff -u -r1.34.2.3 -r1.34.2.4
--- LocPathIterator.java 27 Jan 2003 19:46:04 -0000 1.34.2.3
+++ LocPathIterator.java 30 Jan 2003 18:42:00 -0000 1.34.2.4
@@ -56,12 +56,7 @@
*/
package org.apache.xpath.axes;
-// Java library imports
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-
-import javax.xml.transform.TransformerException;
+import org.apache.xalan.res.XSLMessages;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMIterator;
@@ -74,9 +69,6 @@
import org.apache.xpath.objects.XNodeSet;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
/**
* <meta name="usage" content="advanced"/>
1.4.2.3 +6 -15
xml-xalan/java/src/org/apache/xpath/axes/MatchPatternIterator.java
Index: MatchPatternIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/MatchPatternIterator.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- MatchPatternIterator.java 27 Jan 2003 19:46:04 -0000 1.4.2.2
+++ MatchPatternIterator.java 30 Jan 2003 18:42:00 -0000 1.4.2.3
@@ -56,24 +56,15 @@
*/
package org.apache.xpath.axes;
-import java.util.Stack;
-
-import org.apache.xpath.Expression;
-import org.apache.xpath.objects.XObject;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisTraverser;
+import org.apache.xml.dtm.DTMIterator;
import org.apache.xpath.XPathContext;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.axes.SubContextList;
-import org.apache.xpath.compiler.PsuedoNames;
import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.patterns.StepPattern;
-import org.apache.xpath.VariableStack;
+import org.apache.xpath.objects.XObject;
import org.apache.xpath.patterns.NodeTest;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.Axis;
-import org.apache.xml.dtm.DTMAxisTraverser;
+import org.apache.xpath.patterns.StepPattern;
/**
* This class treats a
1.2.2.5 +2 -5
xml-xalan/java/src/org/apache/xpath/axes/NodeSequence.java
Index: NodeSequence.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/NodeSequence.java,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- NodeSequence.java 27 Jan 2003 19:46:04 -0000 1.2.2.4
+++ NodeSequence.java 30 Jan 2003 18:42:00 -0000 1.2.2.5
@@ -56,16 +56,13 @@
*/
package org.apache.xpath.axes;
-import java.io.Serializable;
-
import java.util.Vector;
-import javax.xml.transform.TransformerException;
+
import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.DTMManager;
-import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.utils.NodeVector;
-import org.apache.xpath.Expression;
import org.apache.xpath.NodeSetDTM;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
1.8.2.4 +0 -1
xml-xalan/java/src/org/apache/xpath/axes/OneStepIterator.java
Index: OneStepIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/OneStepIterator.java,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- OneStepIterator.java 27 Jan 2003 19:46:04 -0000 1.8.2.3
+++ OneStepIterator.java 30 Jan 2003 18:42:00 -0000 1.8.2.4
@@ -56,7 +56,6 @@
*/
package org.apache.xpath.axes;
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMAxisIterator;
import org.apache.xml.dtm.DTMFilter;
1.5.2.2 +0 -1
xml-xalan/java/src/org/apache/xpath/axes/OneStepIteratorForward.java
Index: OneStepIteratorForward.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/OneStepIteratorForward.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- OneStepIteratorForward.java 27 Jan 2003 19:46:04 -0000 1.5.2.1
+++ OneStepIteratorForward.java 30 Jan 2003 18:42:00 -0000 1.5.2.2
@@ -56,7 +56,6 @@
*/
package org.apache.xpath.axes;
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMFilter;
import org.apache.xpath.Expression;
1.10.2.4 +0 -5
xml-xalan/java/src/org/apache/xpath/axes/PredicatedNodeTest.java
Index: PredicatedNodeTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/PredicatedNodeTest.java,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -r1.10.2.3 -r1.10.2.4
--- PredicatedNodeTest.java 27 Jan 2003 19:46:04 -0000 1.10.2.3
+++ PredicatedNodeTest.java 30 Jan 2003 18:42:00 -0000 1.10.2.4
@@ -56,11 +56,6 @@
*/
package org.apache.xpath.axes;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.util.Vector;
-
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.utils.PrefixResolver;
1.2.4.2 +1 -2 xml-xalan/java/src/org/apache/xpath/axes/RTFIterator.java
Index: RTFIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/RTFIterator.java,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- RTFIterator.java 27 Jan 2003 19:46:04 -0000 1.2.4.1
+++ RTFIterator.java 30 Jan 2003 18:42:00 -0000 1.2.4.2
@@ -63,9 +63,8 @@
*/
package org.apache.xpath.axes;
-import javax.xml.transform.TransformerException;
-import org.apache.xpath.NodeSetDTM;
import org.apache.xml.dtm.DTMManager;
+import org.apache.xpath.NodeSetDTM;
public class RTFIterator extends NodeSetDTM {
1.10.2.3 +1 -12
xml-xalan/java/src/org/apache/xpath/axes/ReverseAxesWalker.java
Index: ReverseAxesWalker.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/ReverseAxesWalker.java,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- ReverseAxesWalker.java 27 Jan 2003 19:46:04 -0000 1.10.2.2
+++ ReverseAxesWalker.java 30 Jan 2003 18:42:00 -0000 1.10.2.3
@@ -56,20 +56,9 @@
*/
package org.apache.xpath.axes;
-import java.util.Vector;
-
-import org.apache.xpath.axes.LocPathIterator;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.compiler.OpCodes;
-import org.apache.xpath.objects.XObject;
-
-import javax.xml.transform.TransformerException;
-
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.DTMAxisIterator;
-import org.apache.xml.dtm.Axis;
+import org.apache.xpath.XPathContext;
/**
* Walker for a reverse axes.
1.6.2.3 +2 -9
xml-xalan/java/src/org/apache/xpath/axes/SelfIteratorNoPredicate.java
Index: SelfIteratorNoPredicate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/SelfIteratorNoPredicate.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- SelfIteratorNoPredicate.java 27 Jan 2003 19:46:04 -0000 1.6.2.2
+++ SelfIteratorNoPredicate.java 30 Jan 2003 18:42:00 -0000 1.6.2.3
@@ -56,16 +56,9 @@
*/
package org.apache.xpath.axes;
-import javax.xml.transform.TransformerException;
-
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.XPathContext;
-import org.apache.xml.utils.PrefixResolver;
-
-//import org.w3c.dom.Node;
-//import org.w3c.dom.DOMException;
import org.apache.xml.dtm.DTM;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.compiler.Compiler;
/**
* <meta name="usage" content="advanced"/>
1.1.2.4 +2 -8
xml-xalan/java/src/org/apache/xpath/axes/Attic/SingletonIterator.java
Index: SingletonIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/Attic/SingletonIterator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SingletonIterator.java 27 Jan 2003 19:46:05 -0000 1.1.2.3
+++ SingletonIterator.java 30 Jan 2003 18:42:00 -0000 1.1.2.4
@@ -61,14 +61,8 @@
*/
package org.apache.xpath.axes;
-import javax.xml.transform.TransformerException;
-
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.XPathContext;
-import org.apache.xml.utils.PrefixResolver;
-
import org.apache.xml.dtm.DTM;
+import org.apache.xpath.XPathContext;
/**
* <meta name="usage" content="advanced"/>
1.5.12.2 +0 -2
xml-xalan/java/src/org/apache/xpath/axes/SubContextList.java
Index: SubContextList.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/SubContextList.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- SubContextList.java 27 Jan 2003 19:46:05 -0000 1.5.12.1
+++ SubContextList.java 30 Jan 2003 18:42:00 -0000 1.5.12.2
@@ -57,8 +57,6 @@
package org.apache.xpath.axes;
import org.apache.xpath.XPathContext;
-
-//import org.w3c.dom.Node;
/**
* <meta name="usage" content="advanced"/>
1.26.2.3 +0 -6
xml-xalan/java/src/org/apache/xpath/axes/UnionPathIterator.java
Index: UnionPathIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/UnionPathIterator.java,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -u -r1.26.2.2 -r1.26.2.3
--- UnionPathIterator.java 27 Jan 2003 19:46:05 -0000 1.26.2.2
+++ UnionPathIterator.java 30 Jan 2003 18:42:00 -0000 1.26.2.3
@@ -56,12 +56,6 @@
*/
package org.apache.xpath.axes;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.util.Vector;
-
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
1.22.2.4 +9 -10
xml-xalan/java/src/org/apache/xpath/axes/WalkerFactory.java
Index: WalkerFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/WalkerFactory.java,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -r1.22.2.3 -r1.22.2.4
--- WalkerFactory.java 27 Jan 2003 19:46:05 -0000 1.22.2.3
+++ WalkerFactory.java 30 Jan 2003 18:42:00 -0000 1.22.2.4
@@ -56,21 +56,20 @@
*/
package org.apache.xpath.axes;
-import org.apache.xpath.compiler.OpCodes;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTMFilter;
+import org.apache.xml.dtm.DTMIterator;
+import org.apache.xpath.Expression;
import org.apache.xpath.compiler.Compiler;
import org.apache.xpath.compiler.FunctionTable;
-import org.apache.xpath.patterns.NodeTest;
-import org.apache.xpath.patterns.StepPattern;
+import org.apache.xpath.compiler.OpCodes;
+import org.apache.xpath.objects.XNumber;
import org.apache.xpath.patterns.ContextMatchStepPattern;
import org.apache.xpath.patterns.FunctionPattern;
-import org.apache.xpath.Expression;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xpath.patterns.NodeTest;
+import org.apache.xpath.patterns.StepPattern;
import org.apache.xpath.res.XPATHErrorResources;
-
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.Axis;
/**
* This class is both a factory for XPath location path expressions,
1.5.2.2 +0 -3
xml-xalan/java/src/org/apache/xpath/axes/WalkingIterator.java
Index: WalkingIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/WalkingIterator.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- WalkingIterator.java 27 Jan 2003 19:46:05 -0000 1.5.2.1
+++ WalkingIterator.java 30 Jan 2003 18:42:00 -0000 1.5.2.2
@@ -56,9 +56,6 @@
*/
package org.apache.xpath.axes;
-import java.util.Vector;
-
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.DTM;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xpath.Expression;
1.7.2.2 +1 -4
xml-xalan/java/src/org/apache/xpath/axes/WalkingIteratorSorted.java
Index: WalkingIteratorSorted.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/WalkingIteratorSorted.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- WalkingIteratorSorted.java 27 Jan 2003 19:46:05 -0000 1.7.2.1
+++ WalkingIteratorSorted.java 30 Jan 2003 18:42:00 -0000 1.7.2.2
@@ -56,12 +56,9 @@
*/
package org.apache.xpath.axes;
-import org.apache.xpath.XPathContext;
+import org.apache.xml.dtm.Axis;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xpath.compiler.Compiler;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.Axis;
/**
* <meta name="usage" content="internal"/>
No revision
No revision
1.27.2.5 +23 -20
xml-xalan/java/src/org/apache/xpath/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/Compiler.java,v
retrieving revision 1.27.2.4
retrieving revision 1.27.2.5
diff -u -r1.27.2.4 -r1.27.2.5
--- Compiler.java 27 Jan 2003 19:46:07 -0000 1.27.2.4
+++ Compiler.java 30 Jan 2003 18:42:01 -0000 1.27.2.5
@@ -56,8 +56,26 @@
*/
package org.apache.xpath.compiler;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.SourceLocator;
+import javax.xml.transform.TransformerException;
+
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTMFilter;
+import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.utils.PrefixResolver;
+import org.apache.xml.utils.QName;
+import org.apache.xml.utils.SAXSourceLocator;
+import org.apache.xpath.Expression;
+import org.apache.xpath.axes.UnionPathIterator;
+import org.apache.xpath.axes.WalkerFactory;
+import org.apache.xpath.functions.FuncExtFunction;
+import org.apache.xpath.functions.Function;
+import org.apache.xpath.functions.WrongNumberArgsException;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XString;
import org.apache.xpath.operations.And;
-import org.apache.xpath.operations.Bool;
import org.apache.xpath.operations.Div;
import org.apache.xpath.operations.Equals;
import org.apache.xpath.operations.Gt;
@@ -74,26 +92,11 @@
import org.apache.xpath.operations.Plus;
import org.apache.xpath.operations.UnaryOperation;
import org.apache.xpath.operations.Variable;
-import org.apache.xpath.objects.*;
-import org.apache.xpath.axes.*;
-import org.apache.xpath.patterns.*;
-import org.apache.xpath.functions.Function;
-import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xpath.functions.WrongNumberArgsException;
-import org.apache.xpath.*;
+import org.apache.xpath.patterns.FunctionPattern;
+import org.apache.xpath.patterns.NodeTest;
+import org.apache.xpath.patterns.StepPattern;
+import org.apache.xpath.patterns.UnionPattern;
import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.utils.QName;
-import org.apache.xml.utils.PrefixResolver;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.SourceLocator;
-import org.apache.xml.utils.SAXSourceLocator;
-import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.Axis;
-
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.TransformerException;
/**
* <meta name="usage" content="advanced"/>
1.4.16.2 +0 -11
xml-xalan/java/src/org/apache/xpath/compiler/FuncLoader.java
Index: FuncLoader.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/FuncLoader.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- FuncLoader.java 27 Jan 2003 19:46:08 -0000 1.4.16.1
+++ FuncLoader.java 30 Jan 2003 18:42:01 -0000 1.4.16.2
@@ -56,17 +56,6 @@
*/
package org.apache.xpath.compiler;
-import java.lang.Class;
-
-import org.apache.xpath.res.XPATHErrorResources;
-
-import org.w3c.dom.Node;
-
-import java.util.Vector;
-
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.functions.Function;
/**
1.2.16.2 +0 -4
xml-xalan/java/src/org/apache/xpath/compiler/XPathDumper.java
Index: XPathDumper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/XPathDumper.java,v
retrieving revision 1.2.16.1
retrieving revision 1.2.16.2
diff -u -r1.2.16.1 -r1.2.16.2
--- XPathDumper.java 27 Jan 2003 19:46:10 -0000 1.2.16.1
+++ XPathDumper.java 30 Jan 2003 18:42:01 -0000 1.2.16.2
@@ -56,10 +56,6 @@
*/
package org.apache.xpath.compiler;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xpath.XPath;
-import org.apache.xpath.compiler.XPathParser;
/**
* Class for XPath diagnostic functions.
1.19.2.6 +5 -14
xml-xalan/java/src/org/apache/xpath/compiler/XPathParser.java
Index: XPathParser.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/XPathParser.java,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -r1.19.2.5 -r1.19.2.6
--- XPathParser.java 27 Jan 2003 19:46:10 -0000 1.19.2.5
+++ XPathParser.java 30 Jan 2003 18:42:01 -0000 1.19.2.6
@@ -56,24 +56,15 @@
*/
package org.apache.xpath.compiler;
-import java.util.Vector;
-import java.util.Hashtable;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.TransformerException;
+import org.apache.xalan.res.XSLMessages;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xpath.XPathProcessorException;
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xpath.compiler.Compiler;
-import org.apache.xpath.objects.XString;
import org.apache.xpath.objects.XNumber;
-import org.apache.xalan.res.XSLMessages;
-
-import javax.xml.transform.TransformerException;
-import org.xml.sax.Locator;
-import org.xml.sax.helpers.LocatorImpl;
-
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.ErrorListener;
+import org.apache.xpath.objects.XString;
+import org.apache.xpath.res.XPATHErrorResources;
/**
* <meta name="usage" content="general"/>
No revision
No revision
1.3.6.2 +5 -1
xml-xalan/java/src/org/apache/xpath/domapi/XPathEvaluatorImpl.java
Index: XPathEvaluatorImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/domapi/XPathEvaluatorImpl.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- XPathEvaluatorImpl.java 27 Jan 2003 19:46:12 -0000 1.3.6.1
+++ XPathEvaluatorImpl.java 30 Jan 2003 18:42:02 -0000 1.3.6.2
@@ -63,10 +63,14 @@
import org.apache.xml.utils.PrefixResolver;
import org.apache.xpath.XPath;
import org.apache.xpath.res.XPATHErrorResources;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import org.w3c.dom.xpath.*;
+import org.w3c.dom.xpath.XPathEvaluator;
+import org.w3c.dom.xpath.XPathException;
+import org.w3c.dom.xpath.XPathExpression;
+import org.w3c.dom.xpath.XPathNSResolver;
/**
* <meta name="usage" content="experimental"/>
1.3.6.2 +4 -1
xml-xalan/java/src/org/apache/xpath/domapi/XPathExpressionImpl.java
Index: XPathExpressionImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/domapi/XPathExpressionImpl.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- XPathExpressionImpl.java 27 Jan 2003 19:46:12 -0000 1.3.6.1
+++ XPathExpressionImpl.java 30 Jan 2003 18:42:02 -0000 1.3.6.2
@@ -66,10 +66,13 @@
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.res.XPATHErrorResources;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import org.w3c.dom.xpath.*;
+import org.w3c.dom.xpath.XPathException;
+import org.w3c.dom.xpath.XPathExpression;
+import org.w3c.dom.xpath.XPathNamespace;
/**
*
1.2.4.2 +1 -1
xml-xalan/java/src/org/apache/xpath/domapi/XPathNamespaceImpl.java
Index: XPathNamespaceImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/domapi/XPathNamespaceImpl.java,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- XPathNamespaceImpl.java 27 Jan 2003 19:46:12 -0000 1.2.4.1
+++ XPathNamespaceImpl.java 30 Jan 2003 18:42:02 -0000 1.2.4.2
@@ -58,7 +58,6 @@
package org.apache.xpath.domapi;
-import org.w3c.dom.xpath.XPathNamespace;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -66,6 +65,7 @@
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.w3c.dom.xpath.XPathNamespace;
/**
*
1.4.6.2 +3 -2
xml-xalan/java/src/org/apache/xpath/domapi/XPathResultImpl.java
Index: XPathResultImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/domapi/XPathResultImpl.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- XPathResultImpl.java 27 Jan 2003 19:46:12 -0000 1.4.6.1
+++ XPathResultImpl.java 30 Jan 2003 18:42:02 -0000 1.4.6.2
@@ -61,9 +61,9 @@
import javax.xml.transform.TransformerException;
import org.apache.xalan.res.XSLMessages;
-import org.apache.xml.dtm.DTM;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.res.XPATHErrorResources;
+
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -71,7 +71,8 @@
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
import org.w3c.dom.traversal.NodeIterator;
-import org.w3c.dom.xpath.*;
+import org.w3c.dom.xpath.XPathException;
+import org.w3c.dom.xpath.XPathResult;
/**
* <meta name="usage" content="experimental"/>
No revision
No revision
1.5.2.2 +1 -6
xml-xalan/java/src/org/apache/xpath/functions/FuncBoolean.java
Index: FuncBoolean.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncBoolean.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- FuncBoolean.java 27 Jan 2003 19:46:13 -0000 1.5.2.1
+++ FuncBoolean.java 30 Jan 2003 18:42:02 -0000 1.5.2.2
@@ -56,14 +56,9 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +1 -8
xml-xalan/java/src/org/apache/xpath/functions/FuncCeiling.java
Index: FuncCeiling.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncCeiling.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncCeiling.java 27 Jan 2003 19:46:13 -0000 1.4.12.1
+++ FuncCeiling.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,16 +56,9 @@
*/
package org.apache.xpath.functions;
-import java.lang.Math;
-
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.5.12.3 +0 -3
xml-xalan/java/src/org/apache/xpath/functions/FuncConcat.java
Index: FuncConcat.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncConcat.java,v
retrieving revision 1.5.12.2
retrieving revision 1.5.12.3
diff -u -r1.5.12.2 -r1.5.12.3
--- FuncConcat.java 27 Jan 2003 19:46:13 -0000 1.5.12.2
+++ FuncConcat.java 30 Jan 2003 18:42:02 -0000 1.5.12.3
@@ -56,9 +56,6 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import javax.xml.transform.TransformerException;
import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
1.4.12.2 +1 -6
xml-xalan/java/src/org/apache/xpath/functions/FuncContains.java
Index: FuncContains.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncContains.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncContains.java 27 Jan 2003 19:46:13 -0000 1.4.12.1
+++ FuncContains.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,14 +56,9 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.6.2.2 +1 -11
xml-xalan/java/src/org/apache/xpath/functions/FuncCount.java
Index: FuncCount.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncCount.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- FuncCount.java 27 Jan 2003 19:46:13 -0000 1.6.2.1
+++ FuncCount.java 30 Jan 2003 18:42:02 -0000 1.6.2.2
@@ -56,20 +56,10 @@
*/
package org.apache.xpath.functions;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-//import org.w3c.dom.traversal.NodeIterator;
-import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XString;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.8.10.2 +3 -13
xml-xalan/java/src/org/apache/xpath/functions/FuncCurrent.java
Index: FuncCurrent.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncCurrent.java,v
retrieving revision 1.8.10.1
retrieving revision 1.8.10.2
diff -u -r1.8.10.1 -r1.8.10.2
--- FuncCurrent.java 27 Jan 2003 19:46:13 -0000 1.8.10.1
+++ FuncCurrent.java 30 Jan 2003 18:42:02 -0000 1.8.10.2
@@ -56,23 +56,13 @@
*/
package org.apache.xpath.functions;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-//import org.w3c.dom.traversal.NodeIterator;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.axes.PredicatedNodeTest;
import org.apache.xpath.axes.LocPathIterator;
-import org.apache.xpath.axes.ContextNodeList;
-import org.apache.xpath.axes.SubContextList;
+import org.apache.xpath.axes.PredicatedNodeTest;
+import org.apache.xpath.objects.XNodeSet;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +0 -7
xml-xalan/java/src/org/apache/xpath/functions/FuncDoclocation.java
Index: FuncDoclocation.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncDoclocation.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncDoclocation.java 27 Jan 2003 19:46:14 -0000 1.4.12.1
+++ FuncDoclocation.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,15 +56,8 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-//import org.w3c.dom.traversal.NodeIterator;
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
1.7.12.3 +3 -11
xml-xalan/java/src/org/apache/xpath/functions/FuncExtElementAvailable.java
Index: FuncExtElementAvailable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncExtElementAvailable.java,v
retrieving revision 1.7.12.2
retrieving revision 1.7.12.3
diff -u -r1.7.12.2 -r1.7.12.3
--- FuncExtElementAvailable.java 27 Jan 2003 19:46:14 -0000 1.7.12.2
+++ FuncExtElementAvailable.java 30 Jan 2003 18:42:02 -0000 1.7.12.3
@@ -56,21 +56,13 @@
*/
package org.apache.xpath.functions;
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.QName;
-import org.apache.xalan.extensions.ExtensionsTable;
import org.apache.xalan.templates.Constants;
import org.apache.xalan.transformer.TransformerImpl;
-
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
+import org.apache.xml.utils.QName;
import org.apache.xpath.ExtensionsProvider;
-import org.apache.xpath.objects.XObject;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.14.2.6 +5 -12
xml-xalan/java/src/org/apache/xpath/functions/FuncExtFunction.java
Index: FuncExtFunction.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncExtFunction.java,v
retrieving revision 1.14.2.5
retrieving revision 1.14.2.6
diff -u -r1.14.2.5 -r1.14.2.6
--- FuncExtFunction.java 27 Jan 2003 19:46:14 -0000 1.14.2.5
+++ FuncExtFunction.java 30 Jan 2003 18:42:02 -0000 1.14.2.6
@@ -58,23 +58,16 @@
import java.util.Vector;
+import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.ExpressionNode;
+import org.apache.xpath.ExpressionOwner;
+import org.apache.xpath.ExtensionsProvider;
import org.apache.xpath.XPathContext;
import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.ExtensionsProvider;
-import org.apache.xpath.objects.*;
-import org.apache.xml.dtm.DTMIterator;
-
-//import org.w3c.dom.Node;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.traversal.NodeIterator;
-
-import org.apache.xml.dtm.*;
-import org.apache.xpath.axes.*;
+import org.apache.xpath.objects.XNull;
+import org.apache.xpath.objects.XObject;
import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
/**
* <meta name="usage" content="advanced"/>
1.6.12.3 +2 -11
xml-xalan/java/src/org/apache/xpath/functions/FuncExtFunctionAvailable.java
Index: FuncExtFunctionAvailable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncExtFunctionAvailable.java,v
retrieving revision 1.6.12.2
retrieving revision 1.6.12.3
diff -u -r1.6.12.2 -r1.6.12.3
--- FuncExtFunctionAvailable.java 27 Jan 2003 19:46:14 -0000 1.6.12.2
+++ FuncExtFunctionAvailable.java 30 Jan 2003 18:42:02 -0000 1.6.12.3
@@ -56,21 +56,12 @@
*/
package org.apache.xpath.functions;
-import org.apache.xml.utils.PrefixResolver;
import org.apache.xalan.templates.Constants;
-//import org.apache.xalan.transformer.TransformerImpl;
-//import org.apache.xalan.extensions.ExtensionsTable;
-
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.ExtensionsProvider;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.compiler.Keywords;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +1 -6
xml-xalan/java/src/org/apache/xpath/functions/FuncFalse.java
Index: FuncFalse.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncFalse.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncFalse.java 27 Jan 2003 19:46:14 -0000 1.4.12.1
+++ FuncFalse.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,14 +56,9 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +1 -6
xml-xalan/java/src/org/apache/xpath/functions/FuncFloor.java
Index: FuncFloor.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncFloor.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncFloor.java 27 Jan 2003 19:46:14 -0000 1.4.12.1
+++ FuncFloor.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,14 +56,9 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.6.10.2 +0 -6
xml-xalan/java/src/org/apache/xpath/functions/FuncGenerateId.java
Index: FuncGenerateId.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncGenerateId.java,v
retrieving revision 1.6.10.1
retrieving revision 1.6.10.2
diff -u -r1.6.10.1 -r1.6.10.2
--- FuncGenerateId.java 27 Jan 2003 19:46:14 -0000 1.6.10.1
+++ FuncGenerateId.java 30 Jan 2003 18:42:02 -0000 1.6.10.2
@@ -56,14 +56,8 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-//import org.w3c.dom.traversal.NodeIterator;
import org.apache.xml.dtm.DTM;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
1.9.12.3 +4 -12 xml-xalan/java/src/org/apache/xpath/functions/FuncId.java
Index: FuncId.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncId.java,v
retrieving revision 1.9.12.2
retrieving revision 1.9.12.3
diff -u -r1.9.12.2 -r1.9.12.3
--- FuncId.java 27 Jan 2003 19:46:15 -0000 1.9.12.2
+++ FuncId.java 30 Jan 2003 18:42:02 -0000 1.9.12.3
@@ -56,24 +56,16 @@
*/
package org.apache.xpath.functions;
-import java.util.Hashtable;
import java.util.StringTokenizer;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-//import org.w3c.dom.traversal.NodeIterator;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
+import org.apache.xml.utils.StringVector;
import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.objects.XObject;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XNodeSet;
-import org.apache.xml.utils.StringVector;
+import org.apache.xpath.objects.XObject;
+import org.apache.xpath.res.XPATHErrorResources;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +1 -8
xml-xalan/java/src/org/apache/xpath/functions/FuncLang.java
Index: FuncLang.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncLang.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncLang.java 27 Jan 2003 19:46:15 -0000 1.4.12.1
+++ FuncLang.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,17 +56,10 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-//import org.w3c.dom.Element;
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.10.12.3 +2 -12
xml-xalan/java/src/org/apache/xpath/functions/FuncLast.java
Index: FuncLast.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncLast.java,v
retrieving revision 1.10.12.2
retrieving revision 1.10.12.3
diff -u -r1.10.12.2 -r1.10.12.3
--- FuncLast.java 27 Jan 2003 19:46:15 -0000 1.10.12.2
+++ FuncLast.java 30 Jan 2003 18:42:02 -0000 1.10.12.3
@@ -56,22 +56,12 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-//import org.w3c.dom.Element;
-import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.axes.LocPathIterator;
-import org.apache.xpath.axes.ContextNodeList;
import org.apache.xpath.axes.SubContextList;
import org.apache.xpath.compiler.Compiler;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
1.6.12.2 +0 -9
xml-xalan/java/src/org/apache/xpath/functions/FuncLocalPart.java
Index: FuncLocalPart.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncLocalPart.java,v
retrieving revision 1.6.12.1
retrieving revision 1.6.12.2
diff -u -r1.6.12.1 -r1.6.12.2
--- FuncLocalPart.java 27 Jan 2003 19:46:15 -0000 1.6.12.1
+++ FuncLocalPart.java 30 Jan 2003 18:42:02 -0000 1.6.12.2
@@ -56,17 +56,8 @@
*/
package org.apache.xpath.functions;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-//import org.w3c.dom.traversal.NodeIterator;
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
1.6.12.2 +0 -9
xml-xalan/java/src/org/apache/xpath/functions/FuncNamespace.java
Index: FuncNamespace.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncNamespace.java,v
retrieving revision 1.6.12.1
retrieving revision 1.6.12.2
diff -u -r1.6.12.1 -r1.6.12.2
--- FuncNamespace.java 27 Jan 2003 19:46:15 -0000 1.6.12.1
+++ FuncNamespace.java 30 Jan 2003 18:42:02 -0000 1.6.12.2
@@ -56,17 +56,8 @@
*/
package org.apache.xpath.functions;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-//import org.w3c.dom.traversal.NodeIterator;
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
1.8.10.2 +2 -15
xml-xalan/java/src/org/apache/xpath/functions/FuncNormalizeSpace.java
Index: FuncNormalizeSpace.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncNormalizeSpace.java,v
retrieving revision 1.8.10.1
retrieving revision 1.8.10.2
diff -u -r1.8.10.1 -r1.8.10.2
--- FuncNormalizeSpace.java 27 Jan 2003 19:46:15 -0000 1.8.10.1
+++ FuncNormalizeSpace.java 30 Jan 2003 18:42:02 -0000 1.8.10.2
@@ -56,24 +56,11 @@
*/
package org.apache.xpath.functions;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.utils.XMLString;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XMLStringFactoryImpl;
-import org.apache.xml.utils.XMLCharacterRecognizer;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xml.utils.FastStringBuffer;
-
-import org.apache.xml.dtm.DTM;
import org.xml.sax.ContentHandler;
/**
1.4.12.2 +1 -6
xml-xalan/java/src/org/apache/xpath/functions/FuncNot.java
Index: FuncNot.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncNot.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncNot.java 27 Jan 2003 19:46:15 -0000 1.4.12.1
+++ FuncNot.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,14 +56,9 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +1 -9
xml-xalan/java/src/org/apache/xpath/functions/FuncNumber.java
Index: FuncNumber.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncNumber.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncNumber.java 27 Jan 2003 19:46:15 -0000 1.4.12.1
+++ FuncNumber.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,17 +56,9 @@
*/
package org.apache.xpath.functions;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XNodeSet;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.6.12.3 +2 -10
xml-xalan/java/src/org/apache/xpath/functions/FuncPosition.java
Index: FuncPosition.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncPosition.java,v
retrieving revision 1.6.12.2
retrieving revision 1.6.12.3
diff -u -r1.6.12.2 -r1.6.12.3
--- FuncPosition.java 27 Jan 2003 19:46:15 -0000 1.6.12.2
+++ FuncPosition.java 30 Jan 2003 18:42:02 -0000 1.6.12.3
@@ -56,21 +56,13 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-//import org.w3c.dom.traversal.NodeIterator;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNumber;
import org.apache.xpath.axes.SubContextList;
-import org.apache.xpath.axes.ContextNodeList;
-import org.apache.xpath.NodeSetDTM;
import org.apache.xpath.compiler.Compiler;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.5.12.2 +0 -11
xml-xalan/java/src/org/apache/xpath/functions/FuncQname.java
Index: FuncQname.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncQname.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- FuncQname.java 27 Jan 2003 19:46:15 -0000 1.5.12.1
+++ FuncQname.java 30 Jan 2003 18:42:02 -0000 1.5.12.2
@@ -56,21 +56,10 @@
*/
package org.apache.xpath.functions;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-//import org.w3c.dom.traversal.NodeIterator;
-//import org.w3c.dom.Attr;
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
-import org.apache.xml.utils.QName;
/**
* <meta name="usage" content="advanced"/>
1.5.12.2 +1 -6
xml-xalan/java/src/org/apache/xpath/functions/FuncRound.java
Index: FuncRound.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncRound.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- FuncRound.java 27 Jan 2003 19:46:15 -0000 1.5.12.1
+++ FuncRound.java 30 Jan 2003 18:42:02 -0000 1.5.12.2
@@ -56,14 +56,9 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +1 -6
xml-xalan/java/src/org/apache/xpath/functions/FuncStartsWith.java
Index: FuncStartsWith.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncStartsWith.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncStartsWith.java 27 Jan 2003 19:46:15 -0000 1.4.12.1
+++ FuncStartsWith.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,14 +56,9 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +0 -8
xml-xalan/java/src/org/apache/xpath/functions/FuncString.java
Index: FuncString.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncString.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncString.java 27 Jan 2003 19:46:16 -0000 1.4.12.1
+++ FuncString.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,17 +56,9 @@
*/
package org.apache.xpath.functions;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
-import org.apache.xpath.objects.XNodeSet;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +1 -9
xml-xalan/java/src/org/apache/xpath/functions/FuncStringLength.java
Index: FuncStringLength.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncStringLength.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncStringLength.java 27 Jan 2003 19:46:16 -0000 1.4.12.1
+++ FuncStringLength.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,17 +56,9 @@
*/
package org.apache.xpath.functions;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XNodeSet;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.7.10.3 +2 -7
xml-xalan/java/src/org/apache/xpath/functions/FuncSubstring.java
Index: FuncSubstring.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncSubstring.java,v
retrieving revision 1.7.10.2
retrieving revision 1.7.10.3
diff -u -r1.7.10.2 -r1.7.10.3
--- FuncSubstring.java 27 Jan 2003 19:46:16 -0000 1.7.10.2
+++ FuncSubstring.java 30 Jan 2003 18:42:02 -0000 1.7.10.3
@@ -56,17 +56,12 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.utils.XMLString;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
-import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xml.utils.XMLString;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +1 -7
xml-xalan/java/src/org/apache/xpath/functions/FuncSubstringAfter.java
Index: FuncSubstringAfter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncSubstringAfter.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncSubstringAfter.java 27 Jan 2003 19:46:16 -0000 1.4.12.1
+++ FuncSubstringAfter.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,16 +56,10 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
+import org.apache.xml.utils.XMLString;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
-
-import org.apache.xml.utils.XMLString;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +0 -5
xml-xalan/java/src/org/apache/xpath/functions/FuncSubstringBefore.java
Index: FuncSubstringBefore.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncSubstringBefore.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncSubstringBefore.java 27 Jan 2003 19:46:16 -0000 1.4.12.1
+++ FuncSubstringBefore.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,12 +56,7 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
1.5.12.3 +2 -8
xml-xalan/java/src/org/apache/xpath/functions/FuncSum.java
Index: FuncSum.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncSum.java,v
retrieving revision 1.5.12.2
retrieving revision 1.5.12.3
diff -u -r1.5.12.2 -r1.5.12.3
--- FuncSum.java 27 Jan 2003 19:46:16 -0000 1.5.12.2
+++ FuncSum.java 30 Jan 2003 18:42:02 -0000 1.5.12.3
@@ -58,16 +58,10 @@
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
+import org.apache.xml.utils.XMLString;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNumber;
-import org.apache.xpath.objects.XString;
-
-import org.apache.xml.utils.XMLString;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.11.12.2 +3 -13
xml-xalan/java/src/org/apache/xpath/functions/FuncSystemProperty.java
Index: FuncSystemProperty.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncSystemProperty.java,v
retrieving revision 1.11.12.1
retrieving revision 1.11.12.2
diff -u -r1.11.12.1 -r1.11.12.2
--- FuncSystemProperty.java 27 Jan 2003 19:46:16 -0000 1.11.12.1
+++ FuncSystemProperty.java 30 Jan 2003 18:42:02 -0000 1.11.12.2
@@ -56,25 +56,15 @@
*/
package org.apache.xpath.functions;
-import java.util.Properties;
-
import java.io.BufferedInputStream;
import java.io.InputStream;
-
-import java.lang.ClassLoader;
-
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
+import java.util.Properties;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
+import org.apache.xpath.res.XPATHErrorResources;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +0 -6
xml-xalan/java/src/org/apache/xpath/functions/FuncTranslate.java
Index: FuncTranslate.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncTranslate.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncTranslate.java 27 Jan 2003 19:46:16 -0000 1.4.12.1
+++ FuncTranslate.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,14 +56,8 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
-import org.apache.xpath.res.XPATHErrorResources;
import org.apache.xpath.objects.XString;
/**
1.4.12.2 +1 -6
xml-xalan/java/src/org/apache/xpath/functions/FuncTrue.java
Index: FuncTrue.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncTrue.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncTrue.java 27 Jan 2003 19:46:16 -0000 1.4.12.1
+++ FuncTrue.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,14 +56,9 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* <meta name="usage" content="advanced"/>
1.4.12.2 +0 -9
xml-xalan/java/src/org/apache/xpath/functions/FuncUnparsedEntityURI.java
Index: FuncUnparsedEntityURI.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncUnparsedEntityURI.java,v
retrieving revision 1.4.12.1
retrieving revision 1.4.12.2
diff -u -r1.4.12.1 -r1.4.12.2
--- FuncUnparsedEntityURI.java 27 Jan 2003 19:46:16 -0000 1.4.12.1
+++ FuncUnparsedEntityURI.java 30 Jan 2003 18:42:02 -0000 1.4.12.2
@@ -56,17 +56,8 @@
*/
package org.apache.xpath.functions;
-import org.apache.xpath.res.XPATHErrorResources;
-
-//import org.w3c.dom.Node;
-//import org.w3c.dom.Element;
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-
-import java.util.Vector;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.XPath;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
1.6.2.3 +0 -3
xml-xalan/java/src/org/apache/xpath/functions/Function.java
Index: Function.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Function.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- Function.java 27 Jan 2003 19:46:16 -0000 1.6.2.2
+++ Function.java 30 Jan 2003 18:42:02 -0000 1.6.2.3
@@ -56,9 +56,6 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
-import javax.xml.transform.TransformerException;
import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
1.7.2.3 +0 -2
xml-xalan/java/src/org/apache/xpath/functions/Function2Args.java
Index: Function2Args.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Function2Args.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- Function2Args.java 27 Jan 2003 19:46:17 -0000 1.7.2.2
+++ Function2Args.java 30 Jan 2003 18:42:02 -0000 1.7.2.3
@@ -56,8 +56,6 @@
*/
package org.apache.xpath.functions;
-import java.util.Vector;
-
import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
1.8.2.3 +0 -2
xml-xalan/java/src/org/apache/xpath/functions/Function3Args.java
Index: Function3Args.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Function3Args.java,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- Function3Args.java 27 Jan 2003 19:46:17 -0000 1.8.2.2
+++ Function3Args.java 30 Jan 2003 18:42:02 -0000 1.8.2.3
@@ -56,8 +56,6 @@
*/
package org.apache.xpath.functions;
-import java.util.Vector;
-
import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
1.7.10.3 +3 -9
xml-xalan/java/src/org/apache/xpath/functions/FunctionDef1Arg.java
Index: FunctionDef1Arg.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FunctionDef1Arg.java,v
retrieving revision 1.7.10.2
retrieving revision 1.7.10.3
diff -u -r1.7.10.2 -r1.7.10.3
--- FunctionDef1Arg.java 27 Jan 2003 19:46:17 -0000 1.7.10.2
+++ FunctionDef1Arg.java 30 Jan 2003 18:42:02 -0000 1.7.10.3
@@ -56,18 +56,12 @@
*/
package org.apache.xpath.functions;
-//import org.w3c.dom.Node;
-
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.utils.XMLString;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XNumber;
import org.apache.xpath.objects.XString;
-import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.res.XPATHErrorResources;
-
-import org.apache.xml.utils.XMLString;
-
-import org.apache.xml.dtm.DTM;
/**
* <meta name="usage" content="advanced"/>
1.8.2.4 +1 -4
xml-xalan/java/src/org/apache/xpath/functions/FunctionMultiArgs.java
Index: FunctionMultiArgs.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FunctionMultiArgs.java,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- FunctionMultiArgs.java 27 Jan 2003 19:46:17 -0000 1.8.2.3
+++ FunctionMultiArgs.java 30 Jan 2003 18:42:02 -0000 1.8.2.4
@@ -56,14 +56,11 @@
*/
package org.apache.xpath.functions;
-import java.util.Vector;
-
+import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.functions.Function3Args.Arg2Owner;
import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
/**
* <meta name="usage" content="advanced"/>
1.7.2.3 +0 -2
xml-xalan/java/src/org/apache/xpath/functions/FunctionOneArg.java
Index: FunctionOneArg.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FunctionOneArg.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- FunctionOneArg.java 27 Jan 2003 19:46:17 -0000 1.7.2.2
+++ FunctionOneArg.java 30 Jan 2003 18:42:02 -0000 1.7.2.3
@@ -56,8 +56,6 @@
*/
package org.apache.xpath.functions;
-import java.util.Vector;
-
import org.apache.xalan.res.XSLMessages;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
No revision
No revision
1.11.2.3 +0 -2 xml-xalan/java/src/org/apache/xpath/objects/XBoolean.java
Index: XBoolean.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XBoolean.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- XBoolean.java 27 Jan 2003 19:46:21 -0000 1.11.2.2
+++ XBoolean.java 30 Jan 2003 18:42:05 -0000 1.11.2.3
@@ -56,8 +56,6 @@
*/
package org.apache.xpath.objects;
-import org.w3c.dom.*;
-
/**
* <meta name="usage" content="advanced"/>
* This class represents an XPath boolean object, and is capable of
1.6.12.2 +0 -5
xml-xalan/java/src/org/apache/xpath/objects/XBooleanStatic.java
Index: XBooleanStatic.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XBooleanStatic.java,v
retrieving revision 1.6.12.1
retrieving revision 1.6.12.2
diff -u -r1.6.12.1 -r1.6.12.2
--- XBooleanStatic.java 27 Jan 2003 19:46:21 -0000 1.6.12.1
+++ XBooleanStatic.java 30 Jan 2003 18:42:05 -0000 1.6.12.2
@@ -56,11 +56,6 @@
*/
package org.apache.xpath.objects;
-import org.w3c.dom.*;
-
-import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
-
/**
* <meta name="usage" content="internal"/>
* This class doesn't have any XPathContext, so override
1.2.12.2 +1 -1
xml-xalan/java/src/org/apache/xpath/objects/XMLStringFactoryImpl.java
Index: XMLStringFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XMLStringFactoryImpl.java,v
retrieving revision 1.2.12.1
retrieving revision 1.2.12.2
diff -u -r1.2.12.1 -r1.2.12.2
--- XMLStringFactoryImpl.java 27 Jan 2003 19:46:21 -0000 1.2.12.1
+++ XMLStringFactoryImpl.java 30 Jan 2003 18:42:05 -0000 1.2.12.2
@@ -56,9 +56,9 @@
*/
package org.apache.xpath.objects;
+import org.apache.xml.utils.FastStringBuffer;
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xml.utils.FastStringBuffer;
/**
* <meta name="usage" content="internal"/>
1.21.2.5 +4 -11 xml-xalan/java/src/org/apache/xpath/objects/XNodeSet.java
Index: XNodeSet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XNodeSet.java,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -u -r1.21.2.4 -r1.21.2.5
--- XNodeSet.java 27 Jan 2003 19:46:21 -0000 1.21.2.4
+++ XNodeSet.java 30 Jan 2003 18:42:05 -0000 1.21.2.5
@@ -56,22 +56,15 @@
*/
package org.apache.xpath.objects;
-//import org.w3c.dom.Node;
-//import org.w3c.dom.Text;
-//import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.traversal.NodeIterator;
-import org.w3c.dom.NodeList;
-
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.DTMManager;
-
-import org.apache.xpath.XPathContext;
+import org.apache.xml.utils.XMLString;
import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.axes.ContextNodeList;
import org.apache.xpath.axes.NodeSequence;
-import org.apache.xml.utils.StringVector;
-import org.apache.xml.utils.XMLString;
+
+import org.w3c.dom.NodeList;
+import org.w3c.dom.traversal.NodeIterator;
/**
* <meta name="usage" content="general"/>
1.2.2.3 +4 -4
xml-xalan/java/src/org/apache/xpath/objects/XNodeSetForDOM.java
Index: XNodeSetForDOM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XNodeSetForDOM.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XNodeSetForDOM.java 27 Jan 2003 19:46:21 -0000 1.2.2.2
+++ XNodeSetForDOM.java 30 Jan 2003 18:42:05 -0000 1.2.2.3
@@ -56,13 +56,13 @@
*/
package org.apache.xpath.objects;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xpath.NodeSetDTM;
+import org.apache.xpath.XPathContext;
+
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.traversal.NodeIterator;
-
-import org.apache.xml.dtm.*;
-import org.apache.xpath.NodeSetDTM;
-import org.apache.xpath.XPathContext;
/**
* This class overrides the XNodeSet#object() method to provide the original
1.9.2.2 +0 -6 xml-xalan/java/src/org/apache/xpath/objects/XNull.java
Index: XNull.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XNull.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- XNull.java 27 Jan 2003 19:46:21 -0000 1.9.2.1
+++ XNull.java 30 Jan 2003 18:42:05 -0000 1.9.2.2
@@ -56,14 +56,8 @@
*/
package org.apache.xpath.objects;
-//import org.w3c.dom.traversal.NodeIterator;
-//import org.w3c.dom.DocumentFragment;
-
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
-
import org.apache.xpath.XPathContext;
-import org.apache.xpath.NodeSetDTM;
/**
* <meta name="usage" content="general"/>
1.13.2.4 +0 -1 xml-xalan/java/src/org/apache/xpath/objects/XNumber.java
Index: XNumber.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XNumber.java,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -r1.13.2.3 -r1.13.2.4
--- XNumber.java 27 Jan 2003 19:46:21 -0000 1.13.2.3
+++ XNumber.java 30 Jan 2003 18:42:05 -0000 1.13.2.4
@@ -56,7 +56,6 @@
*/
package org.apache.xpath.objects;
-import javax.xml.transform.TransformerException;
import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.XPathContext;
import org.apache.xpath.XPathVisitor;
1.20.2.3 +11 -12 xml-xalan/java/src/org/apache/xpath/objects/XObject.java
Index: XObject.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XObject.java,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- XObject.java 27 Jan 2003 19:46:21 -0000 1.20.2.2
+++ XObject.java 30 Jan 2003 18:42:05 -0000 1.20.2.3
@@ -56,24 +56,23 @@
*/
package org.apache.xpath.objects;
-import org.w3c.dom.DocumentFragment;
-//import org.w3c.dom.Text;
-//import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.traversal.NodeIterator;
-import org.apache.xml.dtm.*;
-
import java.io.Serializable;
-import org.apache.xpath.res.XPATHErrorResources;
+import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.utils.XMLString;
+import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
-import org.apache.xpath.XPathContext;
import org.apache.xpath.NodeSetDTM;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.XPathException;
import org.apache.xpath.XPathVisitor;
-import org.apache.xalan.res.XSLMessages;
-import org.apache.xpath.Expression;
-import org.apache.xml.utils.XMLString;
+import org.apache.xpath.res.XPATHErrorResources;
+
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.traversal.NodeIterator;
/**
* <meta name="usage" content="general"/>
1.2.10.2 +4 -2
xml-xalan/java/src/org/apache/xpath/objects/XObjectFactory.java
Index: XObjectFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XObjectFactory.java,v
retrieving revision 1.2.10.1
retrieving revision 1.2.10.2
diff -u -r1.2.10.1 -r1.2.10.2
--- XObjectFactory.java 27 Jan 2003 19:46:21 -0000 1.2.10.1
+++ XObjectFactory.java 30 Jan 2003 18:42:05 -0000 1.2.10.2
@@ -56,9 +56,11 @@
*/
package org.apache.xpath.objects;
-import org.apache.xml.dtm.*;
+import org.apache.xml.dtm.Axis;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMAxisIterator;
+import org.apache.xml.dtm.DTMIterator;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.NodeSetDTM;
import org.apache.xpath.axes.OneStepIterator;
1.22.2.5 +2 -5
xml-xalan/java/src/org/apache/xpath/objects/XRTreeFrag.java
Index: XRTreeFrag.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XRTreeFrag.java,v
retrieving revision 1.22.2.4
retrieving revision 1.22.2.5
diff -u -r1.22.2.4 -r1.22.2.5
--- XRTreeFrag.java 27 Jan 2003 19:46:21 -0000 1.22.2.4
+++ XRTreeFrag.java 30 Jan 2003 18:42:06 -0000 1.22.2.5
@@ -56,18 +56,15 @@
*/
package org.apache.xpath.objects;
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.utils.FastStringBuffer;
import org.apache.xml.utils.XMLString;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionNode;
import org.apache.xpath.XPathContext;
-import org.w3c.dom.NodeList;
-
-import org.apache.xml.dtm.Axis;
import org.apache.xpath.axes.RTFIterator;
+
+import org.w3c.dom.NodeList;
/**
* <meta name="usage" content="general"/>
1.5.2.5 +2 -6
xml-xalan/java/src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
Index: XRTreeFragSelectWrapper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -r1.5.2.4 -r1.5.2.5
--- XRTreeFragSelectWrapper.java 27 Jan 2003 19:46:21 -0000 1.5.2.4
+++ XRTreeFragSelectWrapper.java 30 Jan 2003 18:42:06 -0000 1.5.2.5
@@ -56,15 +56,11 @@
*/
package org.apache.xpath.objects;
-import org.apache.xml.dtm.DTM;
+import org.apache.xalan.res.XSLMessages;
import org.apache.xml.dtm.DTMIterator;
-import org.apache.xml.dtm.DTMFilter;
-
import org.apache.xml.utils.XMLString;
-
-import org.apache.xpath.XPathContext;
import org.apache.xpath.Expression;
-import org.apache.xalan.res.XSLMessages;
+import org.apache.xpath.XPathContext;
import org.apache.xpath.res.XPATHErrorResources;
/**
1.10.2.2 +0 -4 xml-xalan/java/src/org/apache/xpath/objects/XString.java
Index: XString.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XString.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- XString.java 27 Jan 2003 19:46:21 -0000 1.10.2.1
+++ XString.java 30 Jan 2003 18:42:06 -0000 1.10.2.2
@@ -56,7 +56,6 @@
*/
package org.apache.xpath.objects;
-//import org.w3c.dom.*;
import java.util.Locale;
import org.apache.xml.dtm.DTM;
@@ -66,9 +65,6 @@
import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.XPathContext;
import org.apache.xpath.XPathVisitor;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
/**
* <meta name="usage" content="general"/>
1.5.10.2 +1 -7
xml-xalan/java/src/org/apache/xpath/objects/XStringForChars.java
Index: XStringForChars.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XStringForChars.java,v
retrieving revision 1.5.10.1
retrieving revision 1.5.10.2
diff -u -r1.5.10.1 -r1.5.10.2
--- XStringForChars.java 27 Jan 2003 19:46:21 -0000 1.5.10.1
+++ XStringForChars.java 30 Jan 2003 18:42:06 -0000 1.5.10.2
@@ -56,15 +56,9 @@
*/
package org.apache.xpath.objects;
-import org.apache.xml.utils.FastStringBuffer;
-import org.apache.xml.utils.XMLString;
-import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xml.utils.XMLCharacterRecognizer;
-
import org.apache.xalan.res.XSLMessages;
+import org.apache.xml.utils.FastStringBuffer;
import org.apache.xpath.res.XPATHErrorResources;
-
-import java.util.Locale;
/**
1.15.2.4 +2 -5
xml-xalan/java/src/org/apache/xpath/objects/XStringForFSB.java
Index: XStringForFSB.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XStringForFSB.java,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -u -r1.15.2.3 -r1.15.2.4
--- XStringForFSB.java 27 Jan 2003 19:46:21 -0000 1.15.2.3
+++ XStringForFSB.java 30 Jan 2003 18:42:06 -0000 1.15.2.4
@@ -56,15 +56,12 @@
*/
package org.apache.xpath.objects;
+import org.apache.xalan.res.XSLMessages;
import org.apache.xml.utils.FastStringBuffer;
+import org.apache.xml.utils.XMLCharacterRecognizer;
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xml.utils.XMLCharacterRecognizer;
-
import org.apache.xpath.res.XPATHErrorResources;
-import org.apache.xalan.res.XSLMessages;
-
-import java.util.Locale;
/**
* This class will wrap a FastStringBuffer and allow for
No revision
No revision
1.6.12.2 +1 -5 xml-xalan/java/src/org/apache/xpath/operations/And.java
Index: And.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/And.java,v
retrieving revision 1.6.12.1
retrieving revision 1.6.12.2
diff -u -r1.6.12.1 -r1.6.12.2
--- And.java 27 Jan 2003 19:46:22 -0000 1.6.12.1
+++ And.java 30 Jan 2003 18:42:07 -0000 1.6.12.2
@@ -56,13 +56,9 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPath;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
-
-import org.w3c.dom.Node;
+import org.apache.xpath.objects.XObject;
/**
* The 'and' operation expression executer.
1.6.2.2 +2 -4 xml-xalan/java/src/org/apache/xpath/operations/Bool.java
Index: Bool.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Bool.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- Bool.java 27 Jan 2003 19:46:22 -0000 1.6.2.1
+++ Bool.java 30 Jan 2003 18:42:07 -0000 1.6.2.2
@@ -56,11 +56,9 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XBoolean;
import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* The 'boolean()' operation expression executer.
1.5.12.2 +2 -2 xml-xalan/java/src/org/apache/xpath/operations/Div.java
Index: Div.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Div.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- Div.java 27 Jan 2003 19:46:22 -0000 1.5.12.1
+++ Div.java 30 Jan 2003 18:42:07 -0000 1.5.12.2
@@ -56,9 +56,9 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNumber;
import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* The 'div' operation expression executer.
1.6.2.2 +0 -1
xml-xalan/java/src/org/apache/xpath/operations/Equals.java
Index: Equals.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Equals.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- Equals.java 27 Jan 2003 19:46:22 -0000 1.6.2.1
+++ Equals.java 30 Jan 2003 18:42:07 -0000 1.6.2.2
@@ -56,7 +56,6 @@
*/
package org.apache.xpath.operations;
-import javax.xml.transform.TransformerException;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XBoolean;
import org.apache.xpath.objects.XObject;
1.4.16.2 +1 -1 xml-xalan/java/src/org/apache/xpath/operations/Gt.java
Index: Gt.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Gt.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- Gt.java 27 Jan 2003 19:46:22 -0000 1.4.16.1
+++ Gt.java 30 Jan 2003 18:42:07 -0000 1.4.16.2
@@ -56,8 +56,8 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* The '>' operation expression executer.
1.4.16.2 +1 -1 xml-xalan/java/src/org/apache/xpath/operations/Gte.java
Index: Gte.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Gte.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- Gte.java 27 Jan 2003 19:46:22 -0000 1.4.16.1
+++ Gte.java 30 Jan 2003 18:42:07 -0000 1.4.16.2
@@ -56,8 +56,8 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* The '>=' operation expression executer.
1.4.16.2 +1 -1 xml-xalan/java/src/org/apache/xpath/operations/Lt.java
Index: Lt.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Lt.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- Lt.java 27 Jan 2003 19:46:22 -0000 1.4.16.1
+++ Lt.java 30 Jan 2003 18:42:07 -0000 1.4.16.2
@@ -56,8 +56,8 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* The '<' operation expression executer.
1.4.16.2 +1 -1 xml-xalan/java/src/org/apache/xpath/operations/Lte.java
Index: Lte.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Lte.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- Lte.java 27 Jan 2003 19:46:22 -0000 1.4.16.1
+++ Lte.java 30 Jan 2003 18:42:07 -0000 1.4.16.2
@@ -56,8 +56,8 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* The '<=' operation expression executer.
1.5.12.2 +2 -2 xml-xalan/java/src/org/apache/xpath/operations/Minus.java
Index: Minus.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Minus.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- Minus.java 27 Jan 2003 19:46:22 -0000 1.5.12.1
+++ Minus.java 30 Jan 2003 18:42:07 -0000 1.5.12.2
@@ -56,9 +56,9 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNumber;
import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* The binary '-' operation expression executer.
1.5.12.2 +2 -2 xml-xalan/java/src/org/apache/xpath/operations/Mod.java
Index: Mod.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Mod.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- Mod.java 27 Jan 2003 19:46:22 -0000 1.5.12.1
+++ Mod.java 30 Jan 2003 18:42:07 -0000 1.5.12.2
@@ -56,9 +56,9 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNumber;
import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* The 'mod' operation expression executer.
1.5.12.2 +2 -2 xml-xalan/java/src/org/apache/xpath/operations/Mult.java
Index: Mult.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Mult.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- Mult.java 27 Jan 2003 19:46:22 -0000 1.5.12.1
+++ Mult.java 30 Jan 2003 18:42:07 -0000 1.5.12.2
@@ -56,9 +56,9 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNumber;
import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* The '*' operation expression executer.
1.5.12.2 +2 -2 xml-xalan/java/src/org/apache/xpath/operations/Neg.java
Index: Neg.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Neg.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- Neg.java 27 Jan 2003 19:46:22 -0000 1.5.12.1
+++ Neg.java 30 Jan 2003 18:42:07 -0000 1.5.12.2
@@ -56,9 +56,9 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNumber;
import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* The unary '-' operation expression executer.
1.4.16.2 +1 -1
xml-xalan/java/src/org/apache/xpath/operations/NotEquals.java
Index: NotEquals.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/operations/NotEquals.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- NotEquals.java 27 Jan 2003 19:46:22 -0000 1.4.16.1
+++ NotEquals.java 30 Jan 2003 18:42:07 -0000 1.4.16.2
@@ -56,8 +56,8 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
+import org.apache.xpath.objects.XObject;
/**
* The '!=' operation expression executer.
1.5.12.2 +2 -2
xml-xalan/java/src/org/apache/xpath/operations/Number.java
Index: Number.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Number.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- Number.java 27 Jan 2003 19:46:22 -0000 1.5.12.1
+++ Number.java 30 Jan 2003 18:42:07 -0000 1.5.12.2
@@ -56,9 +56,9 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNumber;
import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* The 'number()' operation expression executer.
1.9.2.2 +0 -3
xml-xalan/java/src/org/apache/xpath/operations/Operation.java
Index: Operation.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Operation.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- Operation.java 27 Jan 2003 19:46:22 -0000 1.9.2.1
+++ Operation.java 30 Jan 2003 18:42:07 -0000 1.9.2.2
@@ -56,9 +56,6 @@
*/
package org.apache.xpath.operations;
-import java.util.Vector;
-
-import javax.xml.transform.TransformerException;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.XPathContext;
1.6.12.2 +1 -5 xml-xalan/java/src/org/apache/xpath/operations/Or.java
Index: Or.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Or.java,v
retrieving revision 1.6.12.1
retrieving revision 1.6.12.2
diff -u -r1.6.12.1 -r1.6.12.2
--- Or.java 27 Jan 2003 19:46:22 -0000 1.6.12.1
+++ Or.java 30 Jan 2003 18:42:07 -0000 1.6.12.2
@@ -56,13 +56,9 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.Expression;
-import org.apache.xpath.XPath;
import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XBoolean;
-
-import org.w3c.dom.Node;
+import org.apache.xpath.objects.XObject;
/**
* The 'or' operation expression executer.
1.5.12.2 +2 -2 xml-xalan/java/src/org/apache/xpath/operations/Plus.java
Index: Plus.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Plus.java,v
retrieving revision 1.5.12.1
retrieving revision 1.5.12.2
diff -u -r1.5.12.1 -r1.5.12.2
--- Plus.java 27 Jan 2003 19:46:22 -0000 1.5.12.1
+++ Plus.java 30 Jan 2003 18:42:07 -0000 1.5.12.2
@@ -56,9 +56,9 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
-import org.apache.xpath.objects.XNumber;
import org.apache.xpath.XPathContext;
+import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* The '+' operation expression executer.
1.4.16.2 +1 -1 xml-xalan/java/src/org/apache/xpath/operations/Quo.java
Index: Quo.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Quo.java,v
retrieving revision 1.4.16.1
retrieving revision 1.4.16.2
diff -u -r1.4.16.1 -r1.4.16.2
--- Quo.java 27 Jan 2003 19:46:22 -0000 1.4.16.1
+++ Quo.java 30 Jan 2003 18:42:07 -0000 1.4.16.2
@@ -56,8 +56,8 @@
*/
package org.apache.xpath.operations;
-import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XNumber;
+import org.apache.xpath.objects.XObject;
/**
* The 'quo' operation expression executer. (no longer supported by XPath).
1.9.2.2 +1 -4
xml-xalan/java/src/org/apache/xpath/operations/UnaryOperation.java
Index: UnaryOperation.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/operations/UnaryOperation.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- UnaryOperation.java 27 Jan 2003 19:46:22 -0000 1.9.2.1
+++ UnaryOperation.java 30 Jan 2003 18:42:07 -0000 1.9.2.2
@@ -56,13 +56,10 @@
*/
package org.apache.xpath.operations;
-import java.util.Vector;
-
-import javax.xml.transform.TransformerException;
import org.apache.xpath.Expression;
+import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.XPathContext;
import org.apache.xpath.XPathVisitor;
-import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.objects.XObject;
/**
1.18.2.2 +1 -9
xml-xalan/java/src/org/apache/xpath/operations/Variable.java
Index: Variable.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/operations/Variable.java,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -r1.18.2.1 -r1.18.2.2
--- Variable.java 27 Jan 2003 19:46:22 -0000 1.18.2.1
+++ Variable.java 30 Jan 2003 18:42:07 -0000 1.18.2.2
@@ -56,17 +56,11 @@
*/
package org.apache.xpath.operations;
-import java.util.Vector;
-
import javax.xml.transform.TransformerException;
+
import org.apache.xalan.res.XSLMessages;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemVariable;
-import org.apache.xalan.templates.Stylesheet;
-import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.QName;
import org.apache.xpath.Expression;
-import org.apache.xpath.ExpressionNode;
import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.XPath;
import org.apache.xpath.XPathContext;
@@ -76,8 +70,6 @@
import org.apache.xpath.objects.XNodeSet;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.res.XPATHErrorResources;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
/**
1.2.2.2 +0 -3
xml-xalan/java/src/org/apache/xpath/operations/VariableSafeAbsRef.java
Index: VariableSafeAbsRef.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/operations/VariableSafeAbsRef.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- VariableSafeAbsRef.java 27 Jan 2003 19:46:22 -0000 1.2.2.1
+++ VariableSafeAbsRef.java 30 Jan 2003 18:42:07 -0000 1.2.2.2
@@ -56,9 +56,6 @@
*/
package org.apache.xpath.operations;
-import javax.xml.transform.TransformerException;
-import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.DTMManager;
import org.apache.xpath.Expression;
import org.apache.xpath.XPathContext;
No revision
No revision
1.3.10.2 +5 -7
xml-xalan/java/src/org/apache/xpath/patterns/ContextMatchStepPattern.java
Index: ContextMatchStepPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/ContextMatchStepPattern.java,v
retrieving revision 1.3.10.1
retrieving revision 1.3.10.2
diff -u -r1.3.10.1 -r1.3.10.2
--- ContextMatchStepPattern.java 27 Jan 2003 19:46:23 -0000 1.3.10.1
+++ ContextMatchStepPattern.java 30 Jan 2003 18:42:08 -0000 1.3.10.2
@@ -56,15 +56,13 @@
*/
package org.apache.xpath.patterns;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.objects.XObject;
-
+import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
-import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTMAxisTraverser;
-import org.apache.xml.dtm.Axis;
-import org.apache.xpath.axes.WalkerFactory; // evil import.
-
+import org.apache.xml.dtm.DTMFilter;
+import org.apache.xpath.XPathContext;
+import org.apache.xpath.axes.WalkerFactory;
+import org.apache.xpath.objects.XObject;
/**
* Special context node pattern matcher.
*/
1.9.2.2 +0 -4
xml-xalan/java/src/org/apache/xpath/patterns/FunctionPattern.java
Index: FunctionPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/FunctionPattern.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- FunctionPattern.java 27 Jan 2003 19:46:23 -0000 1.9.2.1
+++ FunctionPattern.java 30 Jan 2003 18:42:08 -0000 1.9.2.2
@@ -56,9 +56,6 @@
*/
package org.apache.xpath.patterns;
-import java.util.Vector;
-
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xpath.Expression;
@@ -67,7 +64,6 @@
import org.apache.xpath.XPathVisitor;
import org.apache.xpath.objects.XNumber;
import org.apache.xpath.objects.XObject;
-import org.apache.xpath.patterns.StepPattern.PredOwner;
/**
* <meta name="usage" content="advanced"/>
1.23.2.2 +0 -4
xml-xalan/java/src/org/apache/xpath/patterns/NodeTest.java
Index: NodeTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/NodeTest.java,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -r1.23.2.1 -r1.23.2.2
--- NodeTest.java 27 Jan 2003 19:46:23 -0000 1.23.2.1
+++ NodeTest.java 30 Jan 2003 18:42:08 -0000 1.23.2.2
@@ -56,12 +56,8 @@
*/
package org.apache.xpath.patterns;
-import java.util.Vector;
-
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMFilter;
-import org.apache.xml.dtm.ref.ExpandedNameTable;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.XPath;
1.24.2.2 +0 -3
xml-xalan/java/src/org/apache/xpath/patterns/StepPattern.java
Index: StepPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/StepPattern.java,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- StepPattern.java 27 Jan 2003 19:46:23 -0000 1.24.2.1
+++ StepPattern.java 30 Jan 2003 18:42:08 -0000 1.24.2.2
@@ -56,9 +56,6 @@
*/
package org.apache.xpath.patterns;
-import java.util.Vector;
-
-import javax.xml.transform.TransformerException;
import org.apache.xml.dtm.Axis;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMAxisTraverser;
1.9.2.2 +0 -3
xml-xalan/java/src/org/apache/xpath/patterns/UnionPattern.java
Index: UnionPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/UnionPattern.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- UnionPattern.java 27 Jan 2003 19:46:23 -0000 1.9.2.1
+++ UnionPattern.java 30 Jan 2003 18:42:08 -0000 1.9.2.2
@@ -56,9 +56,6 @@
*/
package org.apache.xpath.patterns;
-import java.util.Vector;
-
-import javax.xml.transform.TransformerException;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
import org.apache.xpath.XPathContext;
No revision
No revision
1.10.8.7 +4 -5
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources.java
Index: XPATHErrorResources.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources.java,v
retrieving revision 1.10.8.6
retrieving revision 1.10.8.7
diff -u -r1.10.8.6 -r1.10.8.7
--- XPATHErrorResources.java 27 Jan 2003 19:46:24 -0000 1.10.8.6
+++ XPATHErrorResources.java 30 Jan 2003 18:42:09 -0000 1.10.8.7
@@ -56,11 +56,10 @@
*/
package org.apache.xpath.res;
-
-
-import java.util.*;
-
-import java.text.DecimalFormat;
+import java.util.ListResourceBundle;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
/**
* <meta name="usage" content="advanced"/>
1.2.2.3 +0 -7
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_de.java
Index: XPATHErrorResources_de.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_de.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XPATHErrorResources_de.java 27 Jan 2003 19:46:24 -0000 1.2.2.2
+++ XPATHErrorResources_de.java 30 Jan 2003 18:42:09 -0000 1.2.2.3
@@ -56,13 +56,6 @@
*/
package org.apache.xpath.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-
-import java.util.*;
-
-import java.text.DecimalFormat;
-
/**
* <meta name="usage" content="advanced"/>
* Set up error messages.
1.2.2.3 +0 -7
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_es.java
Index: XPATHErrorResources_es.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_es.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XPATHErrorResources_es.java 27 Jan 2003 19:46:24 -0000 1.2.2.2
+++ XPATHErrorResources_es.java 30 Jan 2003 18:42:09 -0000 1.2.2.3
@@ -58,13 +58,6 @@
*/
package org.apache.xpath.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-
-import java.util.*;
-
-import java.text.DecimalFormat;
-
/**
* <meta name="usage" content="advanced"/>
* Set up error messages.
1.2.2.3 +0 -8
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_fr.java
Index: XPATHErrorResources_fr.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_fr.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XPATHErrorResources_fr.java 27 Jan 2003 19:46:24 -0000 1.2.2.2
+++ XPATHErrorResources_fr.java 30 Jan 2003 18:42:09 -0000 1.2.2.3
@@ -56,14 +56,6 @@
*/
package org.apache.xpath.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-
-import java.util.*;
-
-import java.text.DecimalFormat;
-
-
/**
* <meta name="usage" content="advanced"/>
* Set up error messages.
1.2.2.3 +1 -6
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_it.java
Index: XPATHErrorResources_it.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_it.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XPATHErrorResources_it.java 27 Jan 2003 19:46:24 -0000 1.2.2.2
+++ XPATHErrorResources_it.java 30 Jan 2003 18:42:09 -0000 1.2.2.3
@@ -57,12 +57,7 @@
*/
package org.apache.xpath.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-
-import java.util.*;
-
-import java.text.DecimalFormat;
+import java.util.Locale;
/**
1.2.2.3 +0 -8
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_ja.java
Index: XPATHErrorResources_ja.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_ja.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XPATHErrorResources_ja.java 27 Jan 2003 19:46:24 -0000 1.2.2.2
+++ XPATHErrorResources_ja.java 30 Jan 2003 18:42:09 -0000 1.2.2.3
@@ -56,14 +56,6 @@
*/
package org.apache.xpath.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-
-import java.util.*;
-
-import java.text.DecimalFormat;
-
-
/**
* <meta name="usage" content="advanced"/>
* Set up error messages.
1.2.2.3 +0 -8
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_ko.java
Index: XPATHErrorResources_ko.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_ko.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XPATHErrorResources_ko.java 27 Jan 2003 19:46:24 -0000 1.2.2.2
+++ XPATHErrorResources_ko.java 30 Jan 2003 18:42:10 -0000 1.2.2.3
@@ -56,14 +56,6 @@
*/
package org.apache.xpath.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-
-import java.util.*;
-
-import java.text.DecimalFormat;
-
-
/**
* <meta name="usage" content="advanced"/>
* Set up error messages.
1.2.2.3 +0 -8
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_sv.java
Index: XPATHErrorResources_sv.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_sv.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XPATHErrorResources_sv.java 27 Jan 2003 19:46:24 -0000 1.2.2.2
+++ XPATHErrorResources_sv.java 30 Jan 2003 18:42:10 -0000 1.2.2.3
@@ -56,14 +56,6 @@
*/
package org.apache.xpath.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-
-import java.util.*;
-
-import java.text.DecimalFormat;
-
-
/**
* <meta name="usage" content="advanced"/>
* Set up error messages.
1.2.2.3 +0 -8
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_zh_CN.java
Index: XPATHErrorResources_zh_CN.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_zh_CN.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XPATHErrorResources_zh_CN.java 27 Jan 2003 19:46:25 -0000 1.2.2.2
+++ XPATHErrorResources_zh_CN.java 30 Jan 2003 18:42:10 -0000 1.2.2.3
@@ -57,14 +57,6 @@
*/
package org.apache.xpath.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-
-import java.util.*;
-
-import java.text.DecimalFormat;
-
-
/**
* <meta name="usage" content="advanced"/>
* Set up error messages.
1.2.2.3 +0 -8
xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_zh_TW.java
Index: XPATHErrorResources_zh_TW.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHErrorResources_zh_TW.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- XPATHErrorResources_zh_TW.java 27 Jan 2003 19:46:25 -0000 1.2.2.2
+++ XPATHErrorResources_zh_TW.java 30 Jan 2003 18:42:10 -0000 1.2.2.3
@@ -56,14 +56,6 @@
*/
package org.apache.xpath.res;
-import org.apache.xml.utils.res.XResourceBundleBase;
-
-
-import java.util.*;
-
-import java.text.DecimalFormat;
-
-
/**
* <meta name="usage" content="advanced"/>
* Set up error messages.
1.1.2.3 +0 -3
xml-xalan/java/src/org/apache/xpath/res/XPATHMessages.java
Index: XPATHMessages.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/res/XPATHMessages.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XPATHMessages.java 27 Jan 2003 19:46:25 -0000 1.1.2.2
+++ XPATHMessages.java 30 Jan 2003 18:42:10 -0000 1.1.2.3
@@ -56,10 +56,7 @@
*/
package org.apache.xpath.res;
-import java.util.Locale;
-import java.util.ResourceBundle;
import java.util.ListResourceBundle;
-import java.util.MissingResourceException;
import org.apache.xml.res.XMLMessages;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
