ref #6566 Migrate help menu

[taxeditor.git] / eu.etaxonomy.taxeditor.workbench / src / eu / etaxonomy / taxeditor / workbench / update / PreloadingRepositoryHandler.java

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 716482c937756647b65dcdf37946dcd06c0a63d8..895e576bb2f8f76f709e95e62d8f2de0db103be2 100644 (file)
--- 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);