vladimir 2003/03/26 23:05:33
Modified: java/src/org/apache/xindice/server/rpc/messages
SetDocumentMeta.java SetCollectionMeta.java
GetDocumentMeta.java
java/src/org/apache/xindice/core MetaSystemCollection.java
java/src/org/apache/xindice/core/query
XPathQueryResolver.java
java/src/org/apache/xindice/core/meta TimeRecord.java
Log:
I'm back :-) Just fixing a few problems Eclipse found
Revision Changes Path
1.2 +5 -7
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetDocumentMeta.java
Index: SetDocumentMeta.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetDocumentMeta.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetDocumentMeta.java 27 Dec 2002 18:37:24 -0000 1.1
+++ SetDocumentMeta.java 27 Mar 2003 07:05:32 -0000 1.2
@@ -60,17 +60,15 @@
*/
+import java.util.Hashtable;
+
import org.apache.xindice.core.Collection;
-import org.apache.xindice.core.Database;
import org.apache.xindice.core.meta.MetaData;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
import org.apache.xindice.xml.TextWriter;
-import org.apache.xindice.xml.dom.DocumentImpl;
import org.apache.xindice.xml.dom.DOMParser;
-
-import org.w3c.dom.*;
-
-import java.util.Hashtable;
+import org.apache.xindice.xml.dom.DocumentImpl;
+import org.w3c.dom.Document;
/**
* XML-RPC message to set the meta data associated with a document
1.2 +5 -7
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetCollectionMeta.java
Index: SetCollectionMeta.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/SetCollectionMeta.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetCollectionMeta.java 27 Dec 2002 18:37:24 -0000 1.1
+++ SetCollectionMeta.java 27 Mar 2003 07:05:32 -0000 1.2
@@ -60,17 +60,15 @@
*/
+import java.util.Hashtable;
+
import org.apache.xindice.core.Collection;
-import org.apache.xindice.core.Database;
import org.apache.xindice.core.meta.MetaData;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
import org.apache.xindice.xml.TextWriter;
-import org.apache.xindice.xml.dom.DocumentImpl;
import org.apache.xindice.xml.dom.DOMParser;
-
-import org.w3c.dom.*;
-
-import java.util.Hashtable;
+import org.apache.xindice.xml.dom.DocumentImpl;
+import org.w3c.dom.Document;
/**
* XML-RPC message to set the meta data associated with a collection
1.2 +4 -6
xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetDocumentMeta.java
Index: GetDocumentMeta.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/GetDocumentMeta.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetDocumentMeta.java 27 Dec 2002 18:37:24 -0000 1.1
+++ GetDocumentMeta.java 27 Mar 2003 07:05:32 -0000 1.2
@@ -59,16 +59,14 @@
* $Id$
*/
+import java.util.Hashtable;
+
import org.apache.xindice.core.Collection;
-import org.apache.xindice.core.Database;
import org.apache.xindice.core.meta.MetaData;
import org.apache.xindice.server.rpc.RPCDefaultMessage;
import org.apache.xindice.xml.TextWriter;
import org.apache.xindice.xml.dom.DocumentImpl;
-
-import org.w3c.dom.*;
-
-import java.util.Hashtable;
+import org.w3c.dom.Document;
/**
* XML-RPC message to fetch the meta data associated with a document
1.2 +6 -14
xml-xindice/java/src/org/apache/xindice/core/MetaSystemCollection.java
Index: MetaSystemCollection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/MetaSystemCollection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MetaSystemCollection.java 27 Dec 2002 18:37:23 -0000 1.1
+++ MetaSystemCollection.java 27 Mar 2003 07:05:32 -0000 1.2
@@ -60,22 +60,14 @@
*/
-import org.apache.xindice.util.Configuration;
-import org.apache.xindice.core.*;
-import org.apache.xindice.core.meta.MetaData;
-import org.apache.xindice.server.*;
-import org.apache.xindice.xml.*;
-import org.apache.xindice.xml.dom.*;
-import org.apache.xindice.tools.*;
-import org.apache.xindice.util.*;
-
-import org.w3c.dom.*;
+import java.util.StringTokenizer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-import java.util.StringTokenizer;
+import org.apache.xindice.core.meta.MetaData;
+import org.apache.xindice.util.Configuration;
+import org.apache.xindice.xml.dom.DOMParser;
+import org.w3c.dom.Document;
1.10 +25 -26
xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResolver.java
Index: XPathQueryResolver.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResolver.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XPathQueryResolver.java 4 Nov 2002 06:39:55 -0000 1.9
+++ XPathQueryResolver.java 27 Mar 2003 07:05:32 -0000 1.10
@@ -59,6 +59,17 @@
* $Id$
*/
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.TransformerException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.xindice.core.Collection;
import org.apache.xindice.core.data.Key;
import org.apache.xindice.core.data.NodeSet;
@@ -84,9 +95,6 @@
import org.apache.xindice.xml.SymbolTable;
import org.apache.xindice.xml.dom.DBDocument;
import org.apache.xindice.xml.dom.DocumentImpl;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.xml.utils.DefaultErrorHandler;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.PrefixResolverDefault;
@@ -95,23 +103,14 @@
import org.apache.xpath.XPathContext;
import org.apache.xpath.compiler.Compiler;
import org.apache.xpath.compiler.OpCodes;
-import org.apache.xpath.compiler.OpMap;
import org.apache.xpath.compiler.XPathParser;
import org.apache.xpath.objects.XBoolean;
import org.apache.xpath.objects.XNumber;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XString;
-
-import org.w3c.dom.*;
-import org.w3c.dom.traversal.*;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.TransformerException;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.traversal.NodeIterator;
/**
* XPathQueryResolver
@@ -337,7 +336,7 @@
case OpCodes.OP_ARGUMENT:
case OpCodes.OP_XPATH:
case OpCodes.OP_PREDICATE:
- return evaluate(owner, cmp.getFirstChildPos(pos));
+ return evaluate(owner, Compiler.getFirstChildPos(pos));
case OpCodes.OP_OR:
case OpCodes.OP_AND:
@@ -372,7 +371,7 @@
break;
case OpCodes.OP_GROUP:
- return evaluate(owner, cmp.getFirstChildPos(pos));
+ return evaluate(owner, Compiler.getFirstChildPos(pos));
case OpCodes.OP_EXTFUNCTION:
break;
@@ -425,7 +424,7 @@
}
private Object evalLocationPath(String owner, int pos) throws
Exception {
- int lp = cmp.getFirstChildPos(pos);
+ int lp = Compiler.getFirstChildPos(pos);
List ks = new ArrayList();
String name = null;
boolean attr = false;
@@ -464,7 +463,7 @@
}
private Object evalSetComparison(int op, String owner, int pos) throws
Exception {
- int l = cmp.getFirstChildPos(pos);
+ int l = Compiler.getFirstChildPos(pos);
int r = cmp.getNextOpPos(l);
Object left = evaluate(owner, l);
Object right = evaluate(owner, r);
@@ -488,7 +487,7 @@
}
private Object evalValComparison(int op, String owner, int pos) throws
Exception {
- int l = cmp.getFirstChildPos(pos);
+ int l = Compiler.getFirstChildPos(pos);
int r = cmp.getNextOpPos(l);
Object left = evaluate(owner, l);
Object right = evaluate(owner, r);
@@ -509,7 +508,7 @@
}
private strictfp Object evalMathOperation(int op, String owner, int
pos) throws Exception {
- int lc = cmp.getFirstChildPos(pos);
+ int lc = Compiler.getFirstChildPos(pos);
int rc = cmp.getNextOpPos(lc);
XObject left = (XObject)evaluate(owner, lc);
XObject right = (XObject)evaluate(owner, rc);
@@ -526,7 +525,7 @@
}
private Object evalUnaryOperation(int op, String owner, int pos)
throws Exception {
- XObject val = (XObject)evaluate(owner, cmp.getFirstChildPos(pos));
+ XObject val = (XObject)evaluate(owner,
Compiler.getFirstChildPos(pos));
switch ( op ) {
case OpCodes.OP_NEG: return new XNumber(-val.num());
case OpCodes.OP_STRING: return new XString(val.str());
@@ -537,7 +536,7 @@
}
private Object evalFunction(String owner, int pos) throws Exception {
- int idx = cmp.getFirstChildPos(pos);
+ int idx = Compiler.getFirstChildPos(pos);
int id = cmp.getOp(idx);
int endFunc = pos + cmp.getOpMap()[pos+1] - 1;
@@ -592,7 +591,7 @@
private Object evalAxis(int op, String owner, int pos) throws
Exception {
String nsURI = cmp.getStepNS(pos);
- owner = (String)evaluate(owner, cmp.getFirstChildPosOfStep(pos));
+ owner = (String)evaluate(owner,
Compiler.getFirstChildPosOfStep(pos));
//owner = cmp.getStepLocalName(pos);
if ( nsURI != null && nsMap != null ) {
@@ -632,7 +631,7 @@
}
private Object evalLiteral(String owner, int pos) throws Exception {
- int idx = cmp.getOp(cmp.getFirstChildPos(pos));
+ int idx = cmp.getOp(Compiler.getFirstChildPos(pos));
switch ( idx ) {
case OpCodes.EMPTY:
return owner;
1.2 +1 -2
xml-xindice/java/src/org/apache/xindice/core/meta/TimeRecord.java
Index: TimeRecord.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/meta/TimeRecord.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimeRecord.java 27 Dec 2002 18:37:24 -0000 1.1
+++ TimeRecord.java 27 Mar 2003 07:05:32 -0000 1.2
@@ -60,7 +60,6 @@
*/
import java.util.Date;
-import java.util.Hashtable;
/**
* Encapsulates the modified/create times used in MetaData.
*
