X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.rcp%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Frcp%2FSecureWorkbenchAdvisor.java;h=33b781ee5396d6f7eeacced4b476a3ef7a485b7d;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=191a83aef06528bbf643a08c9de95140895d07a5;hpb=0aa1c816931dfce599fb6855eb216d743c1583b2;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java
index 191a83aef..33b781ee5 100644
--- a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java
+++ b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchAdvisor.java
@@ -1,23 +1,71 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.security.ui.rcp;
 
+import org.eclipse.ui.IPerspectiveDescriptor;
+import org.eclipse.ui.application.IWorkbenchConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchAdvisor;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
+/**
+ * Workbench configuration which is aware of the logged in user and can remember
+ * workbench state.
+ */
 public class SecureWorkbenchAdvisor extends WorkbenchAdvisor {
-
-	static final String DEFAULT_PERSPECTIVE_ID = "org.argeo.security.ui.adminSecurityPerspective"; //$NON-NLS-1$
-
 	public final static String INITIAL_PERSPECTIVE_PROPERTY = "org.argeo.security.ui.initialPerspective";
+	public final static String SAVE_AND_RESTORE_PROPERTY = "org.argeo.security.ui.saveAndRestore";
+
 	private String initialPerspective = System.getProperty(
-			INITIAL_PERSPECTIVE_PROPERTY, DEFAULT_PERSPECTIVE_ID);
+			INITIAL_PERSPECTIVE_PROPERTY, null);
+
+	private final String username;
+
+	public SecureWorkbenchAdvisor(String username) {
+		this.username = username;
+	}
+
+	@Override
+	public void initialize(final IWorkbenchConfigurer configurer) {
+		super.initialize(configurer);
+		Boolean saveAndRestore = Boolean.parseBoolean(System.getProperty(
+				SAVE_AND_RESTORE_PROPERTY, "true"));
+		configurer.setSaveAndRestore(saveAndRestore);
+	}
 
 	public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
 			IWorkbenchWindowConfigurer configurer) {
-		return new SecureWorkbenchWindowAdvisor(configurer);
+		return new SecureWorkbenchWindowAdvisor(configurer, username);
 	}
 
 	public String getInitialWindowPerspectiveId() {
+		if (initialPerspective != null) {
+			// check whether this user can see the declared perspective
+			// (typically the perspective won't be listed if this user doesn't
+			// have the right to see it)
+			IPerspectiveDescriptor pd = getWorkbenchConfigurer().getWorkbench()
+					.getPerspectiveRegistry()
+					.findPerspectiveWithId(initialPerspective);
+			if (pd == null)
+				return null;
+		}
 		return initialPerspective;
 	}
+
+	protected String getUsername() {
+		return username;
+	}
 }