svn commit: r908422 - in /incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager: UserManager.java UserManagerImpl.java

[mir]

Author: mir
Date: Wed Feb 10 09:57:15 2010
New Revision: 908422

URL: http://svn.apache.org/viewvc?rev=908422&view=rev
Log:
CLEREZZA-107: replaced implementation of getUserGraphNode()-method and removed 
getUserGraphNodeCopy()

Modified:
    
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
    
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java

Modified: 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java?rev=908422&r1=908421&r2=908422&view=diff
==============================================================================
--- 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
 (original)
+++ 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
 Wed Feb 10 09:57:15 2010
@@ -185,7 +185,7 @@
         * @param name The name of the user
         * @return
         */
-       public GraphNode getUserGraphNodeCopy(String name);
+       public GraphNode getUserGraphNode(String name);
 
        /**
         * Returns the <code>GraphNode</code> pointing to the user with the
@@ -251,13 +251,4 @@
         * @param name specifies the username of the user, may not be null
         */
        public void deleteAllPermissionsOfUser(String name);
-
-       /**
-        * Retrieves all information associated with a user as GraphNode. The 
GraphNode
-        * consists of a UnionMGraph between a new SimpleMGraph and the system 
graph.
-        *
-        * @param name specifies the username of the user, may not be null
-        * @return GraphNode
-        */
-       public GraphNode getUserGraphNode(String name);
 }

Modified: 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java?rev=908422&r1=908421&r2=908422&view=diff
==============================================================================
--- 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
 (original)
+++ 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
 Wed Feb 10 09:57:15 2010
@@ -540,26 +540,6 @@
        }
 
        @Override
-       public GraphNode getUserGraphNode(final String name) {
-               return AccessController.doPrivileged(new 
PrivilegedAction<GraphNode>() {
-
-                       @Override
-                       public GraphNode run() {
-                               NonLiteral user = getUserByName(name);
-                               if(user != null) {
-                                       GraphNode node = new GraphNode(user, 
new UnionMGraph(
-                                                       new SimpleMGraph(), new 
GraphNode(user, systemGraph)
-                                                       .getNodeContext()));
-
-                                       return node;
-                               } else {
-                                       throw new RuntimeException("No user 
with username " + name + " exists");
-                               }
-                       }
-               });
-       }
-
-       @Override
        public GraphNode getUserInSystemGraph(final String name) {
                return AccessController.doPrivileged(new 
PrivilegedAction<GraphNode>() {
 
@@ -602,7 +582,7 @@
        }
 
        @Override
-       public GraphNode getUserGraphNodeCopy(String name) {
+       public GraphNode getUserGraphNode(String name) {
                GraphNode userNodeInSystemGraph = new 
GraphNode(getUserByName(name), systemGraph);
                if (userNodeInSystemGraph == null) {
                        return null;