Return-Path: Delivered-To: apmail-jakarta-slide-dev-archive@apache.org Received: (qmail 16312 invoked from network); 3 Jun 2003 14:52:38 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 3 Jun 2003 14:52:38 -0000 Received: (qmail 60 invoked by uid 97); 3 Jun 2003 14:54:51 -0000 Delivered-To: qmlist-jakarta-archive-slide-dev@nagoya.betaversion.org Received: (qmail 52 invoked from network); 3 Jun 2003 14:54:51 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 3 Jun 2003 14:54:51 -0000 Received: (qmail 92967 invoked by uid 500); 3 Jun 2003 14:45:27 -0000 Mailing-List: contact slide-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Slide Developers Mailing List" Reply-To: "Slide Developers Mailing List" Delivered-To: mailing list slide-dev@jakarta.apache.org Received: (qmail 92920 invoked by uid 500); 3 Jun 2003 14:45:27 -0000 Received: (qmail 92799 invoked from network); 3 Jun 2003 14:45:25 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 3 Jun 2003 14:45:25 -0000 Received: (qmail 6835 invoked by uid 1641); 3 Jun 2003 14:45:24 -0000 Date: 3 Jun 2003 14:45:24 -0000 Message-ID: <20030603144524.6791.qmail@icarus.apache.org> From: stefan@apache.org To: jakarta-slide-cvs@apache.org Subject: cvs commit: jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/util Serializer.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N stefan 2003/06/03 07:45:22 Modified: proposals/jcrri/src/org/apache/slide/jcr/util Serializer.java Log: jcr ri: misc. Revision Changes Path 1.4 +14 -6 jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/util/Serializer.java Index: Serializer.java =================================================================== RCS file: /home/cvs/jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/util/Serializer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Serializer.java 30 May 2003 13:22:37 -0000 1.3 +++ Serializer.java 3 Jun 2003 14:45:22 -0000 1.4 @@ -249,12 +249,20 @@ try { indent(level); writer.write("<" + PROPERTY_ELEMENT + " " + NAME_ATTRIBUTE + "=\"" + property.getName() + "\""); - if (property.getType() == PropertyType.BINARY) { - if (binaryAsLink) { - writer.write(" " + TYPE_ATTRIBUTE + "=\"" + PropertyType.TYPENAME_SOFTLINK + "\""); - } else { - writer.write(" " + TYPE_ATTRIBUTE + "=\"" + PropertyType.TYPENAME_BINARY + "\""); - } + int type = property.getType(); + String typeName; + try { + typeName = PropertyType.nameFromValue(type); + } catch (IllegalArgumentException iae) { + // should never be getting here + throw new RepositoryException("unexpected property-type ordinal: " + type, iae); + } + if (type == PropertyType.BINARY && binaryAsLink) { + typeName = PropertyType.TYPENAME_SOFTLINK; + } + writer.write(" " + TYPE_ATTRIBUTE + "=\"" + typeName + "\""); + if (type == PropertyType.BINARY && !binaryAsLink) { + writer.write(" " + ENCODING_ATTRIBUTE + "=\"Base64\""); } if (property.hasValue()) { writer.write(">"); --------------------------------------------------------------------- To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: slide-dev-help@jakarta.apache.org