cvs commit: xml-xindice/java/src/org/apache/xindice/client/xmldb/xmlrpc CollectionImpl.java

[vladimir]

vladimir    2002/12/23 13:28:59

  Modified:    java/src/org/apache/xindice/client/xmldb/xmlrpc
                        CollectionImpl.java
  Log:
  minor refactoring
  
  Revision  Changes    Path
  1.19      +9 -20     
xml-xindice/java/src/org/apache/xindice/client/xmldb/xmlrpc/CollectionImpl.java
  
  Index: CollectionImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/src/org/apache/xindice/client/xmldb/xmlrpc/CollectionImpl.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- CollectionImpl.java       13 Dec 2002 15:58:36 -0000      1.18
  +++ CollectionImpl.java       23 Dec 2002 21:28:59 -0000      1.19
  @@ -71,6 +71,7 @@
   import org.apache.xindice.client.xmldb.resources.XMLResourceImpl;
   import org.apache.xindice.core.FaultCodes;
   import org.apache.xindice.server.rpc.RPCDefaultMessage;
  +import org.apache.xindice.server.rpc.RPCMessageInterface;
   import org.apache.xindice.util.SymbolDeserializer;
   import org.apache.xindice.xml.TextWriter;
   
  @@ -166,7 +167,7 @@
        */
       private Object runRemoteCommand(String cmdName, Hashtable params) throws 
Exception {
           
  -        params.put("message", cmdName);
  +        params.put(RPCMessageInterface.MESSAGE_PARAM, cmdName);
           
           Vector v = new Vector();
           v.add(params);
  @@ -569,23 +570,9 @@
       }
   
      /* see superclass for documentation */
  -    public Collection createCollection(String childName)
  +    public Collection createCollection(String name)
               throws XMLDBException {
  -
  -        checkOpen();
  -        try {
  -            
  -            Hashtable params = new Hashtable();
  -            params.put(RPCDefaultMessage.COLLECTION, collPath);
  -            params.put(RPCDefaultMessage.NAME, childName);
  -            runRemoteCommand("CreateCollection", params);
  -            
  -            return getChildCollection(childName);
  -        } catch (Exception e) {
  -            
  -            throw new XMLDBException(ErrorCodes.INVALID_COLLECTION,
  -                    "Cannot create child collection", e);
  -        }
  +       return createCollection(name, null);
       }
   
      /* see superclass for documentation */
  @@ -595,8 +582,10 @@
              Hashtable params = new Hashtable();
              params.put(RPCDefaultMessage.COLLECTION, collPath);
              params.put(RPCDefaultMessage.NAME, name);
  -           params.put(RPCDefaultMessage.CONFIGURATION,
  -                   TextWriter.toString( configuration ) );
  +           if (configuration != null) {
  +                params.put(RPCDefaultMessage.CONFIGURATION,
  +                         TextWriter.toString( configuration ) );
  +           }
   
              runRemoteCommand("CreateCollection", params);