From 86cb759ad0ce612b138006d2c12445a3d89fce1b Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 14 Sep 2016 16:53:22 +0000
Subject: [PATCH] Improve workbench layer

git-svn-id: https://svn.argeo.org/commons/trunk@9143 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.cms.ui.workbench.rap/bnd.bnd                   | 1 +
 org.argeo.cms.ui.workbench/bnd.bnd                       | 7 ++++++-
 .../argeo/eclipse/spring/ApplicationContextTracker.java  | 0
 .../org/argeo/eclipse/spring/SpringCommandHandler.java   | 0
 .../org/argeo/eclipse/spring/SpringExtensionFactory.java | 0
 org.argeo.eclipse.ui.workbench/bnd.bnd                   | 9 ++++-----
 .../eclipse/ui/workbench/jcr/JcrPreferenceStore.java     | 3 +--
 7 files changed, 12 insertions(+), 8 deletions(-)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/spring/ApplicationContextTracker.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/spring/SpringCommandHandler.java (100%)
 rename {org.argeo.eclipse.ui.workbench => org.argeo.cms.ui.workbench}/src/org/argeo/eclipse/spring/SpringExtensionFactory.java (100%)

diff --git a/org.argeo.cms.ui.workbench.rap/bnd.bnd b/org.argeo.cms.ui.workbench.rap/bnd.bnd
index 31a99179c..e80b9ecae 100644
--- a/org.argeo.cms.ui.workbench.rap/bnd.bnd
+++ b/org.argeo.cms.ui.workbench.rap/bnd.bnd
@@ -1,6 +1,7 @@
 Bundle-SymbolicName: org.argeo.cms.ui.workbench.rap;singleton:=true
 Bundle-Activator: org.argeo.security.ui.rap.SecureRapActivator
 Bundle-ActivationPolicy: lazy
+
 Require-Bundle: org.eclipse.rap.ui,org.eclipse.core.runtime
 
 Import-Package: org.argeo.eclipse.spring,\
diff --git a/org.argeo.cms.ui.workbench/bnd.bnd b/org.argeo.cms.ui.workbench/bnd.bnd
index 2a5b6bf67..3e0d1c69c 100644
--- a/org.argeo.cms.ui.workbench/bnd.bnd
+++ b/org.argeo.cms.ui.workbench/bnd.bnd
@@ -2,7 +2,8 @@ Bundle-SymbolicName: org.argeo.cms.ui.workbench;singleton:=true
 Bundle-Activator: org.argeo.security.ui.SecurityUiPlugin
 Bundle-ActivationPolicy: lazy
 
-Require-Bundle:	org.eclipse.core.runtime
+Require-Bundle:	org.eclipse.core.runtime,\
+org.eclipse.core.commands
 
 Import-Package:	org.argeo.cms.auth,\
 org.argeo.eclipse.spring,\
@@ -13,6 +14,10 @@ org.eclipse.swt.widgets,\
 org.eclipse.ui.services,\
 org.osgi.framework,\
 org.springframework.core,\
+org.osgi.util.tracker,\
+org.springframework.beans.factory,\
+org.springframework.core.io.support,\
+!org.eclipse.core.runtime,\
 *				
 
 
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/SpringExtensionFactory.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringExtensionFactory.java
similarity index 100%
rename from org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/spring/SpringExtensionFactory.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringExtensionFactory.java
diff --git a/org.argeo.eclipse.ui.workbench/bnd.bnd b/org.argeo.eclipse.ui.workbench/bnd.bnd
index e2e226812..26b6cf263 100644
--- a/org.argeo.eclipse.ui.workbench/bnd.bnd
+++ b/org.argeo.eclipse.ui.workbench/bnd.bnd
@@ -4,15 +4,14 @@ Bundle-Activator: org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin
 
 Require-Bundle: org.eclipse.ui;resolution:=optional,\
 org.eclipse.core.runtime,\
-org.eclipse.rap.ui;resolution:=optional,\
-org.eclipse.rap.ui.workbench;resolution:=optional
+#org.eclipse.rap.ui;resolution:=optional,\
+#org.eclipse.rap.ui.workbench;resolution:=optional
 
 Import-Package: org.argeo.eclipse.ui.specific,\
 org.eclipse.swt.widgets,\
 org.osgi.framework,\
 org.osgi.service.packageadmin,\
-org.osgi.util.tracker,\
-org.springframework.beans.factory,\
-org.springframework.core.io.support,\
 !org.eclipse.core.runtime,\
+org.eclipse.swt,\
+org.eclipse.jface.window,\
 *
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java
index 27349f95d..c90eec067 100644
--- a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java
+++ b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java
@@ -34,7 +34,6 @@ import org.argeo.jcr.ArgeoTypes;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.UserJcrUtils;
 import org.eclipse.jface.preference.PreferenceStore;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.osgi.framework.BundleContext;
 
 /**
@@ -42,7 +41,7 @@ import org.osgi.framework.BundleContext;
  * TODO: better integrate JCR and Eclipse:<br>
  * - typing<br>
  * - use eclipse preferences<br>
- * - better integrate with {@link ScopedPreferenceStore} provided by RAP
+ * - better integrate with <code>ScopedPreferenceStore</code> provided by RAP
  */
 public class JcrPreferenceStore extends PreferenceStore implements ArgeoNames {
 	private static final long serialVersionUID = 1854011367784598758L;
-- 
2.30.2