X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteEvent.java;h=99638561d16d9027575577e724b5c8fa57ec9300;hb=41e9998f7f1c87c747c57f60c6bec65fa20757a6;hp=99e49880e1b6e7925cd184b8bd9a1d5dc6efab9a;hpb=5f3933c6262a3f45212299f6f0ec3c29a2e411bf;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteEvent.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteEvent.java
index 99e4988..9963856 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteEvent.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteEvent.java
@@ -5,15 +5,18 @@ import java.util.Map;
 
 import javax.jcr.Node;
 
-import org.argeo.cms.ui.util.CmsEvent;
+import org.argeo.api.cms.CmsEvent;
 import org.argeo.jcr.Jcr;
+import org.osgi.service.useradmin.User;
 
 /** Events specific to Argeo Suite. */
 public enum SuiteEvent implements CmsEvent {
 	openNewPart, refreshPart, switchLayer;
 
 	public final static String LAYER = "layer";
-	public final static String NODE_ID = "nodeId";
+//	public final static String NODE_ID = "nodeId";
+	public final static String NODE_PATH = "path";
+	public final static String USERNAME = "username";
 	public final static String WORKSPACE = "workspace";
 
 	public String getTopicBase() {
@@ -22,8 +25,14 @@ public enum SuiteEvent implements CmsEvent {
 
 	public static Map<String, Object> eventProperties(Node node) {
 		Map<String, Object> properties = new HashMap<>();
-		properties.put(NODE_ID, Jcr.getIdentifier(node));
+		properties.put(NODE_PATH, Jcr.getPath(node));
 		properties.put(WORKSPACE, Jcr.getWorkspaceName(node));
 		return properties;
 	}
+
+	public static Map<String, Object> eventProperties(User user) {
+		Map<String, Object> properties = new HashMap<>();
+		properties.put(USERNAME, user.getName());
+		return properties;
+	}
 }