From: Cherian Mathew Date: Mon, 23 Nov 2015 17:14:45 +0000 (+0100) Subject: Remove eclipse env check X-Git-Tag: 3.12.0^2~56^2 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/7d743a995d06d98ec0054ccd047107ed469ac0a4 Remove eclipse env check --- 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 4497c34fb..ecb9d1897 100644 --- 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 @@ -19,7 +19,6 @@ import org.eclipse.equinox.internal.p2.ui.ProvUI; 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.UpdateOperation; import org.eclipse.equinox.p2.repository.IRepositoryManager; import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager; @@ -30,7 +29,6 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import eu.etaxonomy.taxeditor.TaxonomicEditorPlugin; -import eu.etaxonomy.taxeditor.model.MessagingUtils; /** * UpdateHandler invokes the check for updates UI @@ -47,17 +45,7 @@ public class UpdateHandler extends PreloadingRepositoryHandler { // check for updates checkForUpdates(operation); - - ProvisioningJob provisioningJob = operation.getProvisioningJob(null); - if (provisioningJob == null) { - MessagingUtils.messageDialog("Error in performing update", - operation, - "ProvisioningJob could not be created." + System.getProperty("line.separator") + - "Either this application does not support p2 software installation or this application has been launched from within the Eclipse IDE", - null, - false); - - } else if (getProvisioningUI().getPolicy().continueWorkingWithOperation(operation, getShell())) { + if (getProvisioningUI().getPolicy().continueWorkingWithOperation(operation, getShell())) { if (UpdateSingleIUWizard.validFor(operation)) { // Special case for only updating a single root UpdateSingleIUWizard wizard = new UpdateSingleIUWizard(getProvisioningUI(), operation); @@ -107,4 +95,5 @@ public class UpdateHandler extends PreloadingRepositoryHandler { bundleContext.ungetService(reference); } } + }