X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=core%2Forg.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteUi.java;h=187888e55e0190d4b5a2cd8b2998627622d46ddb;hp=3c4474ff66edc12e0e3beee9f33323c7ed024f3c;hb=25f40e8e6c393b188e53d81c96da10ea0294dfbd;hpb=3523f6ae47201064ca7393ea2f476a81ff4e4728 diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java index 3c4474f..187888e 100644 --- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java +++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java @@ -26,12 +26,13 @@ class SuiteUi extends Composite { private Localized title; private Composite header; + private Composite footer; private Composite belowHeader; private Composite leadPane; private Composite dynamicArea; private Session sysSession; -// private Session homeSession; + private Session homeSession; private Node userDir; private Map layers = new HashMap<>(); @@ -52,6 +53,11 @@ class SuiteUi extends Composite { belowHeader = new Composite(this, SWT.NONE); belowHeader.setLayoutData(CmsUiUtils.fillAll()); + + footer = new Composite(this, SWT.NONE); + footer.setLayout(CmsUiUtils.noSpaceGridLayout()); + CmsUiUtils.style(footer, SuiteStyle.footer); + footer.setLayoutData(CmsUiUtils.fillWidth()); } public void refreshBelowHeader(boolean initApp) { @@ -143,6 +149,7 @@ class SuiteUi extends Composite { } throw new IllegalArgumentException("Layer is not registered."); } + void addLayer(String id, SuiteLayer layer) { layers.put(id, layer); @@ -168,7 +175,7 @@ class SuiteUi extends Composite { synchronized void logout() { userDir = null; Jcr.logout(sysSession); -// Jcr.logout(homeSession); + Jcr.logout(homeSession); currentLayerId = null; workAreas.clear(); } @@ -181,6 +188,10 @@ class SuiteUi extends Composite { return header; } + Composite getFooter() { + return footer; + } + Composite getLeadPane() { return leadPane; } @@ -195,11 +206,11 @@ class SuiteUi extends Composite { // synchronized void initSessions(Repository repository, String userDirPath) throws RepositoryException { this.sysSession = repository.login(); -// this.homeSession = repository.login(NodeConstants.HOME_WORKSPACE); + this.homeSession = repository.login(NodeConstants.HOME_WORKSPACE); userDir = sysSession.getNode(userDirPath); addDisposeListener((e) -> { Jcr.logout(sysSession); -// Jcr.logout(homeSession); + Jcr.logout(homeSession); }); } @@ -216,8 +227,8 @@ class SuiteUi extends Composite { return sysSession; if (NodeConstants.SYS_WORKSPACE.equals(workspaceName)) return sysSession; -// else if (NodeConstants.HOME_WORKSPACE.equals(workspaceName)) -// return homeSession; + else if (NodeConstants.HOME_WORKSPACE.equals(workspaceName)) + return homeSession; else throw new IllegalArgumentException("Unknown workspace " + workspaceName); }