From 40776acccb8ac4457d96a4c7448cd6e5f404771c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 26 Mar 2018 15:13:56 +0200 Subject: [PATCH] Add Documents to Eclipse 4 --- org.argeo.suite.cms/META-INF/MANIFEST.MF | 13 +++------ .../OSGI-INF/documentsService.xml | 8 +++++ .../OSGI-INF/trackerMaintenanceService.xml | 7 +++++ .../OSGI-INF/trackerService.xml | 9 ++++++ org.argeo.suite.cms/bnd.bnd | 5 +++- org.argeo.suite.cms/build.properties | 5 +++- org.argeo.suite.e4.rap/META-INF/MANIFEST.MF | 3 +- org.argeo.suite.e4.rap/build.properties | 3 +- org.argeo.suite.e4/.project | 5 ++++ org.argeo.suite.e4/META-INF/MANIFEST.MF | 8 +++++ .../OSGI-INF/activitiesE4Service.xml | 1 + .../OSGI-INF/documentsE4Service.xml | 8 +++++ .../OSGI-INF/peopleE4Service.xml | 1 + .../OSGI-INF/systemE4Service.xml | 0 org.argeo.suite.e4/bnd.bnd | 2 ++ org.argeo.suite.e4/e4xmi/argeo-office.e4xmi | 6 +++- .../e4/parts/AbstractSuiteDashboard.java | 5 ++++ .../e4/parts/DefaultDashboardEditor.java | 3 ++ .../EntitySingleColumnLabelProvider.java | 29 ++----------------- 19 files changed, 79 insertions(+), 42 deletions(-) create mode 100644 org.argeo.suite.cms/OSGI-INF/documentsService.xml create mode 100644 org.argeo.suite.cms/OSGI-INF/trackerMaintenanceService.xml create mode 100644 org.argeo.suite.cms/OSGI-INF/trackerService.xml rename {org.argeo.suite.e4.rap => org.argeo.suite.e4}/OSGI-INF/activitiesE4Service.xml (91%) create mode 100644 org.argeo.suite.e4/OSGI-INF/documentsE4Service.xml rename {org.argeo.suite.e4.rap => org.argeo.suite.e4}/OSGI-INF/peopleE4Service.xml (83%) rename {org.argeo.suite.e4.rap => org.argeo.suite.e4}/OSGI-INF/systemE4Service.xml (100%) create mode 100644 org.argeo.suite.e4/bnd.bnd diff --git a/org.argeo.suite.cms/META-INF/MANIFEST.MF b/org.argeo.suite.cms/META-INF/MANIFEST.MF index e0594fc..893cb1c 100644 --- a/org.argeo.suite.cms/META-INF/MANIFEST.MF +++ b/org.argeo.suite.cms/META-INF/MANIFEST.MF @@ -4,15 +4,8 @@ Bundle-Name: Cms Bundle-SymbolicName: org.argeo.suite.cms Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Service-Component: OSGI-INF/resourcesService.xml, - OSGI-INF/activitiesService.xml, - OSGI-INF/systemAppService.xml, - OSGI-INF/userManagerService.xml, - OSGI-INF/peopleService.xml, - OSGI-INF/systemMaintenanceService.xml, - OSGI-INF/activitiesMaintenanceService.xml, - OSGI-INF/resourcesMaintenanceService.xml, - OSGI-INF/peopleMaintenanceService.xml +Service-Component: OSGI-INF/resourcesService.xml,OSGI-INF/activitiesService.xml,OSGI-INF/systemAppService.xml,OSGI-INF/userManagerService.xml,OSGI-INF/peopleService.xml,OSGI-INF/systemMaintenanceService.xml,OSGI-INF/activitiesMaintenanceService.xml,OSGI-INF/resourcesMaintenanceService.xml,OSGI-INF/peopleMaintenanceService.xml,OSGI-INF/trackerService.xml,OSGI-INF/documentsService.xml, + OSGI-INF/trackerMaintenanceService.xml Import-Package: javax.jcr;version="2.0.0", javax.transaction, org.argeo.activities;version="2.1.79.SNAPSHOT-r201803241506", @@ -21,7 +14,9 @@ Import-Package: javax.jcr;version="2.0.0", org.argeo.connect.core;version="2.1.79.SNAPSHOT-r201803241506", org.argeo.connect.resources;version="2.1.79.SNAPSHOT-r201803241506", org.argeo.connect.resources.core;version="2.1.79.SNAPSHOT-r201803241506", + org.argeo.documents.core;version="2.1.79.SNAPSHOT-r201803241506", org.argeo.people;version="2.1.79.SNAPSHOT-r201803241506", org.argeo.people.core;version="2.1.79.SNAPSHOT-r201803241506", + org.argeo.tracker.core;version="2.1.79.SNAPSHOT-r201803241506", org.osgi.service.useradmin;version="1.1.0" Bundle-ActivationPolicy: lazy diff --git a/org.argeo.suite.cms/OSGI-INF/documentsService.xml b/org.argeo.suite.cms/OSGI-INF/documentsService.xml new file mode 100644 index 0000000..c4cc045 --- /dev/null +++ b/org.argeo.suite.cms/OSGI-INF/documentsService.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/org.argeo.suite.cms/OSGI-INF/trackerMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/trackerMaintenanceService.xml new file mode 100644 index 0000000..ec9fa7c --- /dev/null +++ b/org.argeo.suite.cms/OSGI-INF/trackerMaintenanceService.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.argeo.suite.cms/OSGI-INF/trackerService.xml b/org.argeo.suite.cms/OSGI-INF/trackerService.xml new file mode 100644 index 0000000..9cb2a0d --- /dev/null +++ b/org.argeo.suite.cms/OSGI-INF/trackerService.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/org.argeo.suite.cms/bnd.bnd b/org.argeo.suite.cms/bnd.bnd index 687d79b..c3c1aa0 100644 --- a/org.argeo.suite.cms/bnd.bnd +++ b/org.argeo.suite.cms/bnd.bnd @@ -4,8 +4,11 @@ Service-Component: OSGI-INF/systemAppService.xml,\ OSGI-INF/resourcesService.xml,\ OSGI-INF/activitiesService.xml,\ OSGI-INF/peopleService.xml,\ + OSGI-INF/trackerService.xml,\ + OSGI-INF/documentsService.xml,\ OSGI-INF/systemMaintenanceService.xml,\ OSGI-INF/activitiesMaintenanceService.xml,\ OSGI-INF/resourcesMaintenanceService.xml,\ - OSGI-INF/peopleMaintenanceService.xml + OSGI-INF/peopleMaintenanceService.xml,\ + OSGI-INF/trackerMaintenanceService.xml \ No newline at end of file diff --git a/org.argeo.suite.cms/build.properties b/org.argeo.suite.cms/build.properties index f673b42..5833b74 100644 --- a/org.argeo.suite.cms/build.properties +++ b/org.argeo.suite.cms/build.properties @@ -9,5 +9,8 @@ bin.includes = META-INF/,\ OSGI-INF/systemMaintenanceService.xml,\ OSGI-INF/activitiesMaintenanceService.xml,\ OSGI-INF/resourcesMaintenanceService.xml,\ - OSGI-INF/peopleMaintenanceService.xml + OSGI-INF/peopleMaintenanceService.xml,\ + OSGI-INF/trackerService.xml,\ + OSGI-INF/documentsService.xml,\ + OSGI-INF/trackerMaintenanceService.xml source.. = src/ diff --git a/org.argeo.suite.e4.rap/META-INF/MANIFEST.MF b/org.argeo.suite.e4.rap/META-INF/MANIFEST.MF index 9656163..79e43d2 100644 --- a/org.argeo.suite.e4.rap/META-INF/MANIFEST.MF +++ b/org.argeo.suite.e4.rap/META-INF/MANIFEST.MF @@ -11,5 +11,4 @@ Import-Package: org.argeo.activities.e4, org.argeo.connect.ui;version="2.1.79.SNAPSHOT-r201803241506", org.argeo.people.e4, org.eclipse.rap.rwt.application;version="3.4.0" -Service-Component: OSGI-INF/argeo-office-rap.xml,OSGI-INF/systemE4Service.xml,OSGI-INF/activitiesE4Service.xml, - OSGI-INF/peopleE4Service.xml +Service-Component: OSGI-INF/argeo-office-rap.xml diff --git a/org.argeo.suite.e4.rap/build.properties b/org.argeo.suite.e4.rap/build.properties index 7d8239f..5cd4588 100644 --- a/org.argeo.suite.e4.rap/build.properties +++ b/org.argeo.suite.e4.rap/build.properties @@ -3,5 +3,6 @@ bin.includes = META-INF/,\ .,\ OSGI-INF/systemE4Service.xml,\ OSGI-INF/activitiesE4Service.xml,\ - OSGI-INF/peopleE4Service.xml + OSGI-INF/peopleE4Service.xml,\ + OSGI-INF/documentsE4Service.xml source.. = src/ diff --git a/org.argeo.suite.e4/.project b/org.argeo.suite.e4/.project index 78b3980..38541c0 100644 --- a/org.argeo.suite.e4/.project +++ b/org.argeo.suite.e4/.project @@ -20,6 +20,11 @@ + + org.eclipse.pde.ds.core.builder + + + org.eclipse.pde.PluginNature diff --git a/org.argeo.suite.e4/META-INF/MANIFEST.MF b/org.argeo.suite.e4/META-INF/MANIFEST.MF index 3531127..99ad621 100644 --- a/org.argeo.suite.e4/META-INF/MANIFEST.MF +++ b/org.argeo.suite.e4/META-INF/MANIFEST.MF @@ -11,17 +11,23 @@ Import-Package: javax.inject;version="1.0.0", javax.jcr.query;version="2.0.0", org.apache.commons.logging;version="1.1.1", org.argeo.activities;version="2.1.79.SNAPSHOT-r201803241506", + org.argeo.activities.e4, + org.argeo.activities.e4.parts, org.argeo.activities.ui;version="2.1.79.SNAPSHOT-r201803241506", org.argeo.cms.auth;version="2.1.73.SNAPSHOT-r201803221729", org.argeo.cms.ui.eclipse.forms;version="2.1.73.SNAPSHOT-r201803221729", org.argeo.cms.util;version="2.1.73.SNAPSHOT-r201803221729", org.argeo.connect;version="2.1.79.SNAPSHOT-r201803241506", + org.argeo.connect.e4, org.argeo.connect.e4.handlers, + org.argeo.connect.e4.parts, org.argeo.connect.resources;version="2.1.79.SNAPSHOT-r201803241506", org.argeo.connect.ui, org.argeo.connect.ui.util;version="2.1.79.SNAPSHOT-r201803241506", org.argeo.connect.ui.widgets;version="2.1.79.SNAPSHOT-r201803241506", org.argeo.connect.util;version="2.1.79.SNAPSHOT-r201803241506", + org.argeo.documents.e4, + org.argeo.documents.e4.parts, org.argeo.eclipse.ui;version="2.1.73.SNAPSHOT-r201803221729", org.argeo.jcr;version="2.1.73.SNAPSHOT-r201803221729", org.argeo.node;version="2.1.0", @@ -44,4 +50,6 @@ Import-Package: javax.inject;version="1.0.0", org.eclipse.swt.graphics, org.eclipse.swt.layout, org.eclipse.swt.widgets +Service-Component: OSGI-INF/systemE4Service.xml,OSGI-INF/activitiesE4Service.xml,OSGI-INF/peopleE4Service.xml,OSGI-INF/documentsE4Service.xml +Bundle-ActivationPolicy: lazy diff --git a/org.argeo.suite.e4.rap/OSGI-INF/activitiesE4Service.xml b/org.argeo.suite.e4/OSGI-INF/activitiesE4Service.xml similarity index 91% rename from org.argeo.suite.e4.rap/OSGI-INF/activitiesE4Service.xml rename to org.argeo.suite.e4/OSGI-INF/activitiesE4Service.xml index 109745d..f6eaccb 100644 --- a/org.argeo.suite.e4.rap/OSGI-INF/activitiesE4Service.xml +++ b/org.argeo.suite.e4/OSGI-INF/activitiesE4Service.xml @@ -3,6 +3,7 @@ + diff --git a/org.argeo.suite.e4/OSGI-INF/documentsE4Service.xml b/org.argeo.suite.e4/OSGI-INF/documentsE4Service.xml new file mode 100644 index 0000000..8cd25e0 --- /dev/null +++ b/org.argeo.suite.e4/OSGI-INF/documentsE4Service.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/org.argeo.suite.e4.rap/OSGI-INF/peopleE4Service.xml b/org.argeo.suite.e4/OSGI-INF/peopleE4Service.xml similarity index 83% rename from org.argeo.suite.e4.rap/OSGI-INF/peopleE4Service.xml rename to org.argeo.suite.e4/OSGI-INF/peopleE4Service.xml index 32c6e5f..088d454 100644 --- a/org.argeo.suite.e4.rap/OSGI-INF/peopleE4Service.xml +++ b/org.argeo.suite.e4/OSGI-INF/peopleE4Service.xml @@ -3,5 +3,6 @@ + diff --git a/org.argeo.suite.e4.rap/OSGI-INF/systemE4Service.xml b/org.argeo.suite.e4/OSGI-INF/systemE4Service.xml similarity index 100% rename from org.argeo.suite.e4.rap/OSGI-INF/systemE4Service.xml rename to org.argeo.suite.e4/OSGI-INF/systemE4Service.xml diff --git a/org.argeo.suite.e4/bnd.bnd b/org.argeo.suite.e4/bnd.bnd new file mode 100644 index 0000000..a29c7f1 --- /dev/null +++ b/org.argeo.suite.e4/bnd.bnd @@ -0,0 +1,2 @@ +Bundle-ActivationPolicy: lazy +Service-Component: OSGI-INF/systemE4Service.xml,OSGI-INF/activitiesE4Service.xml,OSGI-INF/peopleE4Service.xml,OSGI-INF/documentsE4Service.xml diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index f7fd8c9..e9e7f3d 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -9,6 +9,7 @@ minimized + entityEditorArea @@ -39,13 +40,16 @@ - + + + + diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java index 9691901..88067aa 100644 --- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java +++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java @@ -2,6 +2,7 @@ package org.argeo.suite.e4.parts; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import javax.inject.Inject; import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.Session; @@ -30,9 +31,13 @@ import org.eclipse.swt.widgets.Link; public abstract class AbstractSuiteDashboard { // DEPENDENCY INJECTION + @Inject private Repository repository; + @Inject private ResourcesService resourcesService; + @Inject private SystemAppService systemAppService; + @Inject private SystemWorkbenchService systemWorkbenchService; private Session session; diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java index d068575..3a89fea 100644 --- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java +++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java @@ -6,6 +6,7 @@ import java.util.GregorianCalendar; import java.util.List; import javax.annotation.PostConstruct; +import javax.inject.Inject; import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.Property; @@ -59,7 +60,9 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re // public final static String ID = AsUiPlugin.PLUGIN_ID + // ".defaultDashboardEditor"; + @Inject private ActivitiesService activitiesService; + @Inject private TrackerService trackerService; private String datePattern = "dd MMM yyyy"; diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/EntitySingleColumnLabelProvider.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/EntitySingleColumnLabelProvider.java index 490ae13..c075574 100644 --- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/EntitySingleColumnLabelProvider.java +++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/EntitySingleColumnLabelProvider.java @@ -22,15 +22,14 @@ import org.argeo.people.ui.providers.OrgListLabelProvider; import org.argeo.people.ui.providers.PersonListLabelProvider; import org.argeo.tracker.TrackerTypes; import org.argeo.tracker.ui.TrackerSingleColLP; -import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.swt.graphics.Image; /** * Provide a single column label provider for entity lists. Icon and displayed * text vary with the element node type */ -public class EntitySingleColumnLabelProvider implements PeopleNames, ILabelProvider { +public class EntitySingleColumnLabelProvider extends ColumnLabelProvider implements PeopleNames { private static final long serialVersionUID = 3111885324210673320L; private SystemWorkbenchService systemWorkbenchService; @@ -87,28 +86,4 @@ public class EntitySingleColumnLabelProvider implements PeopleNames, ILabelProvi return systemWorkbenchService.getIconForType((Node) element); } - @Override - public void addListener(ILabelProviderListener listener) { - // TODO Auto-generated method stub - - } - - @Override - public void dispose() { - // TODO Auto-generated method stub - - } - - @Override - public boolean isLabelProperty(Object element, String property) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void removeListener(ILabelProviderListener listener) { - // TODO Auto-generated method stub - - } - } -- 2.30.2