stefan      2004/07/08 05:38:22

  Modified:    proposals/jcrri/src/org/apache/slide/jcr/core/nodetype
                        NodeTypeDefStore.java
  Log:
  jcrri
  
  Revision  Changes    Path
  1.2       +8 -11     
jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/NodeTypeDefStore.java
  
  Index: NodeTypeDefStore.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/nodetype/NodeTypeDefStore.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NodeTypeDefStore.java     29 Jun 2004 17:11:47 -0000      1.1
  +++ NodeTypeDefStore.java     8 Jul 2004 12:38:22 -0000       1.2
  @@ -25,9 +25,9 @@
   
   import org.apache.log4j.Logger;
   import org.apache.slide.jcr.core.InternalValue;
  +import org.apache.slide.jcr.core.NamespaceRegistryImpl;
   import org.apache.slide.jcr.core.NamespaceResolver;
   import org.apache.slide.jcr.core.QName;
  -import org.apache.slide.jcr.core.NamespaceRegistryImpl;
   import org.jdom.Document;
   import org.jdom.Element;
   import org.jdom.JDOMException;
  @@ -35,9 +35,9 @@
   import org.jdom.input.SAXBuilder;
   import org.jdom.output.XMLOutputter;
   
  +import javax.jcr.NamespaceException;
   import javax.jcr.PropertyType;
   import javax.jcr.RepositoryException;
  -import javax.jcr.NamespaceException;
   import javax.jcr.version.OnParentVersionAction;
   import java.io.IOException;
   import java.io.InputStream;
  @@ -85,7 +85,6 @@
       }
   
       /**
  -     *
        * @param in
        * @throws IOException
        * @throws InvalidNodeTypeDefException
  @@ -112,6 +111,9 @@
            prefixToURI.put(ns.getPrefix(), ns.getURI());
            uriToPrefix.put(ns.getURI(), ns.getPrefix());
        }
  +     // add default namespace (empty uri)
  +     prefixToURI.put(NamespaceRegistryImpl.NS_EMPTY_PREFIX, 
NamespaceRegistryImpl.NS_DEFAULT_URI);
  +     uriToPrefix.put(NamespaceRegistryImpl.NS_DEFAULT_URI, 
NamespaceRegistryImpl.NS_EMPTY_PREFIX);
   
        NamespaceResolver nsResolver = new NamespaceResolver() {
            public String getURI(String prefix) throws NamespaceException {
  @@ -120,6 +122,7 @@
                }
                return (String) prefixToURI.get(prefix);
            }
  +
            public String getPrefix(String uri) throws NamespaceException {
                if (!uriToPrefix.containsKey(uri)) {
                    throw new NamespaceException(uri + ": unknown URI");
  @@ -137,7 +140,6 @@
       }
   
       /**
  -     *
        * @param out
        * @param nsReg
        * @throws IOException
  @@ -172,7 +174,6 @@
       }
   
       /**
  -     *
        * @param ntd
        */
       void add(NodeTypeDef ntd) {
  @@ -180,7 +181,6 @@
       }
   
       /**
  -     *
        * @param name
        * @return
        */
  @@ -196,7 +196,6 @@
       }
   
       /**
  -     *
        * @param name
        * @return
        */
  @@ -205,7 +204,6 @@
       }
   
       /**
  -     *
        * @param name
        * @return
        */
  @@ -214,7 +212,6 @@
       }
   
       /**
  -     *
        * @return
        */
       Collection all() {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to