X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2FAbstractCmsEntryPoint.java;h=60758da887d63b66b80af07bf4317cab780b0690;hb=0c5fb19fc8447577255071899e445329da8be5e7;hp=49a7b98dfc4fe635665f608e67eaccefa21b209b;hpb=d546fc1b9e19a86eb0e33ac4be824b52239316fc;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 49a7b98df..60758da88 100644 --- a/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java +++ b/org.argeo.cms/src/org/argeo/cms/AbstractCmsEntryPoint.java @@ -38,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; @@ -167,7 +167,7 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements String previousState = this.state; node = null; - // page = null; + page = null; this.state = newState; try { @@ -177,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); @@ -210,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); @@ -245,7 +241,7 @@ abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements return state; } - // protected String getPage() { + // String getPage() { // return page; // }