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

[dna-commits at lists.jboss.org]

Author: rhauch
Date: 2009-07-09 14:25:20 -0400 (Thu, 09 Jul 2009)
New Revision: 1085

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/connector/map/AbstractMapWorkspace.java
   trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheRepository.java
Log:
DNA-480 Clean up compiler warnings

The compiler warnings were cleaned up, except for those in JcrContentHandler (which will be addressed under DNA-479)

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-07-09 16:29:03 UTC (rev 1084)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java	2009-07-09 18:25:20 UTC (rev 1085)
@@ -6199,7 +6199,7 @@
 
     @NotThreadSafe
     public abstract class CloneAction<T> extends AbstractAction<T> implements Clone<T> {
-        private final Location from;
+        protected final Location from;
 
         /*package*/CloneAction( T afterConjunction,
                                  Location from ) {

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-07-09 16:29:03 UTC (rev 1084)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/inmemory/InMemoryRepository.java	2009-07-09 18:25:20 UTC (rev 1085)
@@ -54,6 +54,7 @@
         initialize();
     }
 
+    @Override
     @GuardedBy( "getLock()" )
     protected MapWorkspace createWorkspace( ExecutionContext context,
                                             String name ) {
@@ -70,21 +71,25 @@
             initialize();
         }
 
+        @Override
         protected void addNodeToMap( MapNode node ) {
             assert node != null;
             assert nodesByUuid != null;
             nodesByUuid.put(node.getUuid(), node);
         }
 
+        @Override
         protected MapNode removeNodeFromMap( UUID nodeUuid ) {
             assert nodeUuid != null;
             return nodesByUuid.remove(nodeUuid);
         }
 
+        @Override
         protected void removeAllNodesFromMap() {
             nodesByUuid.clear();
         }
 
+        @Override
         public MapNode getNode( UUID nodeUuid ) {
             assert nodeUuid != null;
             return nodesByUuid.get(nodeUuid);

Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/AbstractMapWorkspace.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/AbstractMapWorkspace.java	2009-07-09 16:29:03 UTC (rev 1084)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/AbstractMapWorkspace.java	2009-07-09 18:25:20 UTC (rev 1085)
@@ -473,6 +473,7 @@
         }
 
         if (!reuseUuids) {
+            assert oldToNewUuids != null;
             // Now, adjust any references in the new subgraph to objects in the original subgraph
             // (because they were internal references, and need to be internal to the new subgraph)
             PropertyFactory propertyFactory = context.getPropertyFactory();

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-07-09 16:29:03 UTC (rev 1084)
+++ trunk/extensions/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheRepository.java	2009-07-09 18:25:20 UTC (rev 1085)
@@ -31,7 +31,7 @@
 
         assert cache != null;
         this.cache = cache;
-        
+
         initialize();
     }
 
@@ -56,20 +56,24 @@
             initialize();
         }
 
+        @Override
         protected void addNodeToMap( MapNode node ) {
             assert node != null;
             workspaceNode.put(node.getUuid(), node);
         }
 
+        @Override
         protected MapNode removeNodeFromMap( UUID nodeUuid ) {
             assert nodeUuid != null;
             return workspaceNode.remove(nodeUuid);
         }
 
+        @Override
         protected void removeAllNodesFromMap() {
             workspaceNode.clearData();
         }
 
+        @Override
         public MapNode getNode( UUID nodeUuid ) {
             assert nodeUuid != null;
             return workspaceNode.get(nodeUuid);