X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FSuiteEvent.java;h=b4082322339c05db06a064e7849ee7173a196843;hb=f1b87af2e0de38f1f49ab8fe68f9988018914811;hp=6eaa60731601257cf9a52c9066340f1bad509e7f;hpb=942fd932e1f6ed3319575c4c1d944912dfca9fa5;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteEvent.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteEvent.java
index 6eaa607..b408232 100644
--- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteEvent.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteEvent.java
@@ -5,6 +5,7 @@ import java.util.Map;
 
 import javax.jcr.Node;
 
+import org.argeo.api.acr.Content;
 import org.argeo.api.cms.CmsEvent;
 import org.argeo.jcr.Jcr;
 import org.osgi.service.useradmin.User;
@@ -14,19 +15,34 @@ 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_PATH = "path";
 	public final static String USERNAME = "username";
+
+	// ACR
+	public final static String CONTENT_PATH = "contentPath";
+
+	// JCR
+	@Deprecated
+	public final static String NODE_PATH = "path";
+	@Deprecated
 	public final static String WORKSPACE = "workspace";
 
 	public String getTopicBase() {
-		return "argeo/suite/ui";
+		return "argeo.suite.ui";
+	}
+
+	public static Map<String, Object> eventProperties(Content content) {
+		Map<String, Object> properties = new HashMap<>();
+		properties.put(CONTENT_PATH, content.getPath());
+		return properties;
 	}
 
+	@Deprecated
 	public static Map<String, Object> eventProperties(Node node) {
 		Map<String, Object> properties = new HashMap<>();
-		properties.put(NODE_PATH, Jcr.getPath(node));
-		properties.put(WORKSPACE, Jcr.getWorkspaceName(node));
+		String contentPath = '/' + Jcr.getWorkspaceName(node) + Jcr.getPath(node);
+		properties.put(CONTENT_PATH, contentPath);
+//		properties.put(NODE_PATH, Jcr.getPath(node));
+//		properties.put(WORKSPACE, Jcr.getWorkspaceName(node));
 		return properties;
 	}