You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2010/02/09 09:20:19 UTC
svn commit: r907960 - in
/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper:
ScriptableItemMap.java ScriptableResource.java
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
* <i>"javax.jcr.Node"</i> instead of the much clumsier
* <i>Packages.javax.jcr.Node</i>.
- *
+ *
* @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;