X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FSuiteUiUtils.java;h=f5cfba5873fc63e124b665bc95f51ad98a1348bc;hb=616a062e9d061ce91589556624ed622298a21ac7;hp=77d98b8e3bb55e7e5c5c752bf53acb7cc7a2f02c;hpb=718c0b4298449ae173cfb0e622215d936821fc77;p=gpl%2Fargeo-suite.git diff --git a/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java b/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java index 77d98b8..f5cfba5 100644 --- a/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java +++ b/swt/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java @@ -13,13 +13,13 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.apache.commons.io.IOUtils; +import org.argeo.api.app.EntityNames; +import org.argeo.api.app.EntityType; import org.argeo.api.cms.ux.CmsEditable; import org.argeo.api.cms.ux.CmsStyle; -import org.argeo.app.api.EntityNames; -import org.argeo.app.api.EntityType; import org.argeo.app.swt.ux.SuiteSwtUtils; -import org.argeo.app.swt.ux.SwtArgeoApp; import org.argeo.app.ux.SuiteUxEvent; +import org.argeo.cms.acr.ContentUtils; import org.argeo.cms.jcr.acr.JcrContent; import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.dialogs.LightweightDialog; @@ -221,8 +221,7 @@ public class SuiteUiUtils { } public static String toLink(Node node) { - return node != null ? "#" + CmsSwtUtils.cleanPathForUrl(SwtArgeoApp.nodeToState(JcrContent.nodeToContent(node))) - : null; + return node != null ? "#" + ContentUtils.cleanPathForUrl(JcrContent.nodeToContent(node).getPath()) : null; } public static Control addLink(Composite parent, String label, Node node, CmsStyle style)