jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1437946 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr: NodeImpl.java PropertyImpl.java SessionDelegate.java SessionImpl.java
Date Thu, 24 Jan 2013 10:59:49 GMT
Author: mduerig
Date: Thu Jan 24 10:59:49 2013
New Revision: 1437946

URL: http://svn.apache.org/viewvc?rev=1437946&view=rev
Log:
Parametrise types

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1437946&r1=1437945&r2=1437946&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
Thu Jan 24 10:59:49 2013
@@ -274,7 +274,7 @@ public class NodeImpl<T extends NodeDele
                     throw new ItemExistsException();
                 }
 
-                NodeImpl childNode = new NodeImpl<NodeDelegate>(added);
+                NodeImpl<?> childNode = new NodeImpl<NodeDelegate>(added);
                 childNode.internalSetPrimaryType(ntName);
                 childNode.autoCreateItems();
                 return childNode;
@@ -474,9 +474,9 @@ public class NodeImpl<T extends NodeDele
     public Node getNode(final String relPath) throws RepositoryException {
         checkStatus();
 
-        return sessionDelegate.perform(new SessionOperation<NodeImpl>() {
+        return sessionDelegate.perform(new SessionOperation<NodeImpl<?>>() {
             @Override
-            public NodeImpl perform() throws RepositoryException {
+            public NodeImpl<?> perform() throws RepositoryException {
                 String oakPath = sessionDelegate.getOakPathOrThrowNotFound(relPath);
 
                 NodeDelegate nd = dlg.getChild(oakPath);

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java?rev=1437946&r1=1437945&r2=1437946&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java
Thu Jan 24 10:59:49 2013
@@ -76,9 +76,9 @@ public class PropertyImpl extends ItemIm
     @Override
     @Nonnull
     public Node getParent() throws RepositoryException {
-        return sessionDelegate.perform(new SessionOperation<NodeImpl>() {
+        return sessionDelegate.perform(new SessionOperation<NodeImpl<?>>() {
             @Override
-            public NodeImpl perform() throws RepositoryException {
+            public NodeImpl<?> perform() throws RepositoryException {
                 NodeDelegate parent = dlg.getParent();
                 if (parent == null) {
                     throw new AccessDeniedException();

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java?rev=1437946&r1=1437945&r2=1437946&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java
Thu Jan 24 10:59:49 2013
@@ -544,7 +544,7 @@ public class SessionDelegate {
 
     void checkProtectedNodes(String... absJcrPaths) throws RepositoryException {
         for (String absPath : absJcrPaths) {
-            NodeImpl node = (NodeImpl) session.getNode(absPath);
+            NodeImpl<?> node = (NodeImpl<?>) session.getNode(absPath);
             node.checkProtected();
         }
     }

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java?rev=1437946&r1=1437945&r2=1437946&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
Thu Jan 24 10:59:49 2013
@@ -135,9 +135,9 @@ public class SessionImpl extends Abstrac
     public Node getRootNode() throws RepositoryException {
         ensureIsAlive();
 
-        return dlg.perform(new SessionOperation<NodeImpl>() {
+        return dlg.perform(new SessionOperation<NodeImpl<?>>() {
             @Override
-            public NodeImpl perform() throws AccessDeniedException {
+            public NodeImpl<?> perform() throws AccessDeniedException {
                 NodeDelegate nd = dlg.getRootNode();
                 if (nd == null) {
                     throw new AccessDeniedException("Root node is not accessible.");
@@ -159,9 +159,9 @@ public class SessionImpl extends Abstrac
     public Node getNodeByIdentifier(final String id) throws RepositoryException {
         ensureIsAlive();
 
-        return dlg.perform(new SessionOperation<NodeImpl>() {
+        return dlg.perform(new SessionOperation<NodeImpl<?>>() {
             @Override
-            public NodeImpl perform() throws RepositoryException {
+            public NodeImpl<?> perform() throws RepositoryException {
                 NodeDelegate d = dlg.getNodeByIdentifier(id);
                 if (d == null) {
                     throw new ItemNotFoundException("Node with id " + id + " does not exist.");
@@ -189,9 +189,9 @@ public class SessionImpl extends Abstrac
     public Node getNode(final String absPath) throws RepositoryException {
         ensureIsAlive();
 
-        return dlg.perform(new SessionOperation<NodeImpl>() {
+        return dlg.perform(new SessionOperation<NodeImpl<?>>() {
             @Override
-            public NodeImpl perform() throws RepositoryException {
+            public NodeImpl<?> perform() throws RepositoryException {
                 String oakPath = dlg.getOakPath(absPath);
                 NodeDelegate d = dlg.getNode(oakPath);
                 if (d == null) {



Mime
View raw message