X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteApp.java;h=b4ba8d270f12e70c751a49db3230957454e0597d;hp=d00efc9208469daa38f561163bdaee0c6a110a41;hb=8e35075f4e0949d12c8232ba58e7efe18d4f7221;hpb=58cf7a0df60e5f17d34dd26b9d08b00939d29d41 diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java index d00efc9..b4ba8d2 100644 --- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java +++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java @@ -6,6 +6,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -22,6 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.api.NodeUtils; import org.argeo.cms.CmsUserManager; +import org.argeo.cms.LocaleUtils; import org.argeo.cms.auth.CmsSession; import org.argeo.cms.ui.AbstractCmsApp; import org.argeo.cms.ui.CmsTheme; @@ -30,6 +32,7 @@ import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.dialogs.CmsFeedback; import org.argeo.cms.ui.util.CmsEvent; import org.argeo.cms.ui.util.CmsUiUtils; +import org.argeo.eclipse.ui.specific.UiContext; import org.argeo.entity.EntityConstants; import org.argeo.entity.EntityNames; import org.argeo.entity.EntityType; @@ -131,8 +134,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { refreshPart(findUiProvider(LOGIN_SCREEN_PID), ui.getBelowHeader(), context); ui.layout(true, true); } else { + CmsSession cmsSession = cmsView.getCmsSession(); if (ui.getUserDir() == null) { - CmsSession cmsSession = cmsView.getCmsSession(); Session adminSession = null; try { adminSession = NodeUtils.openDataAdminSession(getRepository(), null); @@ -142,6 +145,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { Jcr.logout(adminSession); } } + initLocale(cmsSession); context = stateToNode(ui, state); if (context == null) context = ui.getUserDir(); @@ -160,6 +164,13 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { } } + private void initLocale(CmsSession cmsSession) { + Locale locale = cmsSession.getLocale(); + UiContext.setLocale(locale); + LocaleUtils.setThreadLocale(locale); + + } + private void refreshPart(CmsUiProvider uiProvider, Composite part, Node context) { CmsUiUtils.clear(part); uiProvider.createUiPart(part, context); @@ -172,6 +183,8 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { } private T findByType(Map> byType, Node context) { + if (context == null) + throw new IllegalArgumentException("A node should be provided"); try { // mixins Set types = new TreeSet<>(); @@ -224,8 +237,22 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { @Override public void setState(Composite parent, String state) { - if (state == null || !state.startsWith("/")) + if (state == null || state.equals("~")) + return; + if (!state.startsWith("/") && !state.equals("~")) { + if (parent instanceof SuiteUi) { + SuiteUi ui = (SuiteUi) parent; + String currentLayerId = ui.getCurrentLayerId(); + if (state.equals(currentLayerId)) + return; // does nothing + else { + Map properties = new HashMap<>(); + properties.put(SuiteEvent.LAYER, state); + ui.getCmsView().sendEvent(SuiteEvent.switchLayer.topic(), properties); + } + } return; + } SuiteUi suiteUi = (SuiteUi) parent; Node node = stateToNode(suiteUi, state); if (node == null) { @@ -234,45 +261,6 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { suiteUi.getCmsView().sendEvent(SuiteEvent.switchLayer.topic(), SuiteEvent.eventProperties(node)); suiteUi.getCmsView().sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(node)); } - -// CmsView cmsView = CmsView.getCmsView(parent); -// if (cmsView.isAnonymous()) -// return; -// Session session = null; -// try { -// if (state != null && state.startsWith("/")) { -// 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; -// } else if (index > 0) { -// workspace = path.substring(0, index); -// path = path.substring(index); -// } else {// index<0, assuming root node -// workspace = path; -// path = "/"; -// } -// } -// session = cmsView.doAs(() -> Jcr.login(getRepository(), workspace)); -// -// Node node = session.getNode(path); -// -// cmsView.sendEvent(SuiteEvent.switchLayer.topic(), SuiteEvent.eventProperties(node)); -// cmsView.sendEvent(SuiteEvent.refreshPart.topic(), SuiteEvent.eventProperties(node)); -// } -// } catch (RepositoryException e) { -// log.error("Cannot load state " + state, e); -// cmsView.navigateTo("~"); -// } finally { -// JcrUtils.logoutQuietly(session); -// } } private String nodeToState(Node node) { @@ -282,7 +270,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { private Node stateToNode(SuiteUi suiteUi, String state) { if (suiteUi == null) return null; - if (state == null) + if (state == null || !state.startsWith("/")) return null; String path = state.substring(1); @@ -304,8 +292,6 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { path = "/"; } } -// session = cmsView.doAs(() -> Jcr.login(getRepository(), workspace)); - Session session = suiteUi.getSession(workspace); if (session == null) return null; @@ -327,28 +313,33 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { // SuiteLayer currentLayer = currentLayerId != null ? layersByPid.get(currentLayerId).get() : null; if (isTopic(event, SuiteEvent.refreshPart)) { Node node = getNode(ui, event); + if (node == null) + return; CmsUiProvider uiProvider = findByType(uiProvidersByType, node); SuiteLayer layer = findByType(layersByType, node); ui.switchToLayer(layer, node); - layer.view(uiProvider, ui.getCurrentWorkArea(), node); + ui.getCmsView().runAs(() -> layer.view(uiProvider, ui.getCurrentWorkArea(), node)); ui.getCmsView().stateChanged(nodeToState(node), Jcr.getTitle(node)); } else if (isTopic(event, SuiteEvent.openNewPart)) { Node node = getNode(ui, event); + if (node == null) + return; CmsUiProvider uiProvider = findByType(uiProvidersByType, node); SuiteLayer layer = findByType(layersByType, node); ui.switchToLayer(layer, node); - layer.open(uiProvider, ui.getCurrentWorkArea(), node); + ui.getCmsView().runAs(() -> layer.open(uiProvider, ui.getCurrentWorkArea(), node)); ui.getCmsView().stateChanged(nodeToState(node), Jcr.getTitle(node)); } else if (isTopic(event, SuiteEvent.switchLayer)) { String layerId = get(event, SuiteEvent.LAYER); if (layerId != null) { - ui.switchToLayer(layerId, ui.getUserDir()); - // ui.getCmsView().navigateTo("~"); +// ui.switchToLayer(layerId, ui.getUserDir()); + ui.getCmsView().runAs(() -> ui.switchToLayer(layerId, ui.getUserDir())); + ui.getCmsView().navigateTo(layerId); } else { Node node = getNode(ui, event); if (node != null) { SuiteLayer layer = findByType(layersByType, node); - ui.switchToLayer(layer, node); + ui.getCmsView().runAs(() -> ui.switchToLayer(layer, node)); } } }