From 6ba7e093d0de186bc2147be16c6f62abaff5baa3 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 20 Aug 2012 13:32:47 +0000 Subject: [PATCH] RCP remembers workbench state git-svn-id: https://svn.argeo.org/slc/trunk@5516 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../client/rcp/SlcSecureWorkbenchAdvisor.java | 33 +++++-------------- .../rcp/SlcSecureWorkbenchWindowAdvisor.java | 5 ++- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java b/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java index 1d2372f50..1109b1264 100644 --- a/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java +++ b/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java @@ -15,38 +15,21 @@ */ package org.argeo.slc.client.rcp; -import org.eclipse.ui.application.IWorkbenchConfigurer; +import org.argeo.security.ui.rcp.SecureWorkbenchAdvisor; import org.eclipse.ui.application.IWorkbenchWindowConfigurer; -import org.eclipse.ui.application.WorkbenchAdvisor; import org.eclipse.ui.application.WorkbenchWindowAdvisor; -/** Implements initial perspective and saveAndRestore status of the workbench. */ -public class SlcSecureWorkbenchAdvisor extends WorkbenchAdvisor { - public final static String INITIAL_PERSPECTIVE_PROPERTY = "org.argeo.security.ui.initialPerspective"; - private String initialPerspective = System - .getProperty(INITIAL_PERSPECTIVE_PROPERTY); - private String username; - +/** + * Custom {@link SecureWorkbenchAdvisor} in order to create a + * {@link SlcSecureWorkbenchWindowAdvisor}. + */ +public class SlcSecureWorkbenchAdvisor extends SecureWorkbenchAdvisor { public SlcSecureWorkbenchAdvisor(String username) { - super(); - this.username = username; + super(username); } public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor( IWorkbenchWindowConfigurer configurer) { - return new SlcSecureWorkbenchWindowAdvisor(configurer, username); - } - - public String getInitialWindowPerspectiveId() { - return initialPerspective; + return new SlcSecureWorkbenchWindowAdvisor(configurer, getUsername()); } - - @Override - public void initialize(IWorkbenchConfigurer configurer) { - super.initialize(configurer); - // To remember the user's layout and window size for the next time he - // starts the application - //configurer.setSaveAndRestore(true); - } - } diff --git a/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java b/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java index eb46844a3..26f0ff246 100644 --- a/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java +++ b/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java @@ -31,7 +31,10 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.application.IWorkbenchWindowConfigurer; import org.eclipse.ui.part.EditorInputTransfer; -/** Set here initial default size of the UI */ +/** + * Custom {@link SecureWorkbenchWindowAdvisor} which can add a tray. TODO: to + * be factorized in Argeo Commons and made more generic. + */ public class SlcSecureWorkbenchWindowAdvisor extends SecureWorkbenchWindowAdvisor { public final static String IN_TRAY_PROPERTY = "org.argeo.slc.ui.inTray"; -- 2.39.2