[Esbox-commits] r1222 - in branches/work_Ed/org.maemo.esbox.scratchbox.sb2: conf src/org/maemo/esbox/internal/api/scratchbox/sb2/core src/org/maemo/esbox/internal/scratchbox/sb2 src/org/maemo/esbox/internal/scratchbox/sb2/core src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-02-13 17:55:23 +0200 (Fri, 13 Feb 2009)
New Revision: 1222

Modified:
   branches/work_Ed/org.maemo.esbox.scratchbox.sb2/conf/sb2_prefs.xml
   branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/api/scratchbox/sb2/core/SB2PreferenceConstants.java
   branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/Activator.java
   branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java
   branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java
Log:
Merge rev 1206 from trunk

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb2/conf/sb2_prefs.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb2/conf/sb2_prefs.xml	2009-02-13 08:57:24 UTC (rev 1221)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb2/conf/sb2_prefs.xml	2009-02-13 15:55:23 UTC (rev 1222)
@@ -11,7 +11,6 @@
 		adjust ESboxPreferenceInitializer#RPEFS_VERSION_MINOR -->
 
 	<entry key="SB2_MAPPING_MODE">devel</entry>
-	<entry key="SB2_INSTALL_MAPPING_MODE">emulate</entry>
 	<entry key="SB2_EMULATE_MAPPING_MODE">emulate</entry>
 	<entry key="SB2_LOG_LEVEL"></entry>
 	

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/api/scratchbox/sb2/core/SB2PreferenceConstants.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/api/scratchbox/sb2/core/SB2PreferenceConstants.java	2009-02-13 08:57:24 UTC (rev 1221)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/api/scratchbox/sb2/core/SB2PreferenceConstants.java	2009-02-13 15:55:23 UTC (rev 1222)
@@ -38,7 +38,6 @@
 	public static final String SB2_VERSION_ACT = "SB2_VERSION_ACT";
 	public static final String SB2_LIST_ACT = "SB2_LIST_ACT";
 	public static final String SB2_MAPPING_MODE = "SB2_MAPPING_MODE";
-	public static final String SB2_INSTALL_MAPPING_MODE = "SB2_INSTALL_MAPPING_MODE";
 	public static final String SB2_EMULATE_MAPPING_MODE = "SB2_EMULATE_MAPPING_MODE";
 	public static final String SB2_LOG_LEVEL = "SB2_LOG_LEVEL";
 	public static final String SB2_INIT_OPT_COMPILER = "SB2_INIT_OPT_COMPILER";

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/Activator.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/Activator.java	2009-02-13 08:57:24 UTC (rev 1221)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/Activator.java	2009-02-13 15:55:23 UTC (rev 1222)
@@ -259,7 +259,6 @@
 				prefProvider.getPreferenceValue(SB2PreferenceConstants.SB2_MAPPING_MODE)
 				
 		};
-//		modes.add(prefProvider.getPreferenceValue(SB2PreferenceConstants.SB2_INSTALL_MAPPING_MODE));
 		
 		for (String mode : modes) {
 			cmdLine.add(1, "-m");

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java	2009-02-13 08:57:24 UTC (rev 1221)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDKTarget.java	2009-02-13 15:55:23 UTC (rev 1222)
@@ -61,7 +61,7 @@
 	public IProcessLauncherFactory getProcessLauncherFactoryForInstall() {
 		// install mode needs to be a different mapping and also run as root
 		return new Scratchbox2ProcessLauncherFactory(this,
-					SB2PreferenceConstants.SB2_INSTALL_MAPPING_MODE, true);
+					SB2PreferenceConstants.SB2_EMULATE_MAPPING_MODE, true);
 	}
 
 	

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java	2009-02-13 08:57:24 UTC (rev 1221)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java	2009-02-13 15:55:23 UTC (rev 1222)
@@ -35,12 +35,8 @@
 	 * Field for build mapping mode
 	 */
 	private StringFieldEditor feSbox2BuildMappingMode = null;
+	
 	/**
-	 * Field for install mapping mode
-	 */
-	private StringFieldEditor feSbox2InstallMappingMode = null;
-
-	/**
 	 * Field for log level
 	 */
 	private RadioGroupFieldEditor feSbox2LogLevel = null;
@@ -73,10 +69,6 @@
 				SB2PreferenceConstants.SB2_MAPPING_MODE.toString(),
 				"Build mapping mode:", getFieldEditorParent());
 
-		feSbox2InstallMappingMode = new StringFieldEditor(
-				SB2PreferenceConstants.SB2_INSTALL_MAPPING_MODE.toString(),
-				"Install mapping mode:", getFieldEditorParent());
-
 		feSbox2EmulateMappingMode = new StringFieldEditor(
 				SB2PreferenceConstants.SB2_EMULATE_MAPPING_MODE.toString(),
 				"Emulate mapping mode:", getFieldEditorParent());
@@ -105,7 +97,6 @@
 				.setLayoutData(gridData);
 
 		addField(feSbox2BuildMappingMode);
-		addField(feSbox2InstallMappingMode);
 		addField(feSbox2EmulateMappingMode);
 		addField(feSbox2LogLevel);
 		addField(feSbox2CommandLine);
@@ -132,8 +123,7 @@
 			if (event.getSource() instanceof FieldEditor) {
 				String pref = ((FieldEditor) event.getSource()).getPreferenceName();
 				if (pref.equals(SB2PreferenceConstants.SB2_EMULATE_MAPPING_MODE)
-				|| pref.equals(SB2PreferenceConstants.SB2_MAPPING_MODE)
-				|| pref.equals(SB2PreferenceConstants.SB2_INSTALL_MAPPING_MODE)) {
+				|| pref.equals(SB2PreferenceConstants.SB2_MAPPING_MODE)) {
 					// any changes here mean that the session becomes invalid
 					refreshOnApply = true;
 				}