From: Patrick Plitzner Date: Tue, 18 Apr 2017 12:42:16 +0000 (+0200) Subject: ref #6566 Initial import of taxeditor.workbench plugin - moved general menu contribut... X-Git-Tag: 4.7.0^2~71 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/2039a37e95be70c93bdb8dcdc31d3a7fb227ba1f ref #6566 Initial import of taxeditor.workbench plugin - moved general menu contributions to this plugin --- diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF index 16fe5b051..d88985647 100644 --- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF @@ -29,7 +29,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.equinox.p2.metadata.repository, org.eclipse.equinox.p2.repository, org.eclipse.e4.ui.workbench, - org.eclipse.e4.core.di.annotations;bundle-version="1.5.0" + org.eclipse.e4.core.di.annotations;bundle-version="1.5.0", + eu.etaxonomy.taxeditor.workbench;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: eu.etaxonomy.cdm.database, diff --git a/eu.etaxonomy.taxeditor.application/plugin.xml b/eu.etaxonomy.taxeditor.application/plugin.xml index e47ecf18c..15f250c29 100644 --- a/eu.etaxonomy.taxeditor.application/plugin.xml +++ b/eu.etaxonomy.taxeditor.application/plugin.xml @@ -62,25 +62,6 @@ - - - - - - - - - - - - - - - - diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF index 23e313721..02798a2d5 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF @@ -13,14 +13,16 @@ Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor, eu.etaxonomy.taxeditor.bulkeditor.input, eu.etaxonomy.taxeditor.bulkeditor.internal, eu.etaxonomy.taxeditor.bulkeditor.referencingobjects -Require-Bundle: org.eclipse.ui, +Require-Bundle: eu.etaxonomy.taxeditor.workbench, + org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.ui.editors, org.eclipse.core.expressions, eu.etaxonomy.taxeditor.store, - eu.etaxonomy.taxeditor.cdmlib + eu.etaxonomy.taxeditor.cdmlib, + org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0.v20160229-1459", + org.eclipse.e4.ui.workbench Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-ActivationPolicy: lazy Import-Package: eu.etaxonomy.taxeditor.editor, org.eclipse.core.runtime, org.eclipse.equinox.app, @@ -31,3 +33,4 @@ Import-Package: eu.etaxonomy.taxeditor.editor, org.eclipse.jface.text.source, org.eclipse.ui.views.properties, org.osgi.framework +Bundle-ActivationPolicy: lazy diff --git a/eu.etaxonomy.taxeditor.bulkeditor/fragment.e4xmi b/eu.etaxonomy.taxeditor.bulkeditor/fragment.e4xmi new file mode 100644 index 000000000..ad37de829 --- /dev/null +++ b/eu.etaxonomy.taxeditor.bulkeditor/fragment.e4xmi @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml index 6983d4811..568f70910 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml +++ b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml @@ -589,6 +589,14 @@ viewerName="%viewCommandMapping.viewerName.BULK_EDITOR"> + + + + diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml index a89023d25..c6c4e922f 100644 --- a/eu.etaxonomy.taxeditor.feature/feature.xml +++ b/eu.etaxonomy.taxeditor.feature/feature.xml @@ -135,4 +135,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml index b62e2b46c..47f3c4b64 100755 --- a/eu.etaxonomy.taxeditor.store/plugin.xml +++ b/eu.etaxonomy.taxeditor.store/plugin.xml @@ -442,7 +442,7 @@ + locationURI="menu:eu.etaxonomy.taxeditor.workbench.menu.file"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.workbench/plugin.xml b/eu.etaxonomy.taxeditor.workbench/plugin.xml new file mode 100644 index 000000000..8a49dfe4e --- /dev/null +++ b/eu.etaxonomy.taxeditor.workbench/plugin.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/Activator.java b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/Activator.java new file mode 100644 index 000000000..b84c3bb33 --- /dev/null +++ b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/Activator.java @@ -0,0 +1,50 @@ +package eu.etaxonomy.taxeditor.workbench; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.workbench"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/OpenExternalAboutPlatformHandler.java b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/OpenExternalAboutPlatformHandler.java similarity index 96% rename from eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/OpenExternalAboutPlatformHandler.java rename to eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/OpenExternalAboutPlatformHandler.java index 5dd7903bd..9f1edf1db 100644 --- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/OpenExternalAboutPlatformHandler.java +++ b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/OpenExternalAboutPlatformHandler.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor; +package eu.etaxonomy.taxeditor.workbench; import java.net.MalformedURLException; import java.net.URL; diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/OpenExternalParserHelpHandler.java b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/OpenExternalParserHelpHandler.java similarity index 96% rename from eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/OpenExternalParserHelpHandler.java rename to eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/OpenExternalParserHelpHandler.java index 40bf44244..12c9abc61 100644 --- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/OpenExternalParserHelpHandler.java +++ b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/OpenExternalParserHelpHandler.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor; +package eu.etaxonomy.taxeditor.workbench; import java.net.MalformedURLException; import java.net.URL;