ref #6566 Migrate Sessions view

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 94cb1ed3309f428f4a0be2438aba43eec24f3365..ceacc4063fd4565ce8babb0c596e13d2eebd5948 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
 Bundle-Version: 4.7.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
+Bundle-Localization: OSGI-INF/l10n/bundle
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.cdm.database,
  eu.etaxonomy.taxeditor.datasource,
@@ -71,8 +72,21 @@ Require-Bundle: org.eclipse.osgi,
  org.eclipse.core.databinding.observable,
  org.eclipse.core.databinding.property,
  org.eclipse.jface.databinding,
- org.eclipse.e4.core.di.annotations;bundle-version="1.5.0"
+ org.eclipse.jdt.annotation;bundle-version="1.1.100",
+ eu.etaxonomy.taxeditor.workbench,
+ org.eclipse.e4.core.di.annotations;bundle-version="1.5.0",
+ org.eclipse.e4.ui.di;bundle-version="1.1.100",
+ org.eclipse.e4.ui.workbench,
+ org.eclipse.e4.core.di,
+ org.eclipse.e4.core.commands;bundle-version="0.11.100",
+ org.eclipse.e4.ui.services;bundle-version="1.2.100",
+ org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0",
+ org.eclipse.e4.core.contexts;bundle-version="1.5.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
 Import-Package: eu.etaxonomy.taxeditor.webapp,
+ javax.annotation;version="1.0.0";resolution:=optional,
+ javax.inject;version="1.0.0",
  org.eclipse.core.commands,
  org.eclipse.core.commands.operations,
  org.eclipse.core.expressions,
@@ -94,6 +108,3 @@ Import-Package: eu.etaxonomy.taxeditor.webapp,
  org.eclipse.ui.ide.undo,
  org.osgi.framework,
  org.osgi.service.prefs;version="1.1.1"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Localization: OSGI-INF/l10n/bundle

diff --git a/eu.etaxonomy.taxeditor.store/build.properties b/eu.etaxonomy.taxeditor.store/build.properties
index d3038a6fedb22a26b84092b76348c3a2ebff4d05..65edf2e5e7b402e2cc281c79e3f5e004f861f1b9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/build.properties
+++ b/eu.etaxonomy.taxeditor.store/build.properties
@@ -11,5 +11,6 @@ bin.includes = META-INF/,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/l10n/bundle_de.properties,\
                src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties,\
-               src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+               src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties,\
+               fragment.e4xmi
 

diff --git a/eu.etaxonomy.taxeditor.store/fragment.e4xmi b/eu.etaxonomy.taxeditor.store/fragment.e4xmi
new file mode 100644 (file)
index 0000000..e71ec6b
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/fragment.e4xmi
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/descriptor/basic" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_OhwnQCTfEeeiN5lBIuqN3g">
+  <imports xsi:type="commands:Command" xmi:id="_bnVKsCZxEeeQLpuomSmVoQ" elementId="eu.etaxonomy.taxeditor.command.openPart"/>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_xVa1wCXXEeex9MwMOgUeWw" featurename="descriptors" parentElementId="org.eclipse.e4.legacy.ide.application">
+    <elements xsi:type="basic:PartDescriptor" xmi:id="_2xmxoCXXEeex9MwMOgUeWw" elementId="eu.etaxonomy.taxeditor.store.partdescriptor.sessionsView" label="%view.name.SESSIONS" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_3rW8wCXaEeex9MwMOgUeWw" featurename="children" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.window">
+    <elements xsi:type="menu:Menu" xmi:id="_RaxPUCXdEeex9MwMOgUeWw" elementId="eu.etaxonomy.taxeditor.menu.showViewXX" label="%menu.label">
+      <children xsi:type="menu:HandledMenuItem" xmi:id="_jFskQCZyEeeQLpuomSmVoQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.viewnamesessions" label="%view.name.SESSIONS" command="_bnVKsCZxEeeQLpuomSmVoQ">
+        <parameters xmi:id="_BylIUCZzEeeQLpuomSmVoQ" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.sessionView" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.store.partdescriptor.sessionsView"/>
+      </children>
+    </elements>
+  </fragments>
+</fragment:ModelFragments>

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index f6c20f2c1a58f9312fa4d1467d82aacf64df9a1e..91863f47b1e21b4ca4b0d55268a63b659adf405f 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -1488,4 +1488,12 @@
          viewerName="%viewCommandMapping.viewerName.TAXON_NODE_WIZARD">
    </viewCommandMapping>
 </extension>
+<extension
+      id="id1"
+      point="org.eclipse.e4.workbench.model">
+   <fragment
+         apply="always"
+         uri="fragment.e4xmi">
+   </fragment>
+</extension>
 </plugin>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/SessionsViewPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/SessionsViewPart.java
index a59785340249a60e5118b7f0c28bea96063a97ab..368c3ff024acd07a79d471a9a85c407a6f76ee6b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/SessionsViewPart.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/SessionsViewPart.java
@@ -11,12 +11,9 @@ package eu.etaxonomy.taxeditor.view.sessions;
 import java.text.DecimalFormat;
 import java.util.Collection;
 
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.statistics.LiveCacheStatistics;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -29,7 +26,6 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.part.ViewPart;
 import org.eclipse.wb.swt.SWTResourceManager;
 
 import eu.etaxonomy.cdm.api.cache.CdmCacher;
@@ -40,13 +36,16 @@ import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManagerObserver;
 import eu.etaxonomy.taxeditor.session.NullSession;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.statistics.LiveCacheStatistics;
 
 /**
  * @author cmathew
  * @date 16 Feb 2015
  *
  */
-public class SessionsViewPart extends ViewPart implements ICdmEntitySessionManagerObserver {
+public class SessionsViewPart implements ICdmEntitySessionManagerObserver {
 
     public static final String ID = "eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart"; //$NON-NLS-1$
     public static final String OPEN_INSPECT_SESSIONS_DIALOG_ID =  "eu.etaxonomy.taxeditor.store.open.InspectSessionsDialog";
@@ -62,6 +61,7 @@ public class SessionsViewPart extends ViewPart implements ICdmEntitySessionManag
     private Text txtCdmModelOnDisk;
     private Text txtDefaultOnDisk;
 
+    @Inject
     public SessionsViewPart() {
         this.cdmEntitySessionManager = CdmStore.getCurrentSessionManager();
         if(cdmEntitySessionManager != null) {
@@ -73,7 +73,7 @@ public class SessionsViewPart extends ViewPart implements ICdmEntitySessionManag
      * Create contents of the view part.
      * @param parent
      */
-    @Override
+    @PostConstruct
     public void createPartControl(Composite parent) {
         Composite container = new Composite(parent, SWT.NONE);
         container.setLayout(new GridLayout(5, false));
@@ -229,8 +229,6 @@ public class SessionsViewPart extends ViewPart implements ICdmEntitySessionManag
         }
 
         createActions();
-        initializeToolBar();
-        initializeMenu();
     }
 
     /**
@@ -340,23 +338,5 @@ public class SessionsViewPart extends ViewPart implements ICdmEntitySessionManag
         return "";
     }
 
-    /**
-     * Initialize the toolbar.
-     */
-    private void initializeToolBar() {
-        IToolBarManager toolbarManager = getViewSite().getActionBars().getToolBarManager();
-    }
-
-    /**
-     * Initialize the menu.
-     */
-    private void initializeMenu() {
-        IMenuManager menuManager = getViewSite().getActionBars().getMenuManager();
-    }
-
-    @Override
-    public void setFocus() {
-        // Set the focus
-    }
 
 }