restorable="true">
</view>
</extension-->
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="menu:org.eclipse.ui.main.menu.help">
- <command
- commandId="org.eclipse.ui.help.helpContents"
- label="%command.label.13"
- style="push">
- </command>
- <command
- commandId="org.eclipse.ui.help.helpSearch"
- label="%command.label.14"
- style="push">
- </command>
- <separator
- name="eu.etaxonomy.taxeditor.ui.help.separator0"
- visible="true">
- </separator>
- <command
- commandId="org.eclipse.ui.help.dynamicHelp"
- label="%command.label.15"
- style="push">
- </command>
- <separator
- name="eu.etaxonomy.taxeditor.ui.help.separator1"
- visible="true">
- </separator>
- <command
- commandId="eu.etaxonomy.taxeditor.update"
- label="%command.label.17"
- style="push">
- </command>
- <separator
- name="eu.etaxonomy.taxeditor.ui.help.separator2"
- visible="true">
- </separator>
- <command
- commandId="org.eclipse.ui.help.aboutAction"
- label="%command.label.19">
- </command>
- </menuContribution>
- </extension>
<extension
id="product"
point="org.eclipse.core.runtime.products">
</property>
</product>
</extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- defaultHandler="eu.etaxonomy.taxeditor.update.UpdateHandler"
- id="eu.etaxonomy.taxeditor.update"
- name="%command.label.17">
- </command>
- <command
- defaultHandler="eu.etaxonomy.taxeditor.update.InstallNewSoftwareHandler"
- id="eu.etaxonomy.taxeditor.install"
- name="%command.label.18">
- </command>
- </extension>
<extension
org.eclipse.e4.ui.workbench,
org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0",
org.eclipse.e4.core.di.annotations;bundle-version="1.5.0",
- org.apache.log4j;bundle-version="1.2.15"
+ org.apache.log4j;bundle-version="1.2.15",
+ org.eclipse.equinox.p2.ui,
+ org.eclipse.equinox.p2.metadata;bundle-version="2.3.100",
+ org.eclipse.equinox.p2.operations;bundle-version="2.4.200"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
</children>
</children>
<children xsi:type="menu:Menu" xmi:id="_FaGnvyQNEeen_7LZsZSNoA" elementId="eu.etaxonomy.taxeditor.workbench.menu.help" label="%menu.label.2">
- <children xsi:type="menu:HandledMenuItem" xmi:id="_dTyBcCQsEeeq76l4saMAFQ" elementId="id.commandlabel16" label="%command.label.16" command="_UZ_WQCQsEeeq76l4saMAFQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_d0m2kCQsEeeq76l4saMAFQ" elementId="id.commandlabel20" label="%command.label.20" command="_UZ2zYCQsEeeq76l4saMAFQ"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_3cDNACQ7EeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.workbench.menu.help.help_contents" label="%command.label.13" command="_xOYw4CQ7EeeKsvEah5BAoQ"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_HqntYCQ8EeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.workbench.menu.help.search" label="%command.label.14" command="_-t3NwCQ7EeeKsvEah5BAoQ"/>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_7NbM4CQ7EeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.workbench.menuseparator.0"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_Wg-doCQ8EeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.workbench.menu.help.dynamic" label="%command.label.15" command="_UIXAcCQ8EeeKsvEah5BAoQ"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_dTyBcCQsEeeq76l4saMAFQ" elementId="eu.etaxonomy.taxeditor.workbench.menu.help.parser" label="%command.label.16" command="_UZ_WQCQsEeeq76l4saMAFQ"/>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_QZlooCQ8EeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.workbench.menuseparator.1"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_JCjXYCRBEeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.workbench.handledmenuitem.commandlabel17" label="%command.label.17" command="_rSmScCQ8EeeKsvEah5BAoQ"/>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_moFrICQ8EeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.workbench.menuseparator.2"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_MtO5YCRBEeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.workbench.handledmenuitem.commandlabel19" label="%command.label.19" command="_tmIbUCQ8EeeKsvEah5BAoQ"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_d0m2kCQsEeeq76l4saMAFQ" elementId="eu.etaxonomy.taxeditor.workbench.menu.help.about_edit" label="%command.label.20" command="_UZ2zYCQsEeeq76l4saMAFQ"/>
</children>
</elements>
</fragments>
<elements xsi:type="commands:Command" xmi:id="_UZ_WQCQsEeeq76l4saMAFQ" elementId="eu.etaxonomy.taxeditor.workbench.help.parser" commandName="%command.name"/>
<elements xsi:type="commands:Command" xmi:id="_VawPsCQsEeeq76l4saMAFQ" elementId="eu.etaxonomy.taxeditor.workbench.DatabaseSettings" commandName="%command.label.23"/>
<elements xsi:type="commands:Command" xmi:id="_Va29YCQsEeeq76l4saMAFQ" elementId="eu.etaxonomy.taxeditor.workbench.DatabaseRepairFunctionality" commandName="%command.label.24"/>
+ <elements xsi:type="commands:Command" xmi:id="_xOYw4CQ7EeeKsvEah5BAoQ" elementId="org.eclipse.ui.help.helpContents" commandName="%command.label.13"/>
+ <elements xsi:type="commands:Command" xmi:id="_-t3NwCQ7EeeKsvEah5BAoQ" elementId="org.eclipse.ui.help.helpSearch" commandName="%command.label.14"/>
+ <elements xsi:type="commands:Command" xmi:id="_UIXAcCQ8EeeKsvEah5BAoQ" elementId="org.eclipse.ui.help.dynamicHelp" commandName="%command.label.15"/>
+ <elements xsi:type="commands:Command" xmi:id="_rSmScCQ8EeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.update" commandName="%command.label.17"/>
+ <elements xsi:type="commands:Command" xmi:id="_tmIbUCQ8EeeKsvEah5BAoQ" elementId="org.eclipse.ui.help.aboutAction" commandName="%command.label.19"/>
+ <elements xsi:type="commands:Command" xmi:id="_koenACRAEeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.install" commandName="%command.label.18"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_WLNcQCQsEeeq76l4saMAFQ" featurename="handlers" parentElementId="org.eclipse.e4.legacy.ide.application">
<elements xsi:type="commands:Handler" xmi:id="_WLNcQSQsEeeq76l4saMAFQ" elementId="eu.etaxonomy.taxeditor.OpenExternalAboutPlatformHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.workbench/eu.etaxonomy.taxeditor.workbench.OpenExternalAboutPlatformHandler" command="_UZ2zYCQsEeeq76l4saMAFQ"/>
<elements xsi:type="commands:Handler" xmi:id="_WLNcQiQsEeeq76l4saMAFQ" elementId="eu.etaxonomy.taxeditor.OpenExternalParserHelpHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.workbench/eu.etaxonomy.taxeditor.workbench.OpenExternalParserHelpHandler" command="_UZ_WQCQsEeeq76l4saMAFQ"/>
<elements xsi:type="commands:Handler" xmi:id="_WLNcQyQsEeeq76l4saMAFQ" elementId="eu.etaxonomy.taxeditor.handler.OpenDatabaseRepairWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.OpenDatabaseRepairWizardHandler" command="_Va29YCQsEeeq76l4saMAFQ"/>
<elements xsi:type="commands:Handler" xmi:id="_WLNcRCQsEeeq76l4saMAFQ" elementId="eu.etaxonomy.taxeditor.handler.OpenDatabasePreferencesWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.OpenDatabasePreferencesWizardHandler" command="_VawPsCQsEeeq76l4saMAFQ"/>
+ <elements xsi:type="commands:Handler" xmi:id="_S6Rf4CRAEeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.update.InstallNewSoftwareHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.workbench/eu.etaxonomy.taxeditor.workbench.update.InstallNewSoftwareHandler" command="_koenACRAEeeKsvEah5BAoQ"/>
+ <elements xsi:type="commands:Handler" xmi:id="_uzAhUCRAEeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.update.UpdateHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.workbench/eu.etaxonomy.taxeditor.workbench.update.UpdateHandler" command="_rSmScCQ8EeeKsvEah5BAoQ"/>
</fragments>
</fragment:ModelFragments>
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package eu.etaxonomy.taxeditor.update;
+package eu.etaxonomy.taxeditor.workbench.update;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob;
/**
* InstallNewSoftwareHandler invokes the install wizard
- *
+ *
* @since 3.5
*/
public class InstallNewSoftwareHandler extends PreloadingRepositoryHandler {
super();
}
- protected void doExecute(LoadMetadataRepositoryJob job) {
+ @Override
+ protected void doExecute(LoadMetadataRepositoryJob job) {
getProvisioningUI().openInstallWizard(null, null, job);
}
- protected boolean waitForPreload() {
+ @Override
+ protected boolean waitForPreload() {
// If the user cannot see repositories, then we may as well wait
- // for existing repos to load so that content is available.
- // If the user can manipulate the repositories, then we don't wait,
+ // for existing repos to load so that content is available.
+ // If the user can manipulate the repositories, then we don't wait,
// because we don't know which ones they want to work with.
return !getProvisioningUI().getPolicy().getRepositoriesVisible();
}
- protected void setLoadJobProperties(Job loadJob) {
+ @Override
+ protected void setLoadJobProperties(Job loadJob) {
super.setLoadJobProperties(loadJob);
// If we are doing a background load, we do not wish to authenticate, as the
// user is unaware that loading was needed
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package eu.etaxonomy.taxeditor.update;
+package eu.etaxonomy.taxeditor.workbench.update;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob;
import org.eclipse.equinox.p2.ui.ProvisioningUI;
import org.eclipse.swt.widgets.Shell;
/**
* PreloadingRepositoryHandler provides background loading of
* repositories before executing the provisioning handler.
- *
+ *
* @since 3.5
*/
-abstract class PreloadingRepositoryHandler extends AbstractHandler {
+abstract class PreloadingRepositoryHandler{
/**
* The constructor.
/**
* Execute the command.
*/
- public Object execute(ExecutionEvent event) {
+ @Execute
+ public Object execute() {
doExecuteAndLoad();
return null;
}
- void doExecuteAndLoad() {
+ private void doExecuteAndLoad() {
if (preloadRepositories()) {
//cancel any load that is already running
Job.getJobManager().cancel(LoadMetadataRepositoryJob.LOAD_FAMILY);
setLoadJobProperties(loadJob);
if (waitForPreload()) {
loadJob.addJobChangeListener(new JobChangeAdapter() {
- public void done(IJobChangeEvent event) {
- if (PlatformUI.isWorkbenchRunning())
- if (event.getResult().isOK()) {
+ @Override
+ public void done(IJobChangeEvent event) {
+ if (PlatformUI.isWorkbenchRunning()) {
+ if (event.getResult().isOK()) {
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
doExecute(loadJob);
}
});
}
+ }
}
});
loadJob.setUser(true);
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package eu.etaxonomy.taxeditor.update;
+package eu.etaxonomy.taxeditor.workbench.update;
import org.eclipse.equinox.internal.p2.ui.dialogs.UpdateSingleIUWizard;
import org.eclipse.equinox.p2.operations.RepositoryTracker;