Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 78857 invoked from network); 9 Feb 2010 08:20:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Feb 2010 08:20:40 -0000 Received: (qmail 52901 invoked by uid 500); 9 Feb 2010 08:20:40 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 52845 invoked by uid 500); 9 Feb 2010 08:20:40 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 52836 invoked by uid 99); 9 Feb 2010 08:20:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Feb 2010 08:20:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 09 Feb 2010 08:20:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6A35923889B8; Tue, 9 Feb 2010 08:20:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r907960 - in /sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper: ScriptableItemMap.java ScriptableResource.java Date: Tue, 09 Feb 2010 08:20:19 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100209082019.6A35923889B8@eris.apache.org> Author: cziegeler Date: Tue Feb 9 08:20:18 2010 New Revision: 907960 URL: http://svn.apache.org/viewvc?rev=907960&view=rev Log: Cleanup Modified: sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableItemMap.java sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java Modified: sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableItemMap.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableItemMap.java?rev=907960&r1=907959&r2=907960&view=diff ============================================================================== --- sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableItemMap.java (original) +++ sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableItemMap.java Tue Feb 9 08:20:18 2010 @@ -45,7 +45,7 @@ } public void jsConstructor(Object res) { - if (res instanceof Iterator) { + if (res instanceof Iterator) { Iterator itemIterator = (Iterator) res; while (itemIterator.hasNext()) { Item item = (Item) itemIterator.next(); Modified: sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java?rev=907960&r1=907959&r2=907960&view=diff ============================================================================== --- sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java (original) +++ sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java Tue Feb 9 08:20:18 2010 @@ -69,9 +69,10 @@ * Maps getResourceType() to type property. This property is deprecated * since it does not correctly map the getResourceType() method name to a * property. - * + * * @deprecated since 2.1.0 because it maps the method name incorrectly. */ + @Deprecated public String jsGet_type() { return this.jsFunction_getResourceType(); } @@ -108,9 +109,10 @@ * Maps getResourceMetadata() to meta property. This property is deprecated * since it does not correctly map the getResourceType() method name to a * property. - * + * * @deprecated since 2.1.0 because it maps the method name incorrectly. */ + @Deprecated public Object jsGet_meta() { return jsFunction_getResourceMetadata(); } @@ -126,9 +128,10 @@ * Maps getResourceMetadata() to getMetadata() method. This method is * deprecated since it has the wrong name to support the * getResourceMetadata() method. - * + * * @deprecated since 2.1.0 because the method is named incorrectly. */ + @Deprecated public Object jsFunction_getMetadata() { return jsFunction_getResourceMetadata(); } @@ -175,7 +178,7 @@ * use in JavaScript since instead of for example writing * "javax.jcr.Node" instead of the much clumsier * Packages.javax.jcr.Node. - * + * * @param cx The current Rhino context * @param thisObj The ScriptableResource object in which the method is * called. @@ -199,7 +202,7 @@ // try to get the Class object for the argument Class adapter = null; - if (arg instanceof Class) { + if (arg instanceof Class) { adapter = (Class) arg;