From 1104e1d6d60c94a8f645d61c5ad01a889bff5536 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner
Date: Tue, 18 Apr 2017 21:59:24 +0200
Subject: [PATCH] ref #6566 Migrate help menu
---
eu.etaxonomy.taxeditor.application/plugin.xml | 55 -------------------
.../META-INF/MANIFEST.MF | 5 +-
.../fragment.e4xmi | 20 ++++++-
.../update/InstallNewSoftwareHandler.java | 19 ++++---
.../update/PreloadingRepositoryHandler.java | 25 +++++----
.../workbench}/update/UpdateHandler.java | 2 +-
6 files changed, 48 insertions(+), 78 deletions(-)
rename {eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench}/update/InstallNewSoftwareHandler.java (83%)
rename {eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench}/update/PreloadingRepositoryHandler.java (83%)
rename {eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench}/update/UpdateHandler.java (97%)
diff --git a/eu.etaxonomy.taxeditor.application/plugin.xml b/eu.etaxonomy.taxeditor.application/plugin.xml
index 15f250c29..e6e9dea76 100644
--- a/eu.etaxonomy.taxeditor.application/plugin.xml
+++ b/eu.etaxonomy.taxeditor.application/plugin.xml
@@ -60,48 +60,6 @@
restorable="true">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -145,19 +103,6 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -86,11 +94,19 @@
+
+
+
+
+
+
+
+
diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/InstallNewSoftwareHandler.java b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/update/InstallNewSoftwareHandler.java
similarity index 83%
rename from eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/InstallNewSoftwareHandler.java
rename to eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/update/InstallNewSoftwareHandler.java
index f4e8d8a19..9d81fad1c 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/InstallNewSoftwareHandler.java
+++ b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/update/InstallNewSoftwareHandler.java
@@ -4,18 +4,18 @@
* 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 {
@@ -27,19 +27,22 @@ 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
diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/PreloadingRepositoryHandler.java b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/update/PreloadingRepositoryHandler.java
similarity index 83%
rename from eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/PreloadingRepositoryHandler.java
rename to eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/update/PreloadingRepositoryHandler.java
index 716482c93..895e576bb 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/PreloadingRepositoryHandler.java
+++ b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/update/PreloadingRepositoryHandler.java
@@ -8,13 +8,12 @@
* 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;
@@ -23,10 +22,10 @@ import org.eclipse.ui.PlatformUI;
/**
* PreloadingRepositoryHandler provides background loading of
* repositories before executing the provisioning handler.
- *
+ *
* @since 3.5
*/
-abstract class PreloadingRepositoryHandler extends AbstractHandler {
+abstract class PreloadingRepositoryHandler{
/**
* The constructor.
@@ -38,12 +37,13 @@ abstract class PreloadingRepositoryHandler extends AbstractHandler {
/**
* 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);
@@ -51,15 +51,18 @@ abstract class PreloadingRepositoryHandler extends AbstractHandler {
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);
diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/UpdateHandler.java b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/update/UpdateHandler.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/UpdateHandler.java
rename to eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/update/UpdateHandler.java
index a835cdc5c..d4327bf3f 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/UpdateHandler.java
+++ b/eu.etaxonomy.taxeditor.workbench/src/eu/etaxonomy/taxeditor/workbench/update/UpdateHandler.java
@@ -8,7 +8,7 @@
* 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;
--
2.34.1