Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 58898 invoked from network); 13 Mar 2006 11:04:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Mar 2006 11:04:46 -0000 Received: (qmail 64194 invoked by uid 500); 13 Mar 2006 11:04:44 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 64181 invoked by uid 500); 13 Mar 2006 11:04:43 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 64177 invoked by uid 99); 13 Mar 2006 11:04:43 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Mar 2006 03:04:43 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 13 Mar 2006 03:04:43 -0800 Received: (qmail 58749 invoked by uid 65534); 13 Mar 2006 11:04:19 -0000 Message-ID: <20060313110419.58748.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r385509 - /incubator/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/property/HrefProperty.java Date: Mon, 13 Mar 2006 11:04:18 -0000 To: jackrabbit-cvs@incubator.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: angela Date: Mon Mar 13 03:04:16 2006 New Revision: 385509 URL: http://svn.apache.org/viewcvs?rev=385509&view=rev Log: fixing javadoc minor improvement inside constructor Modified: incubator/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/property/HrefProperty.java Modified: incubator/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/property/HrefProperty.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/property/HrefProperty.java?rev=385509&r1=385508&r2=385509&view=diff ============================================================================== --- incubator/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/property/HrefProperty.java (original) +++ incubator/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/property/HrefProperty.java Mon Mar 13 03:04:16 2006 @@ -74,37 +74,41 @@ * object, consisting of {@link #XML_HREF href} Element entries. * * @param prop - * @throws IllegalArgumentException if the property {@link DavProperty#getValue() value} - * is not a List. */ public HrefProperty(DavProperty prop) { super(prop.getName(), prop.isProtected()); - ArrayList hrefList = new ArrayList(); - Object val = prop.getValue(); - if (val instanceof List) { - Iterator it = ((List)val).iterator(); - while (it.hasNext()) { - Object o = it.next(); - if (o instanceof Element && XML_HREF.equals(((Element)o).getLocalName())) { - String href = DomUtil.getText((Element)o); - if (href != null) { - hrefList.add(href); + if (prop instanceof HrefProperty) { + // already an HrefProperty: no parsing required + this.value = ((HrefProperty)prop).value; + } else { + // assume property has be built from xml + ArrayList hrefList = new ArrayList(); + Object val = prop.getValue(); + if (val instanceof List) { + Iterator it = ((List)val).iterator(); + while (it.hasNext()) { + Object o = it.next(); + if (o instanceof Element && XML_HREF.equals(((Element)o).getLocalName())) { + String href = DomUtil.getText((Element)o); + if (href != null) { + hrefList.add(href); + } else { + log.warn("Valid DAV:href element expected instead of " + o.toString()); + } } else { - log.warn("Valid DAV:href element expected instead of " + o.toString()); + log.warn("DAV: href element expected in the content of " + getName().toString()); } + } + } else if (val instanceof Element && XML_HREF.equals(((Element)val).getLocalName())) { + String href = DomUtil.getTextTrim((Element)val); + if (href != null) { + hrefList.add(href); } else { - log.warn("DAV: href element expected in the content of " + getName().toString()); + log.warn("Valid DAV:href element expected instead of " + val.toString()); } } - } else if (val instanceof Element && XML_HREF.equals(((Element)val).getLocalName())) { - String href = DomUtil.getTextTrim((Element)val); - if (href != null) { - hrefList.add(href); - } else { - log.warn("Valid DAV:href element expected instead of " + val.toString()); - } + value = (String[]) hrefList.toArray(new String[hrefList.size()]); } - value = (String[]) hrefList.toArray(new String[hrefList.size()]); } /**