Bug 486279 - Refactored MarkStartedAction

Refactored MarkStartedAction to relay on Util.findBundleInfo() to find
the entry in bundles.info, rather than to try to re-construct the
BundleInfo from other data and use Object.equals()

Change-Id: Idcdbcb9b37d41cc7c956a1b5df935f883976f0f6
Signed-off-by: Todor Boev <rinsvind@gmail.com>

1 files changed, 18 insertions, 48 deletions

diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java
index d6bde28d7..0b1814cd6 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions;
 
-import java.io.File;
-import java.util.Collection;
 import java.util.Map;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -19,10 +17,7 @@ import org.eclipse.equinox.frameworkadmin.BundleInfo;
 import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;
 import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;
 import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;
-import org.eclipse.equinox.p2.core.IProvisioningAgent;
-import org.eclipse.equinox.p2.engine.IProfile;
 import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;
-import org.eclipse.equinox.p2.metadata.IArtifactKey;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.osgi.util.NLS;
 
@@ -30,70 +25,45 @@ public class MarkStartedAction extends ProvisioningAction {
 	public static final String ID = "markStarted"; //$NON-NLS-1$
 
 	public IStatus execute(Map<String, Object> parameters) {
-		IProvisioningAgent agent = (IProvisioningAgent) parameters.get(ActionConstants.PARM_AGENT);
-		IProfile profile = (IProfile) parameters.get(ActionConstants.PARM_PROFILE);
 		Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
 		IInstallableUnit iu = (IInstallableUnit) parameters.get(EclipseTouchpoint.PARM_IU);
 		String started = (String) parameters.get(ActionConstants.PARM_STARTED);
-		if (started == null)
+		if (started == null) {
 			return Util.createError(NLS.bind(Messages.parameter_not_set, ActionConstants.PARM_STARTED, ID));
+		}
 
-		Collection<IArtifactKey> artifacts = iu.getArtifacts();
-		if (artifacts == null || artifacts.isEmpty())
-			return Util.createError(NLS.bind(Messages.iu_contains_no_arifacts, iu));
-
-		IArtifactKey artifactKey = artifacts.iterator().next();
-
-		// the bundleFile might be null here, that's OK.
-		File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
-
-		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
-		if (bundleInfo == null)
+		// Changes to this object will be reflected in the backing runtime configuration store
+		BundleInfo bundleInfo = Util.findBundleInfo(manipulator.getConfigData(), iu);
+		if (bundleInfo == null) {
 			return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
+		}
 
-		if (bundleInfo.getFragmentHost() != null)
+		// Bundle fragments are not started
+		if (bundleInfo.getFragmentHost() != null) {
 			return Status.OK_STATUS;
-
-		BundleInfo[] bundles = manipulator.getConfigData().getBundles();
-		for (int i = 0; i < bundles.length; i++) {
-			if (bundles[i].equals(bundleInfo)) {
-				getMemento().put(ActionConstants.PARM_PREVIOUS_STARTED, Boolean.valueOf(bundles[i].isMarkedAsStarted()));
-				bundles[i].setMarkedAsStarted(Boolean.parseBoolean(started));
-				break;
-			}
 		}
+
+		getMemento().put(ActionConstants.PARM_PREVIOUS_STARTED, new Boolean(bundleInfo.isMarkedAsStarted()));
+		bundleInfo.setMarkedAsStarted(Boolean.valueOf(started).booleanValue());
 		return Status.OK_STATUS;
 	}
 
 	public IStatus undo(Map<String, Object> parameters) {
-		IProvisioningAgent agent = (IProvisioningAgent) parameters.get(ActionConstants.PARM_AGENT);
 		Boolean previousStarted = (Boolean) getMemento().get(ActionConstants.PARM_PREVIOUS_STARTED);
-		if (previousStarted == null)
+		if (previousStarted == null) {
 			return Status.OK_STATUS;
+		}
 
-		IProfile profile = (IProfile) parameters.get(ActionConstants.PARM_PROFILE);
 		Manipulator manipulator = (Manipulator) parameters.get(EclipseTouchpoint.PARM_MANIPULATOR);
 		IInstallableUnit iu = (IInstallableUnit) parameters.get(EclipseTouchpoint.PARM_IU);
 
-		Collection<IArtifactKey> artifacts = iu.getArtifacts();
-		if (artifacts == null || artifacts.isEmpty())
-			return Util.createError(NLS.bind(Messages.iu_contains_no_arifacts, iu));
-
-		IArtifactKey artifactKey = artifacts.iterator().next();
-		// the bundleFile might be null here, that's OK.
-		File bundleFile = Util.getArtifactFile(agent, artifactKey, profile);
-
-		BundleInfo bundleInfo = Util.createBundleInfo(bundleFile, iu);
-		if (bundleInfo == null)
+		// Changes to this object will be reflected in the backing runtime configuration store
+		BundleInfo bundleInfo = Util.findBundleInfo(manipulator.getConfigData(), iu);
+		if (bundleInfo == null) {
 			return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu));
-
-		BundleInfo[] bundles = manipulator.getConfigData().getBundles();
-		for (int i = 0; i < bundles.length; i++) {
-			if (bundles[i].equals(bundleInfo)) {
-				bundles[i].setMarkedAsStarted(previousStarted.booleanValue());
-				break;
-			}
 		}
+
+		bundleInfo.setMarkedAsStarted(previousStarted.booleanValue());
 		return Status.OK_STATUS;
 	}
 }