X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FCmsUtils.java;h=38979610d1d57d332bb315cfac73c4b1b2503e31;hb=640de52985a307126f986b8743384ae44b3b01f4;hp=3bb984b6a86bfff20ec7a6d2d5aea92ead954859;hpb=b45e59192a4bb34a6b38a9bfa416b3dc3f6b7892;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java
index 3bb984b6a..38979610d 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsUtils.java
@@ -10,7 +10,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.io.IOUtils;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.auth.CmsAuthenticated;
 import org.argeo.cms.ui.CmsConstants;
 import org.argeo.cms.ui.CmsView;
 import org.argeo.eclipse.ui.specific.UiContext;
@@ -41,7 +40,7 @@ public class CmsUtils implements CmsConstants {
 	 * this call.
 	 */
 	public static CmsView getCmsView() {
-		return UiContext.getData(CmsAuthenticated.KEY);
+		return UiContext.getData(CmsView.KEY);
 	}
 
 	public static StringBuilder getServerBaseUrl(HttpServletRequest request) {
@@ -68,10 +67,6 @@ public class CmsUtils implements CmsConstants {
 		}
 	}
 
-	// private final static String PATH_DATA = "/data";
-	// private final static String WEBDAV_PUBLIC = PATH_DATA + "/public";
-	// private final static String WEBDAV_PRIVATE = PATH_DATA + "/files";
-
 	/** A path in the node repository */
 	public static String getDataPath(Node node) throws RepositoryException {
 		return getDataPath(NodeConstants.NODE, node);
@@ -79,43 +74,7 @@ public class CmsUtils implements CmsConstants {
 
 	public static String getDataPath(String cn, Node node) throws RepositoryException {
 		return NodeUtils.getDataPath(cn, node);
-		// assert node != null;
-		// String userId = node.getSession().getUserID();
-		// if (log.isTraceEnabled())
-		// log.trace(userId + " : " + node.getPath());
-		// StringBuilder buf = new StringBuilder();
-		// boolean isAnonymous =
-		// userId.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
-		// if (isAnonymous)
-		// buf.append(WEBDAV_PUBLIC);
-		// else
-		// buf.append(WEBDAV_PRIVATE);
-		// Session session = node.getSession();
-		// Repository repository = session.getRepository();
-		// String cn;
-		// if (repository.isSingleValueDescriptor(NodeConstants.CN)) {
-		// cn = repository.getDescriptor(NodeConstants.CN);
-		// } else {
-		// log.warn("No cn defined in repository, using " + NodeConstants.NODE);
-		// cn = NodeConstants.NODE;
-		// }
-		// return
-		// buf.append('/').append(cn).append('/').append(session.getWorkspace().getName()).append(node.getPath())
-		// .toString();
 	}
-	//
-	// public static String getCanonicalUrl(Node node, HttpServletRequest
-	// request) throws RepositoryException {
-	// try {
-	// StringBuilder buf = getServerBaseUrl(request);
-	// buf.append('/').append('!').append(node.getPath());
-	// return new URL(buf.toString()).toString();
-	// } catch (MalformedURLException e) {
-	// throw new CmsException("Cannot build data URL for " + node, e);
-	// }
-	// // return request.getRequestURL().append('!').append(node.getPath())
-	// // .toString();
-	// }
 
 	/** @deprecated Use rowData16px() instead. GridData should not be reused. */
 	@Deprecated
@@ -166,28 +125,6 @@ public class CmsUtils implements CmsConstants {
 		table.setData(CmsConstants.ITEM_HEIGHT, height);
 	}
 
-	// /** @return the path or null if not instrumented */
-	// @Deprecated
-	// public static String getDataPath(Widget widget) {
-	// // JCR item
-	// Object data = widget.getData();
-	// if (data != null && data instanceof Item) {
-	// try {
-	// return ((Item) data).getPath();
-	// } catch (RepositoryException e) {
-	// throw new CmsException("Cannot find data path of " + data + " for " +
-	// widget);
-	// }
-	// }
-	//
-	// // JCR path
-	// data = widget.getData(Property.JCR_PATH);
-	// if (data != null)
-	// return data.toString();
-	//
-	// return null;
-	// }
-
 	/** Dispose all children of a Composite */
 	public static void clear(Composite composite) {
 		for (Control child : composite.getChildren())