svn commit: r908461 - /incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java

[mir]

Author: mir
Date: Wed Feb 10 11:59:18 2010
New Revision: 908461

URL: http://svn.apache.org/viewvc?rev=908461&view=rev
Log:
CLEREZZA-87: improved code

Modified:
    
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java

Modified: 
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java?rev=908461&r1=908460&r2=908461&view=diff
==============================================================================
--- 
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java
 (original)
+++ 
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java
 Wed Feb 10 11:59:18 2010
@@ -27,9 +27,7 @@
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.clerezza.platform.typerendering.UserContextProvider;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
 import org.apache.clerezza.rdf.ontologies.PLATFORM;
-import org.apache.clerezza.rdf.utils.UnionMGraph;
 
 /**
  * The login name is added to the user context node. The name is accessable via
@@ -51,15 +49,11 @@
                GraphNode agent = 
userManager.getUserGraphNode(UserUtil.getCurrentUserName());
                if(!(node.getObjects(PLATFORM.user).hasNext())) {
                        node.addProperty(PLATFORM.user, agent.getNode());
-                       node = new GraphNode(node.getNode(), new 
UnionMGraph(node.getGraph(),
-                               agent.getGraph()));
                } else {
                        Resource user = node.getObjects(PLATFORM.user).next();
-                       GraphNode agentClone = new GraphNode(agent.getNode(), 
new
-                       SimpleMGraph(agent.getGraph()));
-                       agentClone.replaceWith((NonLiteral) user);
-                       node.getGraph().addAll(agentClone.getGraph());
+                       agent.replaceWith((NonLiteral) user);
                }
+               node.getGraph().addAll(agent.getGraph());
                return node;
        }
 }