Correct update operation initialisation

[taxeditor.git] / eu.etaxonomy.taxeditor.application / src / main / java / eu / etaxonomy / taxeditor / update / UpdateHandler.java

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/UpdateHandler.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/UpdateHandler.java
index 43c6e15bb4537fbae370c9f5984a22d54669986a..57ea16bf3963e577fd31d31bed78c84b1a92ea5f 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/UpdateHandler.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/UpdateHandler.java
@@ -20,7 +20,6 @@ import org.eclipse.equinox.internal.p2.ui.dialogs.UpdateSingleIUWizard;
 import org.eclipse.equinox.p2.core.IProvisioningAgent;
 import org.eclipse.equinox.p2.core.ProvisionException;
 import org.eclipse.equinox.p2.operations.ProvisioningJob;
-import org.eclipse.equinox.p2.operations.RepositoryTracker;
 import org.eclipse.equinox.p2.operations.UpdateOperation;
 import org.eclipse.equinox.p2.repository.IRepositoryManager;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
@@ -47,15 +46,11 @@ public class UpdateHandler extends PreloadingRepositoryHandler {
         if (hasNoRepos) {
             return;
         }
-        UpdateOperation operation = getProvisioningUI().getUpdateOperation(null, null);
+        UpdateOperation operation = new UpdateOperation(ProvisioningUI.getDefaultUI().getSession());
 
         // check for updates
         IStatus status = checkForUpdates(operation);
 
-        if (status.getCode() == UpdateOperation.STATUS_NOTHING_TO_UPDATE) {
-            MessagingUtils.informationDialog("Checking for updates", status);
-            return;
-        }
 
         if (status.isOK() && status.getSeverity() != IStatus.ERROR) {
 
@@ -85,6 +80,8 @@ public class UpdateHandler extends PreloadingRepositoryHandler {
                     }
                 }
             }
+        } else {
+            MessagingUtils.informationDialog("Checking for updates", status);
         }
     }
 
@@ -124,16 +121,4 @@ public class UpdateHandler extends PreloadingRepositoryHandler {
             bundleContext.ungetService(reference);
         }
     }
-
-
-    @Override
-    protected boolean preloadRepositories() {
-        hasNoRepos = false;
-        RepositoryTracker repoMan = getProvisioningUI().getRepositoryTracker();
-        if (repoMan.getKnownRepositories(getProvisioningUI().getSession()).length == 0) {
-            hasNoRepos = true;
-            return false;
-        }
-        return super.preloadRepositories();
-    }
 }