import org.argeo.cms.LocaleUtils;
import org.argeo.cms.Localized;
import org.argeo.cms.jcr.CmsJcrUtils;
+import org.argeo.cms.jcr.acr.JcrContent;
import org.argeo.cms.jcr.acr.JcrContentProvider;
import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.cms.swt.dialogs.CmsFeedback;
@Override
public void refreshUi(CmsUi cmsUi, String state) {
try {
- Node context = null;
+ Content context = null;
SuiteUi ui = (SuiteUi) cmsUi;
String uiName = Objects.toString(ui.getParent().getData(UI_NAME_PROPERTY), null);
}
- private void refreshPart(CmsUiProvider uiProvider, Composite part, Node context) {
+ private void refreshPart(CmsUiProvider uiProvider, Composite part, Content context) {
CmsSwtUtils.clear(part);
uiProvider.createUiPart(part, context);
}
return layersByPid.get(pid).get();
}
- private <T> T findByType(Map<String, RankedObject<T>> byType, Node context) {
- if (context == null)
+ private <T> T findByType(Map<String, RankedObject<T>> byType, Content content) {
+ if (content == null)
throw new IllegalArgumentException("A node should be provided");
+
+ if(content instanceof JcrContent) {
+ Node context = ((JcrContent)content).getJcrNode();
try {
// mixins
Set<String> types = new TreeSet<>();
} catch (RepositoryException e) {
throw new IllegalStateException(e);
}
+
+ }else {
+ throw new UnsupportedOperationException("Content "+content.getClass().getName()+" is not supported.");
+ }
}
private static String listTypes(Node context) {
return;
}
SuiteUi suiteUi = (SuiteUi) cmsUi;
- Node node = stateToNode(suiteUi, state);
+ Content node = stateToNode(suiteUi, state);
if (node == null) {
suiteUi.getCmsView().navigateTo(HOME_STATE);
} else {
}
// TODO move it to an internal package?
- static String nodeToState(Node node) {
- return '/' + Jcr.getWorkspaceName(node) + Jcr.getPath(node);
+ static String nodeToState(Content node) {
+ return node.getPath();
}
- private Node stateToNode(SuiteUi suiteUi, String state) {
+ private Content stateToNode(SuiteUi suiteUi, String state) {
if (suiteUi == null)
return null;
if (state == null || !state.startsWith("/"))
return null;
- String path = state.substring(1);
- String workspace;
- if (path.equals("")) {
- workspace = null;
- path = "/";
- } else {
- int index = path.indexOf('/');
- if (index == 0) {
- log.error("Cannot interpret " + state);
-// cmsView.navigateTo("~");
- return null;
- } else if (index > 0) {
- workspace = path.substring(0, index);
- path = path.substring(index);
- } else {// index<0, assuming root node
- workspace = path;
- path = "/";
- }
- }
+ String path=state;
+// String path = state.substring(1);
+// String workspace;
+// if (path.equals("")) {
+// workspace = null;
+// path = "/";
+// } else {
+// int index = path.indexOf('/');
+// if (index == 0) {
+// log.error("Cannot interpret " + state);
+//// cmsView.navigateTo("~");
+// return null;
+// } else if (index > 0) {
+// workspace = path.substring(0, index);
+// path = path.substring(index);
+// } else {// index<0, assuming root node
+// workspace = path;
+// path = "/";
+// }
+// }
ProvidedSession contentSession = (ProvidedSession) CmsUxUtils.getContentSession(contentRepository,
suiteUi.getCmsView());
- Session session = jcrContentProvider.getJcrSession(contentSession, workspace);
-// Session session = suiteUi.getSession(workspace);
- if (session == null)
- return null;
- Node node = Jcr.getNode(session, path);
- return node;
+ return contentSession.get(path);
+// Session session = jcrContentProvider.getJcrSession(contentSession, workspace);
+//// Session session = suiteUi.getSession(workspace);
+// if (session == null)
+// return null;
+// Node node = Jcr.getNode(session, path);
+// return node;
}
/*
// String currentLayerId = ui.getCurrentLayerId();
// SuiteLayer currentLayer = currentLayerId != null ? layersByPid.get(currentLayerId).get() : null;
if (SuiteUiUtils.isTopic(event, SuiteEvent.refreshPart)) {
- Node node = getNode(ui, event);
+ Content node = getNode(ui, event);
if (node == null)
return;
CmsUiProvider uiProvider = findByType(uiProvidersByType, node);
SuiteLayer layer = findByType(layersByType, node);
ui.switchToLayer(layer, node);
ui.getCmsView().runAs(() -> layer.view(uiProvider, ui.getCurrentWorkArea(), node));
- ui.getCmsView().stateChanged(nodeToState(node), appTitle + Jcr.getTitle(node));
+ ui.getCmsView().stateChanged(nodeToState(node), appTitle + CmsUxUtils.getTitle(node));
} else if (SuiteUiUtils.isTopic(event, SuiteEvent.openNewPart)) {
- Node node = getNode(ui, event);
+ Content node = getNode(ui, event);
if (node == null)
return;
CmsUiProvider uiProvider = findByType(uiProvidersByType, node);
SuiteLayer layer = findByType(layersByType, node);
ui.switchToLayer(layer, node);
ui.getCmsView().runAs(() -> layer.open(uiProvider, ui.getCurrentWorkArea(), node));
- ui.getCmsView().stateChanged(nodeToState(node), appTitle + Jcr.getTitle(node));
+ ui.getCmsView().stateChanged(nodeToState(node), appTitle + CmsUxUtils.getTitle(node));
} else if (SuiteUiUtils.isTopic(event, SuiteEvent.switchLayer)) {
String layerId = get(event, SuiteEvent.LAYER);
if (layerId != null) {
String title = null;
if (layerTitle != null)
title = layerTitle.lead();
- Node nodeFromState = getNode(ui, event);
+ Content nodeFromState = getNode(ui, event);
if (nodeFromState != null && nodeFromState.getPath().equals(ui.getUserDirNode().getPath())) {
// default layer view is forced
String state = defaultLayerPid.equals(layerId) ? "~" : layerId;
ui.getCmsView().stateChanged(state, appTitle + title);
suiteLayer.view(null, workArea, nodeFromState);
} else {
- Node layerCurrentContext = suiteLayer.getCurrentContext(workArea);
+ Content layerCurrentContext = suiteLayer.getCurrentContext(workArea);
if (layerCurrentContext != null) {
// layer was already showing a context so we set the state to it
ui.getCmsView().stateChanged(nodeToState(layerCurrentContext),
- appTitle + Jcr.getTitle(layerCurrentContext));
+ appTitle + CmsUxUtils.getTitle(layerCurrentContext));
} else {
// no context was shown
ui.getCmsView().stateChanged(layerId, appTitle + title);
}
}
} else {
- Node node = getNode(ui, event);
+ Content node = getNode(ui, event);
if (node != null) {
SuiteLayer layer = findByType(layersByType, node);
ui.getCmsView().runAs(() -> ui.switchToLayer(layer, node));
}
- private Node getNode(SuiteUi ui, Event event) {
+ private Content getNode(SuiteUi ui, Event event) {
ProvidedSession contentSession = (ProvidedSession) CmsUxUtils.getContentSession(contentRepository,
ui.getCmsView());
- String nodePath = get(event, SuiteEvent.NODE_PATH);
- if (nodePath != null && nodePath.equals(HOME_STATE))
- return ui.getUserDirNode();
- String workspace = get(event, SuiteEvent.WORKSPACE);
-
- Session session = jcrContentProvider.getJcrSession(contentSession, workspace);
-// Session session = ui.getSession(workspace);
- Node node;
- if (nodePath == null) {
+ String path = get(event,SuiteEvent.CONTENT_PATH);
+
+// String nodePath = get(event, SuiteEvent.NODE_PATH);
+ if (path != null && path.equals(HOME_STATE))
+ return ui.getUserDir();
+// String workspace = get(event, SuiteEvent.WORKSPACE);
+
+// Session session = jcrContentProvider.getJcrSession(contentSession, workspace);
+//// Session session = ui.getSession(workspace);
+ Content node;
+ if (path == null) {
// look for a user
String username = get(event, SuiteEvent.USERNAME);
if (username == null)
throw new IllegalArgumentException("Badly formatted username", e);
}
String userNodePath = SuiteUtils.getUserNodePath(userDn);
- if (Jcr.itemExists(session, userNodePath))
- node = Jcr.getNode(session, userNodePath);
- else {
- Session adminSession = null;
- try {
- adminSession = CmsJcrUtils.openDataAdminSession(getRepository(), workspace);
- SuiteUtils.getOrCreateUserNode(adminSession, userDn);
- } finally {
- Jcr.logout(adminSession);
- }
- node = Jcr.getNode(session, userNodePath);
- }
+ // FIXME deal with home path
+ return null;
+// if (Jcr.itemExists(session, userNodePath))
+// node = Jcr.getNode(session, userNodePath);
+// else {
+// Session adminSession = null;
+// try {
+// adminSession = CmsJcrUtils.openDataAdminSession(getRepository(), workspace);
+// SuiteUtils.getOrCreateUserNode(adminSession, userDn);
+// } finally {
+// Jcr.logout(adminSession);
+// }
+// node = Jcr.getNode(session, userNodePath);
+// }
} else {
- node = Jcr.getNode(session, nodePath);
+ node = contentSession.get(path);
}
return node;
}
List<String> types = LangUtils.toStringList(properties.get(EntityConstants.TYPE));
for (String type : types) {
if (layersByType.containsKey(type)) {
- if (layersByType.get(type).equals(new RankedObject<CmsUiProvider>(layer, properties))) {
+ if (layersByType.get(type).equals(new RankedObject<SuiteLayer>(layer, properties))) {
layersByType.remove(type);
}
}
projects / gpl / argeo-suite.git / blobdiff