jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1440896 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core: AbstractPropertyLocation.java ReadOnlyTree.java TreeImpl.java
Date Thu, 31 Jan 2013 10:23:45 GMT
Author: mduerig
Date: Thu Jan 31 10:23:44 2013
New Revision: 1440896

URL: http://svn.apache.org/viewvc?rev=1440896&view=rev
Log:
OAK-568 : Duplicated code in TreeLocation implementations
proper type parametrisation

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractPropertyLocation.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractPropertyLocation.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractPropertyLocation.java?rev=1440896&r1=1440895&r2=1440896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractPropertyLocation.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractPropertyLocation.java
Thu Jan 31 10:23:44 2013
@@ -25,7 +25,7 @@ import static com.google.common.base.Pre
 /**
  * AbstractPropertyLocation... TODO
  */
-abstract class AbstractPropertyLocation<L extends AbstractNodeLocation> implements
TreeLocation {
+abstract class AbstractPropertyLocation<T extends Tree, L extends AbstractNodeLocation<T>>
implements TreeLocation {
 
     protected final L parentLocation;
     protected final String name;

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java?rev=1440896&r1=1440895&r2=1440896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java
Thu Jan 31 10:23:44 2013
@@ -310,7 +310,7 @@ public class ReadOnlyTree implements Tre
         }
     }
 
-    private final class PropertyLocation extends AbstractPropertyLocation<NodeLocation>
{
+    private final class PropertyLocation extends AbstractPropertyLocation<ReadOnlyTree,
NodeLocation> {
 
         private PropertyLocation(NodeLocation parentLocation, String name) {
             super(parentLocation, name);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java?rev=1440896&r1=1440895&r2=1440896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
Thu Jan 31 10:23:44 2013
@@ -637,7 +637,7 @@ public class TreeImpl implements Tree {
     }
 
     // TODO: OAK-599 (accessed by PropertyDelegate)
-    public final class PropertyLocation extends AbstractPropertyLocation<NodeLocation>
{
+    public final class PropertyLocation extends AbstractPropertyLocation<TreeImpl, NodeLocation>
{
 
         private PropertyLocation(NodeLocation parentLocation, String name) {
             super(parentLocation, name);



Mime
View raw message