From 992786cb0367dd6ca79522f4eb7d1f29fe2748cc Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 1 Dec 2017 10:35:29 +0100 Subject: [PATCH] Improve single sourcing --- org.argeo.suite.apps/bnd.bnd | 8 +++-- org.argeo.suite.apps/plugin.xml | 9 +++--- org.argeo.suite.workbench.rap/bnd.bnd | 16 ++++++++-- .../workbench/parts/QuickSearchView.java | 12 ++++--- sdk/argeo_suite_desktop.properties | 31 +++++++++++++++++++ 5 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 sdk/argeo_suite_desktop.properties diff --git a/org.argeo.suite.apps/bnd.bnd b/org.argeo.suite.apps/bnd.bnd index 9b62a3f..077a108 100644 --- a/org.argeo.suite.apps/bnd.bnd +++ b/org.argeo.suite.apps/bnd.bnd @@ -4,9 +4,11 @@ cms.datamodel; filter:="(name=tracker)" Bundle-Activator: org.argeo.suite.workbench.AsUiPlugin Bundle-SymbolicName: org.argeo.suite.apps;singleton:=true -Require-Bundle: org.eclipse.core.runtime,\ - org.eclipse.rap.ui,\ - org.eclipse.rap.ui.workbench +#Require-Bundle: org.eclipse.core.runtime,\ +# org.eclipse.rap.ui,\ +# org.eclipse.rap.ui.workbench +#Require-Bundle: org.eclipse.core.runtime,\ +#org.eclipse.core.commands Import-Package:\ javax.jcr.nodetype,\ diff --git a/org.argeo.suite.apps/plugin.xml b/org.argeo.suite.apps/plugin.xml index 01657b7..8e8c5f1 100644 --- a/org.argeo.suite.apps/plugin.xml +++ b/org.argeo.suite.apps/plugin.xml @@ -2,6 +2,7 @@ + @@ -39,6 +40,7 @@ + - - @@ -74,4 +74,5 @@ themeId="org.eclipse.rap.rwt.theme.Default" file="theme/argeo-classic/workbench-ext.css" /> + --> diff --git a/org.argeo.suite.workbench.rap/bnd.bnd b/org.argeo.suite.workbench.rap/bnd.bnd index 4d0e1e7..07ba246 100644 --- a/org.argeo.suite.workbench.rap/bnd.bnd +++ b/org.argeo.suite.workbench.rap/bnd.bnd @@ -1,13 +1,22 @@ Bundle-Activator: org.argeo.suite.workbench.AsUiPlugin Bundle-SymbolicName: org.argeo.suite.workbench.rap;singleton:=true -Require-Bundle: org.eclipse.core.runtime,\ - org.eclipse.rap.ui,\ - org.eclipse.rap.ui.workbench +#Require-Bundle: org.eclipse.core.runtime,\ +# org.eclipse.rap.ui,\ +# org.eclipse.rap.ui.workbench +Require-Bundle: org.eclipse.core.runtime,\ +org.eclipse.core.commands + Bundle-ActivationPolicy: lazy Import-Package:\ javax.jcr.nodetype,\ javax.jcr.security,\ +org.eclipse.core.runtime.jobs,\ +org.eclipse.jface.window,\ +org.eclipse.jface.dialogs,\ +org.eclipse.swt,\ +org.eclipse.swt.widgets,\ +org.eclipse.ui.services,\ org.argeo.activities,\ org.argeo.activities.workbench.parts,\ org.argeo.cms,\ @@ -26,4 +35,5 @@ org.argeo.people.workbench.rap.parts,\ org.argeo.node,\ org.argeo.util,\ jxl.*;resolution:=optional,\ +org.argeo.cms.ui.workbench.rap;resolution:=optional,\ * \ No newline at end of file diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java index 950b7c5..89de0eb 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/QuickSearchView.java @@ -26,8 +26,8 @@ import org.argeo.connect.workbench.util.JcrViewerDClickListener; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; import org.argeo.people.PeopleService; -import org.argeo.suite.workbench.SuiteWorkbenchException; import org.argeo.suite.workbench.AsUiPlugin; +import org.argeo.suite.workbench.SuiteWorkbenchException; import org.argeo.suite.workbench.internal.EntitySingleColumnLabelProvider; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; @@ -45,6 +45,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.Text; import org.eclipse.ui.part.ViewPart; /** A table with a quick search field. */ @@ -62,7 +63,7 @@ public class QuickSearchView extends ViewPart implements Refreshable { // This page widgets private TableViewer entityViewer; - private DelayedText filterTxt; + private Text filterTxt; @Override public void createPartControl(Composite parent) { @@ -79,15 +80,16 @@ public class QuickSearchView extends ViewPart implements Refreshable { // Use a delayed text: the query won't be done until the user stop // typing for 800ms int style = SWT.BORDER | SWT.SEARCH | SWT.ICON_CANCEL; - filterTxt = new DelayedText(parent, style, ConnectUiConstants.SEARCH_TEXT_DELAY); + DelayedText delayedText = new DelayedText(parent, style, ConnectUiConstants.SEARCH_TEXT_DELAY); + filterTxt = delayedText.getText(); filterTxt.setLayoutData(EclipseUiUtils.fillWidth()); final ServerPushSession pushSession = new ServerPushSession(); - filterTxt.addDelayedModifyListener(pushSession, new ModifyListener() { + delayedText.addDelayedModifyListener(pushSession, new ModifyListener() { private static final long serialVersionUID = 5003010530960334977L; public void modifyText(ModifyEvent event) { - filterTxt.getDisplay().asyncExec(new Runnable() { + delayedText.getText().getDisplay().asyncExec(new Runnable() { @Override public void run() { refreshFilteredList(); diff --git a/sdk/argeo_suite_desktop.properties b/sdk/argeo_suite_desktop.properties new file mode 100644 index 0000000..2a5f231 --- /dev/null +++ b/sdk/argeo_suite_desktop.properties @@ -0,0 +1,31 @@ +argeo.osgi.start.2.http=org.eclipse.equinox.http.servlet,org.eclipse.equinox.http.jetty,\ +org.eclipse.rap.rwt.osgi,org.eclipse.equinox.cm + +argeo.osgi.start.3.node=org.argeo.cms +argeo.osgi.start.4.apps=org.eclipse.gemini.blueprint.extender +argeo.osgi.start.5.workbench=org.eclipse.equinox.http.registry + +argeo.osgi.start.5.apps=org.argeo.suite.apps + +## Rap Workbench configuration +## Open the user admin page by default when opening the workbench +org.argeo.security.ui.initialPerspective=org.argeo.suite.workbench.rap.dashboardPerspective +# Use the WorkbenchAppService to open a default home page +org.argeo.ui.openHomeCommandId=org.argeo.connect.ui.openDefaultEditor + +## JCR BACKEND +argeo.node.repo.type=h2 + +### Jetty - test URL: http://localhost:7070 +org.osgi.service.http.port=7070 + + +log4j.configuration=file:../../log4j.properties + +# SECURITY +java.security.manager= +java.security.policy=file:../../all.policy + +# DON'T CHANGE BELOW +eclipse.application=org.argeo.cms.ui.workbench.rcp.secureUi +org.eclipse.equinox.http.jetty.autostart=false -- 2.30.2