Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A4E27965B for ; Fri, 23 Mar 2012 10:56:32 +0000 (UTC) Received: (qmail 32069 invoked by uid 500); 23 Mar 2012 10:56:32 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 32043 invoked by uid 500); 23 Mar 2012 10:56:32 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 32035 invoked by uid 99); 23 Mar 2012 10:56:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Mar 2012 10:56:32 +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; Fri, 23 Mar 2012 10:56:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3BF0D2388847; Fri, 23 Mar 2012 10:56:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1304278 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelPropertyState.java Date: Fri, 23 Mar 2012 10:56:11 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120323105611.3BF0D2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Fri Mar 23 10:56:10 2012 New Revision: 1304278 URL: http://svn.apache.org/viewvc?rev=1304278&view=rev Log: OAK-33: Values in oak-core (WIP) initial implementation of Scalar Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelPropertyState.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelPropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelPropertyState.java?rev=1304278&r1=1304277&r2=1304278&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelPropertyState.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelPropertyState.java Fri Mar 23 10:56:10 2012 @@ -55,23 +55,13 @@ public class KernelPropertyState extends for (Scalar s : values) { sb.append(sep); sep = ","; - if (s.getType() == Scalar.STRING) { - sb.append('"' + s.getString() + '"'); - } - else { - sb.append(s.getString()); - } + sb.append(encodeValue(s)); } sb.append(']'); return sb.toString(); } else { - if (value.getType() == Scalar.STRING) { - return '"' + value.getString() + '"'; - } - else { - return value.getString(); - } + return encodeValue(value); } } @@ -86,4 +76,15 @@ public class KernelPropertyState extends public List getValues() { return values; } + + //------------------------------------------------------------< private >--- + + private static String encodeValue(Scalar value) { + if (value.getType() == Scalar.STRING) { + return '"' + value.getString() + '"'; + } + else { + return value.getString(); + } + } }