FCL/sftools/dev/ide/carbidecpp: comparison debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java

equal deleted inserted replaced

-:aa3898248f39
+:f0a9f2d04d4a
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.ui.IDebugUIConstants;
 import org.osgi.framework.Bundle;
-import org.osgi.service.prefs.Preferences;
 import com.freescale.cdt.debug.cw.core.RemoteConnectionsTRKHelper;
 import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
 import com.nokia.carbide.remoteconnections.interfaces.IConnectedService;
 import com.nokia.carbide.remoteconnections.interfaces.IConnection;
 import com.nokia.carbide.remoteconnections.interfaces.IService;
 import com.nokia.carbide.remoteconnections.internal.api.IConnectedService2;
 import com.nokia.carbide.remoteconnections.internal.registry.Registry;
 import com.nokia.cdt.debug.cw.symbian.SettingsData;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
 import com.nokia.cdt.internal.debug.launch.wizard.LaunchOptions;
 import com.nokia.cpp.internal.api.utils.core.TextUtils;
 import cwdbg.PreferenceConstants;
 /**
 * Data manipulated by the launch wizard and its dialogs.
 */
 @SuppressWarnings("restriction")
-public class LaunchWizardData extends LaunchOptions {
+public class LaunchWizardData extends LaunchOptions implements
+		IWizardData,
+		IConnectionWizardData,
+		IDebugRunProcessWizardData,
+		IOtherSettingsWizardData {
 	/**
 	 * This plugin is only shipped in internal layouts and is used as a fallback
 	 * to determine whether Sys TRK is more likely to be available than App TRK
 	 * if we cannot otherwise tell.
 	 */
 		 * @return Error string or <code>null</code> if is valid
 		 */
 		String isValidPath(IPath path);
 	}
-	private final IService service;
+	private IService service;
 	// overall target
 	public static class LaunchType {
 		private final String launchId;
 	};
 	public final static LaunchType APP_TRK = new LaunchType(null);
 	public final static LaunchType SYS_TRK = new LaunchType(null);
 	public final static LaunchType ATTACH_TO_PROCESS_LAUNCH = new LaunchType(null);
-	// settings made in Debug/Run Process section
-	enum EExeSelection {
-		USE_PROJECT_EXECUTABLE,
-		USE_REMOTE_EXECUTABLE,
-		ATTACH_TO_PROCESS,
-	};
 	private EExeSelection exeSelection;
 	private IPath exeSelectionPath = Path.EMPTY;
 	private EBuildBeforeLaunchOption buildBeforeLaunch;
 	private boolean installPackage;
 	private String sisPath;
 	private IConnection connection;
 	private List<IPath> launchableExes;
-	// settings made in the Other Settings section
+	public LaunchWizardData() {
-	enum EBuildBeforeLaunchOption {
+	}
-		ALWAYS,
-		NEVER,
+	public void initialize(LaunchOptions launchOptions) {
-		USE_WORKSPACE_SETTING,
-	}
-	public LaunchWizardData(LaunchOptions launchOptions, IService dbgService) {
 		this.mmps = launchOptions.mmps;
 		this.exes = launchOptions.exes;
 		this.defaultExecutable = launchOptions.defaultExecutable;
 		this.project = launchOptions.project;
 		this.configurationName = launchOptions.configurationName;
 		this.isEmulation = launchOptions.isEmulation;
 		this.emulatorOnly = launchOptions.emulatorOnly;
 		this.mode = launchOptions.mode;
-		this.service = dbgService;
+		service = LaunchPlugin.getRunModeDebugService();
 	}
 	/**
 	 * @return the service
 	 */
 		return buildBeforeLaunch;
 	}
 	/** Get current workspace setting */
 	public boolean isWorkspaceBuildBeforeLaunch() {
-		// here's how to get the prefs from a plugin's #getPreferenceStore() without violating access
+		return WizardDataUtils.isWorkspaceBuildBeforeLaunch();
-		String prefId = IDebugUIConstants.PREF_BUILD_BEFORE_LAUNCH;
-		int idx = prefId.lastIndexOf('.');
-		String plugin = prefId.substring(0, idx);
-		Preferences node = Platform.getPreferencesService().getRootNode().node(InstanceScope.SCOPE).node(plugin);
-		return node.getBoolean(prefId, true);
 	}
 	/** Get actual launch-time setting */
 	public boolean isCurrentBuildBeforeLaunch() {
 		if (buildBeforeLaunch != EBuildBeforeLaunchOption.USE_WORKSPACE_SETTING)
 		launchOptions.project = project;
 		launchOptions.configurationName = configurationName;
 		launchOptions.isEmulation = isEmulation;
 		launchOptions.emulatorOnly = emulatorOnly;
 		launchOptions.mode = mode;
-		LaunchWizardData d = new LaunchWizardData(launchOptions, service);
+		LaunchWizardData d = new LaunchWizardData();
+		d.initialize(launchOptions);
 		d.exeSelection = exeSelection;
 		d.exeSelectionPath = exeSelectionPath;
 		d.buildBeforeLaunch = buildBeforeLaunch;
 		d.installPackage = installPackage;
 		d.sisPath = sisPath;
 		d.connection = connection;
+		d.service = service;
 		return d;
 	}
 	/**
 	 * Apply the given data to the receiver (when a transient dialog is accepted)
 	 * @param dialogData
 	 */
-	public void apply(LaunchWizardData dialogData) {
+	public void apply(IWizardData launchWizardData) {
+		LaunchWizardData dialogData = (LaunchWizardData) launchWizardData;
 		exeSelection = dialogData.exeSelection;
 		exeSelectionPath = dialogData.exeSelectionPath;
 		buildBeforeLaunch = dialogData.buildBeforeLaunch;
 		installPackage = dialogData.installPackage;
 		sisPath = dialogData.sisPath;
 			buildBeforeLaunchValue = ICDTLaunchConfigurationConstants.BUILD_BEFORE_LAUNCH_ENABLED;
 			break;
 		}
 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_BUILD_BEFORE_LAUNCH, buildBeforeLaunchValue);
 	}
 }

changeset 2163	f0a9f2d04d4a
parent 2160	3a82092877ea