X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2FAbstractCmsEntryPoint.java;h=60758da887d63b66b80af07bf4317cab780b0690;hb=c110010dddf647925707a8dcd19c86e1f5254878;hp=1c9fc483d5bac03f52209d6d5de251e7328d89ba;hpb=04dade003a08c5915280ae653639b0af7cddeb0c;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
index 1c9fc483d..60758da88 100644
--- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
+++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java
@@ -14,6 +14,7 @@ import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.cms.i18n.Msg;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.application.AbstractEntryPoint;
@@ -37,7 +38,7 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements
 	// current state
 	private Node node;
 	private String state;
-	// private String page;
+	private String page;
 	private Throwable exception;
 
 	private BrowserNavigation history;
@@ -166,7 +167,7 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements
 		String previousState = this.state;
 
 		node = null;
-		// page = null;
+		page = null;
 		this.state = newState;
 
 		try {
@@ -176,7 +177,7 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements
 					node = addNode(session, state, null);
 				else
 					node = session.getNode(state);
-				// page = "";
+				page = "";
 			} else if (firstSlash > 0) {
 				String prefix = state.substring(0, firstSlash);
 				String path = state.substring(firstSlash);
@@ -209,19 +210,15 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements
 						throw new CmsException("Data " + path
 								+ " does not exist");
 				}
-				throw new CmsException("Unsupported state prefix '" + prefix
-						+ "'");
-				// page = prefix;
+				page = prefix;
 			} else {
 				node = getDefaultNode(session);
-				// if (state.equals("~"))
-				// page = "";
-				// else
-				// page = state;
+				page = state;
 			}
 
 			if (log.isTraceEnabled())
-				log.trace("node=" + node + ", state=" + state);
+				log.trace("node=" + node + ", state=" + state + " (page="
+						+ page);
 
 		} catch (RepositoryException e) {
 			throw new CmsException("Cannot retrieve node", e);
@@ -244,7 +241,7 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements
 		return state;
 	}
 
-	// protected String getPage() {
+	// String getPage() {
 	// return page;
 	// }