diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox')
3 files changed, 0 insertions, 82 deletions
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java index b0a3a9eff..fd251a3b6 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java @@ -40,8 +40,6 @@ public class Messages extends NLS { public static String BackupStore_missing_backup_directory; public static String BackupStore_not_a_directory; public static String BackupStore_restore_closed_store; - public static String BlockMacUpdate_0; - public static String BlockMacUpdate_1; public static String action_0_failed_file_1_doesNotExist; public static String artifact_not_available; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/BlockMacUpdate.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/BlockMacUpdate.java deleted file mode 100644 index 6279982ae..000000000 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/BlockMacUpdate.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * 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: - * Rapicorp, inc. - initial API and implementation - *******************************************************************************/ -package org.eclipse.equinox.internal.p2.touchpoint.natives.actions; - -import java.util.Map; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.equinox.internal.p2.touchpoint.natives.Activator; -import org.eclipse.equinox.internal.p2.touchpoint.natives.Messages; -import org.eclipse.equinox.p2.engine.spi.ProvisioningAction; -import org.eclipse.osgi.service.environment.EnvironmentInfo; -import org.osgi.framework.*; -import org.osgi.service.packageadmin.PackageAdmin; - -public class BlockMacUpdate extends ProvisioningAction { - - @Override - public IStatus execute(Map<String, Object> parameters) { - if (!runningOldMacLayout()) - return Status.OK_STATUS; - return new Status(IStatus.ERROR, Activator.ID, Messages.BlockMacUpdate_1); - } - - private boolean runningOldMacLayout() { - if (!org.eclipse.osgi.service.environment.Constants.OS_MACOSX.equals(getOS())) - return false; - Version fwkAdminVersion = getFrameworkAdminVersion(); - if (fwkAdminVersion == null) - return false; - if (fwkAdminVersion.compareTo(new Version("1.0.500.v201523")) < 0) //$NON-NLS-1$ - return true; - return false; - } - - private Version getFrameworkAdminVersion() { - ServiceReference<PackageAdmin> sr = Activator.getContext().getServiceReference(PackageAdmin.class); - if (sr == null) - return null; - PackageAdmin packageAdmin = Activator.getContext().getService(sr); - if (packageAdmin == null) - return null; - Activator.getContext().ungetService(sr); - Bundle[] bundles = packageAdmin.getBundles("org.eclipse.equinox.frameworkadmin.equinox", null); //$NON-NLS-1$ - if (bundles == null) - return null; - //Return the first bundle that is not installed or uninstalled - for (int i = 0; i < bundles.length; i++) { - if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) { - return bundles[i].getVersion(); - } - } - return null; - } - - private String getOS() { - ServiceReference<EnvironmentInfo> sr = Activator.getContext().getServiceReference(EnvironmentInfo.class); - if (sr == null) - return null; - String value = Activator.getContext().getService(sr).getOS(); - Activator.getContext().ungetService(sr); - return value; - } - - @Override - public IStatus undo(Map<String, Object> parameters) { - // TODO Auto-generated method stub - return null; - } - -} diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties index 304d40114..2df1df727 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties @@ -29,8 +29,6 @@ BackupStore_manual_restore_needed=Manual restore of backup needed for: {0} BackupStore_missing_backup_directory=Missing backup directory - can not restore: {0} BackupStore_not_a_directory=File is not a directory: {0} BackupStore_restore_closed_store=Can not perform restore on closed backup store -BlockMacUpdate_0=Installation impossible -BlockMacUpdate_1=The installation/update you are trying to perform can not completed because of structural changes to Eclipse. The installation/update will fail and will leave your existing eclipse installation intact. You need to retrieve a new version of Eclipse from http://download.eclipse.org/. action_0_failed_file_1_doesNotExist=The action {0} failed - file {1} does not exist artifact_not_available=The artifact for {0} is not available. |