vgritsenko 2004/02/18 18:44:43
Modified: java/src/org/apache/xindice/server/rpc/messages Query.java Log: Make method static Revision Changes Path 1.10 +7 -7 xml-xindice/java/src/org/apache/xindice/server/rpc/messages/Query.java Index: Query.java =================================================================== RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/server/rpc/messages/Query.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Query.java 8 Feb 2004 02:54:17 -0000 1.9 +++ Query.java 19 Feb 2004 02:44:42 -0000 1.10 @@ -103,7 +103,7 @@ * @param ns The NodeSet containing the query results. * @return the result set as an XML document */ - private String queryWrapper(NodeSet ns) { + private static String queryWrapper(NodeSet ns) { // // FIXME: There is a copy of this same code in org.apache.xindice.client.xmldb.embed.CollectionImpl#nodesetToDocument @@ -121,15 +121,15 @@ if (element instanceof Node) { Node n = (Node) element; - + if (n.getNodeType() == Node.DOCUMENT_NODE) { n = ((Document) n).getDocumentElement(); } - + if (n instanceof DBNode) { ((DBNode) n).expandSource(); } - + root.appendChild(doc.importNode(n, true)); } else if (element instanceof Boolean || element instanceof Double) @@ -146,7 +146,7 @@ } count++; - + } root.setAttribute("count", Integer.toString(count));