From 32bcfaafbca58d2b808d7d326ab772a85e84999a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 17 Jan 2011 07:20:36 +0000
Subject: [PATCH] Fix RAP target platform

git-svn-id: https://svn.argeo.org/commons/trunk@4039 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.eclipse.dep.common/pom.xml      |  4 --
 .../org.argeo.security.ui.rap-maven.target    | 22 -----------
 .../rcp/RapSecureWorkbenchWindowAdvisor.java  |  6 +--
 .../org/argeo/security/ui/rcp/SecureRap.java  | 37 +------------------
 4 files changed, 5 insertions(+), 64 deletions(-)

diff --git a/eclipse/features/org.argeo.eclipse.dep.common/pom.xml b/eclipse/features/org.argeo.eclipse.dep.common/pom.xml
index 7c0a8455a..dc36808a3 100644
--- a/eclipse/features/org.argeo.eclipse.dep.common/pom.xml
+++ b/eclipse/features/org.argeo.eclipse.dep.common/pom.xml
@@ -47,9 +47,5 @@
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>org.eclipse.equinox.security</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.equinox</groupId>
-			<artifactId>org.eclipse.equinox.security.ui</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rap/org.argeo.security.ui.rap-maven.target b/security/eclipse/plugins/org.argeo.security.ui.rap/org.argeo.security.ui.rap-maven.target
index 9b9a29794..9502d22ad 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rap/org.argeo.security.ui.rap-maven.target
+++ b/security/eclipse/plugins/org.argeo.security.ui.rap/org.argeo.security.ui.rap-maven.target
@@ -129,14 +129,8 @@
 <location path="${system_property:user.home}/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.registry.source/3.5.0.v20100503" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.security/1.0.200" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.security.source/1.0.200" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.security.ui/1.0.200" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.security.ui.source/1.0.200" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/eclipse/help/org.eclipse.help/3.5.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/eclipse/help/org.eclipse.help.source/3.5.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/eclipse/jface/org.eclipse.jface/3.6.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/eclipse/jface/org.eclipse.jface.source/3.6.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/eclipse/jface/org.eclipse.jface.databinding/1.4.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/eclipse/jface/org.eclipse.jface.databinding.source/1.4.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/eclipse/osgi/org.eclipse.osgi/3.6.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/eclipse/osgi/org.eclipse.osgi.source/3.6.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/eclipse/osgi/org.eclipse.osgi.services/3.3.0.v20101018" type="Directory"/>
@@ -165,11 +159,6 @@
 <location path="${system_property:user.home}/.m2/repository/org/eclipse/rap/org.eclipse.rap.ui.views.source/1.3.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/eclipse/rap/org.eclipse.rap.ui.workbench/1.3.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/eclipse/rap/org.eclipse.rap.ui.workbench.source/1.3.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/eclipse/swt/org.eclipse.swt/3.6.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/eclipse/ui/org.eclipse.ui/3.6.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/eclipse/ui/org.eclipse.ui.source/3.6.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/eclipse/ui/org.eclipse.ui.workbench/3.6.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/eclipse/ui/org.eclipse.ui.workbench.source/3.6.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/junit/com.springsource.junit/3.8.2" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/junit/com.springsource.junit.source/3.8.2" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/mortbay/jetty/org.mortbay.jetty.server/6.1.23" type="Directory"/>
@@ -337,14 +326,8 @@
 <plugin id="org.eclipse.equinox.registry.source"/>
 <plugin id="org.eclipse.equinox.security"/>
 <plugin id="org.eclipse.equinox.security.source"/>
-<plugin id="org.eclipse.equinox.security.ui"/>
-<plugin id="org.eclipse.equinox.security.ui.source"/>
 <plugin id="org.eclipse.help"/>
 <plugin id="org.eclipse.help.source"/>
-<plugin id="org.eclipse.jface"/>
-<plugin id="org.eclipse.jface.source"/>
-<plugin id="org.eclipse.jface.databinding"/>
-<plugin id="org.eclipse.jface.databinding.source"/>
 <plugin id="org.eclipse.osgi"/>
 <plugin id="org.eclipse.osgi.source"/>
 <plugin id="org.eclipse.osgi.services"/>
@@ -373,11 +356,6 @@
 <plugin id="org.eclipse.rap.ui.views.source"/>
 <plugin id="org.eclipse.rap.ui.workbench"/>
 <plugin id="org.eclipse.rap.ui.workbench.source"/>
-<plugin id="org.eclipse.swt"/>
-<plugin id="org.eclipse.ui"/>
-<plugin id="org.eclipse.ui.source"/>
-<plugin id="org.eclipse.ui.workbench"/>
-<plugin id="org.eclipse.ui.workbench.source"/>
 <plugin id="com.springsource.junit"/>
 <plugin id="com.springsource.junit.source"/>
 <plugin id="org.mortbay.jetty.server"/>
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java b/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java
index 616858a02..bfb57b475 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java
+++ b/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/RapSecureWorkbenchWindowAdvisor.java
@@ -23,9 +23,9 @@ public class RapSecureWorkbenchWindowAdvisor extends
 		configurer.setTitle("Argeo Secure UI"); //$NON-NLS-1$
 		// Full screen, see
 		// http://dev.eclipse.org/newslists/news.eclipse.technology.rap/msg02697.html
-//		configurer.setShellStyle(SWT.NONE);
-//		Rectangle bounds = Display.getDefault().getBounds();
-//		configurer.setInitialSize(new Point(bounds.width, bounds.height));
+		configurer.setShellStyle(SWT.NONE);
+		Rectangle bounds = Display.getDefault().getBounds();
+		configurer.setInitialSize(new Point(bounds.width, bounds.height));
 	}
 
 }
diff --git a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java b/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java
index cc494485e..a426d4579 100644
--- a/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java
+++ b/security/eclipse/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureRap.java
@@ -7,14 +7,10 @@ import javax.security.auth.Subject;
 import org.argeo.security.equinox.CurrentUser;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
 public class SecureRap implements IApplication {
@@ -64,39 +60,10 @@ public class SecureRap implements IApplication {
 		});
 	}
 
-	class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
-		private static final String PERSPECTIVE_ID = "org.argeo.security.ui.securityPerspective";
-
+	class ApplicationWorkbenchAdvisor extends SecureWorkbenchAdvisor {
 		public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
 				IWorkbenchWindowConfigurer configurer) {
-			return new ApplicationWorkbenchWindowAdvisor(configurer);
-		}
-
-		public String getInitialWindowPerspectiveId() {
-			return PERSPECTIVE_ID;
-		}
-	}
-
-	class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
-		public ApplicationWorkbenchWindowAdvisor(
-				IWorkbenchWindowConfigurer configurer) {
-			super(configurer);
-		}
-
-		public ActionBarAdvisor createActionBarAdvisor(
-				IActionBarConfigurer configurer) {
-			return new ActionBarAdvisor(configurer);
-		}
-
-		public void preWindowOpen() {
-			IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-			configurer.setInitialSize(new Point(500, 300));
-			configurer.setShowCoolBar(false);
-			configurer.setShowMenuBar(false);
-			configurer.setShowStatusLine(false);
-			configurer.setTitle("Equinox Security on RAP");
+			return new RapSecureWorkbenchWindowAdvisor(configurer);
 		}
 	}
 
-- 
2.30.2