From commits-return-11498-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Thu Jul 21 13:55:30 2011 Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D5086653 for ; Thu, 21 Jul 2011 13:55:30 +0000 (UTC) Received: (qmail 31455 invoked by uid 500); 21 Jul 2011 13:55:29 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 31405 invoked by uid 500); 21 Jul 2011 13:55:29 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 31392 invoked by uid 99); 21 Jul 2011 13:55:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jul 2011 13:55:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jul 2011 13:55:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 64C0823889E3; Thu, 21 Jul 2011 13:55:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1149178 - /jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java Date: Thu, 21 Jul 2011 13:55:05 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110721135505.64C0823889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Thu Jul 21 13:55:04 2011 New Revision: 1149178 URL: http://svn.apache.org/viewvc?rev=1149178&view=rev Log: JCR-3033: Provide a method for writing name space declarations in CompactNodeTypeDefWriter Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java?rev=1149178&r1=1149177&r2=1149178&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java (original) +++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java Thu Jul 21 13:55:04 2011 @@ -225,6 +225,25 @@ public class CompactNodeTypeDefWriter { } /** + * Write a namespace declaration to this writer. This method has no effect if the + * writer does not include namespaces. + * + * @param prefix namespace prefix + * @throws NamespaceException if no namespace is registered for the given prefix + * @throws IOException if an I/O error occurs + */ + public void writeNamespaceDelclaration(String prefix) throws NamespaceException, IOException { + if (!usedNamespaces.contains(prefix)) { + usedNamespaces.add(prefix); + nsWriter.write("<'"); + nsWriter.write(prefix); + nsWriter.write("'='"); + nsWriter.write(escape(resolver.getURI(prefix))); + nsWriter.write("'>\n"); + } + } + + /** * Flushes all pending write operations and Closes this writer. please note, * that the underlying writer remains open. * @@ -550,14 +569,7 @@ public class CompactNodeTypeDefWriter { if (prefix != null && !prefix.equals(Name.NS_EMPTY_PREFIX)) { // check for writing namespaces if (nsWriter != null) { - if (!usedNamespaces.contains(prefix)) { - usedNamespaces.add(prefix); - nsWriter.write("<'"); - nsWriter.write(prefix); - nsWriter.write("'='"); - nsWriter.write(escape(name.getNamespaceURI())); - nsWriter.write("'>\n"); - } + writeNamespaceDelclaration(prefix); } prefix += ":"; }