Merge RAP 2.x adaptation from 2.tp branch

[lgpl/argeo-commons.git] / security / plugins / org.argeo.security.ui.rap / src / main / java / org / argeo / security / ui / rap / RapWorkbenchAdvisor.java

diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java
index d897b46b0a0b212c6df7a9bf5bc481062a7fdd07..edde41f14200f77bfd72a32f17fdc3eac3208981 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java
+++ b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/RapWorkbenchAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * 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.
@@ -24,6 +24,8 @@ import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 /** Eclipse RAP specific workbench advisor */
 public class RapWorkbenchAdvisor extends WorkbenchAdvisor {
        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, null);
 
@@ -33,14 +35,14 @@ public class RapWorkbenchAdvisor extends WorkbenchAdvisor {
                this.username = username;
        }
 
-       
        @Override
        public void initialize(IWorkbenchConfigurer configurer) {
                super.initialize(configurer);
-               configurer.setSaveAndRestore(true);
+               Boolean saveAndRestore = Boolean.parseBoolean(System.getProperty(
+                               SAVE_AND_RESTORE_PROPERTY, "false"));
+               configurer.setSaveAndRestore(saveAndRestore);
        }
 
-
        public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
                        IWorkbenchWindowConfigurer configurer) {
                return new RapWindowAdvisor(configurer, username);