[dna-commits] DNA SVN: r1305 - in trunk: dna-graph/src/main/java/org/jboss/dna/graph/connector/inmemory and 3 other directories.

[dna-commits at lists.jboss.org]

Author: bcarothers
Date: 2009-10-22 06:27:12 -0400 (Thu, 22 Oct 2009)
New Revision: 1305

Modified:
   trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java
   trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/inmemory/InMemoryRepository.java
   trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/RewriteIdentityJoins.java
   trunk/extensions/dna-connector-infinispan/src/main/java/org/jboss/dna/connector/infinispan/InfinispanRepository.java
   trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheRepository.java
Log:
Cleaned up some things that work in Java6 but are breaking the build in Java5

Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java	2009-10-21 22:12:10 UTC (rev 1304)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java	2009-10-22 10:27:12 UTC (rev 1305)
@@ -4743,12 +4743,10 @@
         public LockTimeout<T> andItsDescendants() {
             return new LockTimeout<T>() {
 
-                @Override
                 public T withDefaultTimeout() {
                     return submit(target, org.jboss.dna.graph.request.LockBranchRequest.LockScope.SELF_AND_DESCENDANTS, 0);
                 }
 
-                @Override
                 public T withTimeoutOf( long milliseconds ) {
                     return submit(target,
                                   org.jboss.dna.graph.request.LockBranchRequest.LockScope.SELF_AND_DESCENDANTS,
@@ -4761,12 +4759,10 @@
         public LockTimeout<T> only() {
             return new LockTimeout<T>() {
 
-                @Override
                 public T withDefaultTimeout() {
                     return submit(target, org.jboss.dna.graph.request.LockBranchRequest.LockScope.SELF_ONLY, 0);
                 }
 
-                @Override
                 public T withTimeoutOf( long milliseconds ) {
                     return submit(target, org.jboss.dna.graph.request.LockBranchRequest.LockScope.SELF_ONLY, milliseconds);
                 }

Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/inmemory/InMemoryRepository.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/inmemory/InMemoryRepository.java	2009-10-21 22:12:10 UTC (rev 1304)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/inmemory/InMemoryRepository.java	2009-10-22 10:27:12 UTC (rev 1305)
@@ -126,14 +126,12 @@
             return super.copyNode(context, original, newWorkspace, newParent, desiredName, recursive, oldToNewUuids);
         }
 
-        @Override
         public void lockNode( MapNode node,
                               LockScope lockScope,
                               long lockTimeoutInMillis ) throws LockFailedException {
             // Locking is not supported by this connector
         }
 
-        @Override
         public void unlockNode( MapNode node ) {
             // Locking is not supported by this connector
         }

Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/RewriteIdentityJoins.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/RewriteIdentityJoins.java	2009-10-21 22:12:10 UTC (rev 1304)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/query/optimize/RewriteIdentityJoins.java	2009-10-22 10:27:12 UTC (rev 1305)
@@ -157,7 +157,7 @@
             ruleStack.addFirst(this);
 
             // After this rule is done as is no longer needed, we need to try to push SELECTs and PROJECTs again ...
-            if (!(ruleStack.peekFirst() instanceof PushSelectCriteria)) {
+            if (!(ruleStack.peek() instanceof PushSelectCriteria)) {
                 // We haven't already added these, so add them now ...
                 ruleStack.addFirst(PushProjects.INSTANCE);
                 if (context.getHints().hasCriteria) {

Modified: trunk/extensions/dna-connector-infinispan/src/main/java/org/jboss/dna/connector/infinispan/InfinispanRepository.java
===================================================================
--- trunk/extensions/dna-connector-infinispan/src/main/java/org/jboss/dna/connector/infinispan/InfinispanRepository.java	2009-10-21 22:12:10 UTC (rev 1304)
+++ trunk/extensions/dna-connector-infinispan/src/main/java/org/jboss/dna/connector/infinispan/InfinispanRepository.java	2009-10-22 10:27:12 UTC (rev 1305)
@@ -83,14 +83,12 @@
             return workspaceCache.get(nodeUuid);
         }
 
-        @Override
         public void lockNode( MapNode node,
                               LockScope lockScope,
                               long lockTimeoutInMillis ) throws LockFailedException {
             // Locking is not supported by this connector
         }
 
-        @Override
         public void unlockNode( MapNode node ) {
             // Locking is not supported by this connector
         }

Modified: trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheRepository.java
===================================================================
--- trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheRepository.java	2009-10-21 22:12:10 UTC (rev 1304)
+++ trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheRepository.java	2009-10-22 10:27:12 UTC (rev 1305)
@@ -84,14 +84,12 @@
             return workspaceNode.get(nodeUuid);
         }
 
-        @Override
         public void lockNode( MapNode node,
                               LockScope lockScope,
                               long lockTimeoutInMillis ) throws LockFailedException {
             // Locking is not supported by this connector
         }
 
-        @Override
         public void unlockNode( MapNode node ) {
             // Locking is not supported by this connector
         }