Author: cziegeler
Date: Thu Aug 19 08:00:05 2010
New Revision: 987058
URL: http://svn.apache.org/viewvc?rev=987058&view=rev
Log:
Avoid deprecated methods, fix javadocs
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrModifiablePropertyMap.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrResourceUtil.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/MapEntries.java
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrPropertyMapTest.java
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrModifiablePropertyMap.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrModifiablePropertyMap.java?rev=987058&r1=987057&r2=987058&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrModifiablePropertyMap.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrModifiablePropertyMap.java
Thu Aug 19 08:00:05 2010
@@ -165,7 +165,7 @@ public final class JcrModifiableProperty
node.setProperty(name, (String)null);
}
}
- node.save();
+ node.getSession().save();
} catch (RepositoryException re) {
throw new PersistenceException("Unable to persist changes.", re);
}
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrResourceUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrResourceUtil.java?rev=987058&r1=987057&r2=987058&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrResourceUtil.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrResourceUtil.java
Thu Aug 19 08:00:05 2010
@@ -303,7 +303,7 @@ public class JcrResourceUtil {
} else {
node.addNode(token);
}
- if ( autoSave ) node.save();
+ if ( autoSave ) node.getSession().save();
} catch (RepositoryException re) {
// we ignore this as this folder might be created
from a different task
node.refresh(false);
@@ -319,7 +319,7 @@ public class JcrResourceUtil {
} else {
node.addNode(relativePath);
}
- if ( autoSave ) node.save();
+ if ( autoSave ) node.getSession().save();
}
return node.getNode(relativePath);
} else {
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java?rev=987058&r1=987057&r2=987058&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java
Thu Aug 19 08:00:05 2010
@@ -36,7 +36,6 @@ import org.apache.sling.api.resource.Log
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.jcr.resource.JcrResourceConstants;
import org.osgi.service.event.EventAdmin;
import org.osgi.util.tracker.ServiceTracker;
@@ -200,7 +199,7 @@ public class JcrResourceListener impleme
if ( node != null ) {
try {
if (node.getParent().isNodeType("nt:file") ) {
- final Resource parentResource =
ResourceUtil.getParent(resource);
+ final Resource parentResource =
resource.getParent();
if ( parentResource != null ) {
resource = parentResource;
}
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java?rev=987058&r1=987057&r2=987058&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver.java
Thu Aug 19 08:00:05 2010
@@ -128,7 +128,7 @@ public class JcrResourceResolver
}
/**
- * @see org.apache.sling.api.resource.ResourceResolver#copy(Map)
+ * @see org.apache.sling.api.resource.ResourceResolver#clone(Map)
*/
public ResourceResolver clone(Map<String, Object> authenticationInfo)
throws LoginException {
@@ -594,12 +594,12 @@ public class JcrResourceResolver
while (res != null) {
String alias = getProperty(res, PROP_ALIAS);
if (alias == null) {
- alias = ResourceUtil.getName(res);
+ alias = res.getName();
}
if (alias != null && alias.length() > 0 &&
!alias.endsWith(":")) {
names.add(alias);
}
- res = ResourceUtil.getParent(res);
+ res = res.getParent();
}
// build path from segment names
@@ -800,10 +800,9 @@ public class JcrResourceResolver
// we treat this as a not found resource
return Collections.EMPTY_LIST.iterator();
}
- } else {
- // this is illegal
- return Collections.EMPTY_LIST.iterator();
}
+ // this is illegal
+ return Collections.EMPTY_LIST.iterator();
} else if (parent instanceof WorkspaceDecoratedResource) {
parent = ((WorkspaceDecoratedResource) parent).getResource();
} else {
@@ -897,7 +896,7 @@ public class JcrResourceResolver
}
/**
- * @see
org.apache.sling.api.resource.ResourceResolver#getUserID(java.lang.String)
+ * @see org.apache.sling.api.resource.ResourceResolver#getUserID()
*/
public String getUserID() {
checkClosed();
@@ -915,9 +914,8 @@ public class JcrResourceResolver
if (type == Session.class) {
if (requestBoundResolver != null) {
return (AdapterType)
requestBoundResolver.adaptTo(Session.class);
- } else {
- return (AdapterType) getSession();
}
+ return (AdapterType) getSession();
}
// fall back to default behaviour
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/MapEntries.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/MapEntries.java?rev=987058&r1=987057&r2=987058&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/MapEntries.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/MapEntries.java
Thu Aug 19 08:00:05 2010
@@ -247,7 +247,7 @@ public class MapEntries implements Event
Collection<MapEntry> resolveEntries,
Map<String, MapEntry> mapEntries, Resource parent, String
parentPath) {
// scheme list
- Iterator<Resource> children = ResourceUtil.listChildren(parent);
+ Iterator<Resource> children = parent.listChildren();
while (children.hasNext()) {
Resource child = children.next();
@@ -255,7 +255,7 @@ public class MapEntries implements Event
JcrResourceResolver.PROP_REG_EXP);
boolean trailingSlash = false;
if (name == null) {
- name = ResourceUtil.getName(child).concat("/");
+ name = child.getName().concat("/");
trailingSlash = true;
}
Modified:
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrPropertyMapTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrPropertyMapTest.java?rev=987058&r1=987057&r2=987058&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrPropertyMapTest.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrPropertyMapTest.java
Thu Aug 19 08:00:05 2010
@@ -231,7 +231,7 @@ public class JcrPropertyMapTest extends
}
node.setProperty(PROP_NAME, jcrValue);
- node.save();
+ node.getSession().save();
return createPropertyMap(node);
}
Modified:
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java?rev=987058&r1=987057&r2=987058&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverTest.java
Thu Aug 19 08:00:05 2010
@@ -1222,26 +1222,26 @@ public class JcrResourceResolverTest ext
// create a folder
String folderPath = "folder";
Node folder = rootNode.addNode(folderPath, "sling:Folder");
- rootNode.save();
+ rootNode.getSession().save();
// test default child node type
Node child = folder.addNode("child0");
- folder.save();
+ folder.getSession().save();
assertEquals("sling:Folder", child.getPrimaryNodeType().getName());
// test explicit sling:Folder child
child = folder.addNode("child1", "sling:Folder");
- folder.save();
+ folder.getSession().save();
assertEquals("sling:Folder", child.getPrimaryNodeType().getName());
// test explicit nt:folder child
child = folder.addNode("child2", "nt:folder");
- folder.save();
+ folder.getSession().save();
assertEquals("nt:folder", child.getPrimaryNodeType().getName());
// test any child node -- use nt:unstructured here
child = folder.addNode("child3", "nt:unstructured");
- folder.save();
+ folder.getSession().save();
assertEquals("nt:unstructured", child.getPrimaryNodeType().getName());
}
