gianugo 2002/12/12 13:04:02
Modified: java/src/org/apache/xindice/core FaultCodes.java
java/src/org/apache/xindice/core/xupdate XUpdateImpl.java
java/src/org/apache/xindice/server/rpc/messages
GetApiVersion.java SetDocument.java
java/src/org/apache/xindice/xml/sax SAXEventGenerator.java
Log:
Cleaning up imports and the like.
Revision Changes Path
1.9 +3 -5
xml-xindice/java/src/org/apache/xindice/core/FaultCodes.java
Index: FaultCodes.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/FaultCodes.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FaultCodes.java 28 Nov 2002 09:30:47 -0000 1.8
+++ FaultCodes.java 12 Dec 2002 21:04:02 -0000 1.9
@@ -59,13 +59,11 @@
package org.apache.xindice.core;
-import org.apache.xindice.util.XindiceException;
+import java.util.HashMap;
+import java.util.Map;
import org.xmldb.api.base.ErrorCodes;
import org.xmldb.api.base.XMLDBException;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* FaultCodes defines the Xindice specific fault codes and associated error
1.7 +5 -4
xml-xindice/java/src/org/apache/xindice/core/xupdate/XUpdateImpl.java
Index: XUpdateImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/xupdate/XUpdateImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XUpdateImpl.java 22 Nov 2002 10:15:35 -0000 1.6
+++ XUpdateImpl.java 12 Dec 2002 21:04:02 -0000 1.7
@@ -69,6 +69,7 @@
import org.w3c.dom.*;
import org.xml.sax.SAXException;
import org.xmldb.xupdate.lexus.XUpdateQueryImpl;
+import org.xmldb.xupdate.lexus.commands.CommandConstants;
import org.xmldb.xupdate.lexus.commands.CommandObject;
import org.xmldb.xupdate.lexus.commands.DefaultCommand;
@@ -133,10 +134,10 @@
while (commands.hasMoreElements()) {
int id = ((Integer) commands.nextElement()).intValue();
- if ( id == _commands.ATTRIBUTES ) {
+ if ( id == CommandConstants.ATTRIBUTES ) {
currentCommand.submitAttributes((Hashtable)
attributes.nextElement());
}
- else if ( id == _commands.CHARACTERS ) {
+ else if ( id == CommandConstants.CHARACTERS ) {
currentCommand.submitCharacters((String)
characters.nextElement());
}
else if ( id > 0 ) {
@@ -192,7 +193,7 @@
for (int i = 0; i < _query[0].size(); i++) {
int cmdID = ((Integer) _query[0].elementAt(i)).intValue();
- if ( cmdID == _commands.ATTRIBUTES ) {
+ if ( cmdID == CommandConstants.ATTRIBUTES ) {
Hashtable attribs = (Hashtable) _query[1].elementAt(attribIndex);
attribIndex++;
String selector = (String) attribs.get("select");
1.2 +2 -3
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetApiVersion.java
Index: GetApiVersion.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetApiVersion.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetApiVersion.java 5 Nov 2002 06:26:01 -0000 1.1
+++ GetApiVersion.java 12 Dec 2002 21:04:02 -0000 1.2
@@ -61,8 +61,7 @@
import java.util.Hashtable;
-import org.apache.xindice.server.*;
-import org.apache.xindice.server.rpc.*;
+import org.apache.xindice.server.rpc.RPCDefaultMessage;
/**
*
1.2 +5 -7
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetDocument.java
Index: SetDocument.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetDocument.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetDocument.java 5 Nov 2002 06:27:06 -0000 1.1
+++ SetDocument.java 12 Dec 2002 21:04:02 -0000 1.2
@@ -61,12 +61,10 @@
import java.util.Hashtable;
-import org.w3c.dom.*;
-
-import org.apache.xindice.core.*;
-import org.apache.xindice.xml.*;
-import org.apache.xindice.xml.dom.*;
-import org.apache.xindice.server.rpc.*;
+import org.apache.xindice.core.Collection;
+import org.apache.xindice.server.rpc.RPCDefaultMessage;
+import org.apache.xindice.xml.dom.DOMParser;
+import org.w3c.dom.Document;
/**
*
1.15 +1 -4
xml-xindice/java/src/org/apache/xindice/xml/sax/SAXEventGenerator.java
Index: SAXEventGenerator.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/sax/SAXEventGenerator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SAXEventGenerator.java 18 Nov 2002 16:16:50 -0000 1.14
+++ SAXEventGenerator.java 12 Dec 2002 21:04:02 -0000 1.15
@@ -65,7 +65,6 @@
import org.apache.xindice.xml.dom.CompressedDocument;
import org.apache.xindice.xml.dom.DOMCompressor;
import org.apache.xindice.xml.dom.DocumentImpl;
-import org.apache.xindice.xml.dom.NodeImpl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -83,9 +82,7 @@
import org.xml.sax.helpers.AttributesImpl;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
/**
