Merge pull request #817 from Sloeber/issue/#806

jantje · web-flow · commit d93ab2605980 · 2017-09-12T01:10:06.000+02:00
Ui implementation for #806
diff --git a/io.sloeber.core/src/io/sloeber/core/api/BoardsManager.java b/io.sloeber.core/src/io/sloeber/core/api/BoardsManager.java
@@ -297,10 +297,7 @@ private static TreeMap<String, IPath> getExamplesFromFolder(String prefix, IPath
 		return examples;
 	}
 
-	public static void setAutoImportLibraries(boolean booleanValue) {
-		InstancePreferences.setAutomaticallyImportLibraries(booleanValue);
 
-	}
 
 	public static String[] getBoardNames(String boardFile) {
 		TxtFile theBoardsFile = new TxtFile(new File(boardFile));
@@ -357,15 +354,7 @@ private static String[] getHardwarePaths() {
 				+ ConfigurationPreferences.getInstallationPathPackages()).split(File.pathSeparator);
 	}
 
-	public static void setPrivateHardwarePaths(String[] hardWarePaths) {
-		InstancePreferences.setPrivateHardwarePaths(hardWarePaths);
-
-	}
-
-	public static void setPrivateLibraryPaths(String[] libraryPaths) {
-		InstancePreferences.setPrivateLibraryPaths(libraryPaths);
 
-	}
 
 	public static class PlatformTree {
 		private TreeMap<String, IndexFile> IndexFiles = new TreeMap<>();
@@ -685,13 +674,9 @@ public static IStatus setPlatformTree(PlatformTree platformTree, IProgressMonito
 		return status;
 	}
 
-	public static boolean getAutoImportLibraries() {
-		return InstancePreferences.getAutomaticallyImportLibraries();
-	}
 
-	public static String getPrivateHardwarePathsString() {
-		return InstancePreferences.getPrivateHardwarePathsString();
-	}
+
+
 
 	/**
 	 * returns all the menu names for all installed platforms. The return is
@@ -727,13 +712,11 @@ public static void onlyKeepLatestPlatforms() {
 
 	}
 
-	public static void setPragmaOnceHeaders(boolean booleanValue) {
-		InstancePreferences.setPragmaOnceHeaders(booleanValue);
-
+	public static void setPrivateHardwarePaths(String[] hardWarePaths) {
+		InstancePreferences.setPrivateHardwarePaths(hardWarePaths);
 	}
-
-	public static boolean getPragmaOnceHeaders() {
-		return InstancePreferences.getPragmaOnceHeaders();
+	public static String getPrivateHardwarePathsString() {
+		return InstancePreferences.getPrivateHardwarePathsString();
 	}
 
 }
diff --git a/io.sloeber.core/src/io/sloeber/core/api/Defaults.java b/io.sloeber.core/src/io/sloeber/core/api/Defaults.java
@@ -35,4 +35,8 @@ public static String getPrivateHardwarePath() {
 	public static String getDefaultUploadProtocol() {
 		return DEFAULT;
 	}
+
+	public static boolean  getUseArduinoToolSelection() {
+		return true;
+	}
 }
diff --git a/io.sloeber.core/src/io/sloeber/core/api/LibraryManager.java b/io.sloeber.core/src/io/sloeber/core/api/LibraryManager.java
@@ -237,6 +237,10 @@ public static IStatus setLibraryTree(LibraryTree libs, IProgressMonitor monitor,
 	public static String getPrivateLibraryPathsString() {
 		return InstancePreferences.getPrivateLibraryPathsString();
 	}
+	public static void setPrivateLibraryPaths(String[] libraryPaths) {
+		InstancePreferences.setPrivateLibraryPaths(libraryPaths);
+
+	}
 
 	/**
 	 * get all the categories for all libraries (installed or not)
diff --git a/io.sloeber.core/src/io/sloeber/core/api/Preferences.java b/io.sloeber.core/src/io/sloeber/core/api/Preferences.java
@@ -0,0 +1,39 @@
+package io.sloeber.core.api;
+
+import io.sloeber.core.common.InstancePreferences;
+
+/**
+ * A class to controll the preferences at the workspace level
+ * @author jan
+ *
+ */
+public class Preferences {
+	public static void setAutoImportLibraries(boolean booleanValue) {
+		InstancePreferences.setAutomaticallyImportLibraries(booleanValue);
+
+	}
+
+	public static void setPragmaOnceHeaders(boolean booleanValue) {
+		InstancePreferences.setPragmaOnceHeaders(booleanValue);
+
+	}
+
+	public static boolean getPragmaOnceHeaders() {
+		return InstancePreferences.getPragmaOnceHeaders();
+	}
+
+	public static boolean getAutoImportLibraries() {
+		return InstancePreferences.getAutomaticallyImportLibraries();
+	}
+
+	public static void setUseArduinoToolSelection(boolean booleanValue) {
+		InstancePreferences.setUseArduinoToolSelection(booleanValue);
+
+	}
+
+	public static boolean getUseArduinoToolSelection() {
+		return InstancePreferences.getUseArduinoToolSelection();
+	}
+
+
+}
diff --git a/io.sloeber.core/src/io/sloeber/core/common/InstancePreferences.java b/io.sloeber.core/src/io/sloeber/core/common/InstancePreferences.java
@@ -24,6 +24,7 @@ public class InstancePreferences {
 	private static final String KEY_PRIVATE_HARDWARE_PATHS = "Private hardware Path"; //$NON-NLS-1$
 	public static final String KEY_AUTO_IMPORT_LIBRARIES = "Automatically import libraries"; //$NON-NLS-1$
 	private static final String KEY_PRAGMA_ONCE_HEADER = "add pragma once to headers"; //$NON-NLS-1$
+	private static final String KEY_USE_ARDUINO_TOOLS_SELECTION_ALGORITHM="Use the algoritm to find the toolchain like Arduino IDE"; //$NON-NLS-1$
 	// preference nodes
 	public static final String NODE_ARDUINO = Activator.NODE_ARDUINO;
 
@@ -141,4 +142,13 @@ public static boolean getPragmaOnceHeaders() {
 		return getGlobalBoolean(KEY_PRAGMA_ONCE_HEADER, true);
 	}
 
+	public static void setUseArduinoToolSelection(boolean booleanValue) {
+		setGlobalValue(KEY_USE_ARDUINO_TOOLS_SELECTION_ALGORITHM, booleanValue);
+
+	}
+
+	public static boolean getUseArduinoToolSelection() {
+		return getGlobalBoolean(KEY_USE_ARDUINO_TOOLS_SELECTION_ALGORITHM, Defaults.getUseArduinoToolSelection());
+	}
+
 }
diff --git a/io.sloeber.core/src/io/sloeber/core/tools/Helpers.java b/io.sloeber.core/src/io/sloeber/core/tools/Helpers.java
@@ -58,6 +58,7 @@
 import io.sloeber.core.api.BoardDescriptor;
 import io.sloeber.core.api.CompileOptions;
 import io.sloeber.core.api.Defaults;
+import io.sloeber.core.api.Preferences;
 import io.sloeber.core.common.Common;
 import io.sloeber.core.common.ConfigurationPreferences;
 import io.sloeber.core.common.Const;
@@ -673,7 +674,7 @@ private static void setTheEnvironmentVariablesAddThePlatformInfo(BoardDescriptor
 			addPlatformFileTools(LatestArduinoPlatform, contribEnv, confDesc, true);
 		}
 		// todo implement this jsonBasedPlatformManagement trigger
-		boolean jsonBasedPlatformManagement = true;
+		boolean jsonBasedPlatformManagement = !Preferences.getUseArduinoToolSelection();
 		if (jsonBasedPlatformManagement) {
 			// add the referenced platform before the real platform
 			ArduinoPlatform referencedPlatform = Manager.getPlatform(referencedPlatformFile);
diff --git a/io.sloeber.core/src/jUnit/CreateAndCompile.java b/io.sloeber.core/src/jUnit/CreateAndCompile.java
@@ -23,6 +23,7 @@
 import io.sloeber.core.api.CodeDescriptor;
 import io.sloeber.core.api.CompileOptions;
 import io.sloeber.core.api.ConfigurationDescriptor;
+import io.sloeber.core.api.Preferences;
 
 @SuppressWarnings("nls")
 @RunWith(Parameterized.class)
@@ -144,6 +145,8 @@ public static void installAdditionalBoards() {
 			BoardsManager.installAllLatestPlatforms();
 			BoardsManager.onlyKeepLatestPlatforms();
 		}
+		//build the Arduino way
+		Preferences.setUseArduinoToolSelection(false);
 		Shared.waitForAllJobsToFinish();
 	}
 
diff --git a/io.sloeber.ui/src/io/sloeber/ui/Messages.java b/io.sloeber.ui/src/io/sloeber/ui/Messages.java
@@ -109,6 +109,8 @@ public class Messages extends NLS {
 
 	public static String ui_pragma_once_headers;
 
+	public static String ui_use_arduino_toolchain_selection;
+
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/io.sloeber.ui/src/io/sloeber/ui/messages.properties b/io.sloeber.ui/src/io/sloeber/ui/messages.properties
@@ -78,3 +78,4 @@ platformSelectionTip=remove or add checkboxes and select OK to update your confi
 port_is_not_a_computer_name=The port you have selected is not a computer name.
 Set_or_Remove_password=Set or remove password.
 ui_pragma_once_headers=Add #pragma once to all headers
+ui_use_arduino_toolchain_selection=Select the toolchain like the Arduino IDE.
diff --git a/io.sloeber.ui/src/io/sloeber/ui/preferences/PreferencePage.java b/io.sloeber.ui/src/io/sloeber/ui/preferences/PreferencePage.java
@@ -20,6 +20,7 @@
 import io.sloeber.core.api.Defaults;
 import io.sloeber.core.api.LibraryManager;
 import io.sloeber.core.api.Other;
+import io.sloeber.core.api.Preferences;
 import io.sloeber.ui.Messages;
 import io.sloeber.ui.helpers.MyPreferences;
 
@@ -42,14 +43,16 @@ public class PreferencePage extends FieldEditorPreferencePage implements IWorkbe
 	private static final String KEY_PRAGMA_ONCE_HEADERS = "Gui entry for add pragma once"; //$NON-NLS-1$
 	private static final String KEY_PRIVATE_HARDWARE_PATHS = "Gui entry for private hardware paths"; //$NON-NLS-1$
 	private static final String KEY_PRIVATE_LIBRARY_PATHS = "Gui entry for private library paths"; //$NON-NLS-1$
+	private static final String KEY_TOOLCHAIN_SELECTION = "Gui entry for toolchain selection"; //$NON-NLS-1$
 
-	private PathEditor arduinoPrivateLibPath;
-	private PathEditor arduinoPrivateHardwarePath;
-	private ComboFieldEditor buildBeforeUploadOption;
-	private BooleanFieldEditor openSerialMonitorOpensSerialsOption;
-	private BooleanFieldEditor automaticallyImportLibrariesOption;
-	private BooleanFieldEditor PragmaOnceHeaderOption;
-	private BooleanFieldEditor cleanSerialMonitorAfterUpload;
+	private PathEditor arduinoPrivateLibPathPathEditor;
+	private PathEditor arduinoPrivateHardwarePathPathEditor;
+	private ComboFieldEditor buildBeforeUploadOptionEditor;
+	private BooleanFieldEditor openSerialMonitorOpensSerialsOptionEditor;
+	private BooleanFieldEditor automaticallyImportLibrariesOptionEditor;
+	private BooleanFieldEditor useArduinoToolchainSelectionEditor;
+	private BooleanFieldEditor pragmaOnceHeaderOptionEditor;
+	private BooleanFieldEditor cleanSerialMonitorAfterUploadEditor;
 
 	public PreferencePage() {
 		super(org.eclipse.jface.preference.FieldEditorPreferencePage.GRID);
@@ -63,6 +66,8 @@ public PreferencePage() {
 		preferences.setDefault(KEY_PRAGMA_ONCE_HEADERS, true);
 		preferences.setDefault(KEY_PRIVATE_HARDWARE_PATHS, Defaults.getPrivateHardwarePath());
 		preferences.setDefault(KEY_PRIVATE_LIBRARY_PATHS, Defaults.getPrivateLibraryPath());
+		preferences.setDefault(KEY_TOOLCHAIN_SELECTION, Defaults.getUseArduinoToolSelection());
+
 		setPreferenceStore(preferences);
 	}
 
@@ -97,24 +102,29 @@ public boolean performOk() {
 		boolean ret = super.performOk();
 		String hardWarePaths[] = getPreferenceStore().getString(KEY_PRIVATE_HARDWARE_PATHS).split(File.pathSeparator);
 		String libraryPaths[] = getPreferenceStore().getString(KEY_PRIVATE_LIBRARY_PATHS).split(File.pathSeparator);
-		BoardsManager.setAutoImportLibraries(this.automaticallyImportLibrariesOption.getBooleanValue());
-		BoardsManager.setPragmaOnceHeaders(this.PragmaOnceHeaderOption.getBooleanValue());
+
+		Preferences.setUseArduinoToolSelection(this.useArduinoToolchainSelectionEditor.getBooleanValue());
+		Preferences.setAutoImportLibraries(this.automaticallyImportLibrariesOptionEditor.getBooleanValue());
+		Preferences.setPragmaOnceHeaders(this.pragmaOnceHeaderOptionEditor.getBooleanValue());
 		BoardsManager.setPrivateHardwarePaths(hardWarePaths);
-		BoardsManager.setPrivateLibraryPaths(libraryPaths);
+		LibraryManager.setPrivateLibraryPaths(libraryPaths);
 		return ret;
 	}
 
 	@Override
 	public void init(IWorkbench workbench) {
 		String hardWarePaths = BoardsManager.getPrivateHardwarePathsString();
 		String libraryPaths = LibraryManager.getPrivateLibraryPathsString();
-		boolean autoImport = BoardsManager.getAutoImportLibraries();
-		boolean pragmaOnceHeaders = BoardsManager.getPragmaOnceHeaders();
+		boolean autoImport = Preferences.getAutoImportLibraries();
+		boolean pragmaOnceHeaders = Preferences.getPragmaOnceHeaders();
+		boolean useArduinoToolchainSelection =Preferences.getUseArduinoToolSelection();
 
 		getPreferenceStore().setValue(KEY_AUTO_IMPORT_LIBRARIES, autoImport);
 		getPreferenceStore().setValue(KEY_PRAGMA_ONCE_HEADERS, pragmaOnceHeaders);
 		getPreferenceStore().setValue(KEY_PRIVATE_HARDWARE_PATHS, hardWarePaths);
 		getPreferenceStore().setValue(KEY_PRIVATE_LIBRARY_PATHS, libraryPaths);
+		getPreferenceStore().setValue(KEY_TOOLCHAIN_SELECTION, useArduinoToolchainSelection);
+
 	}
 
 	/**
@@ -126,39 +136,45 @@ public void init(IWorkbench workbench) {
 	protected void createFieldEditors() {
 		final Composite parent = getFieldEditorParent();
 
-		this.arduinoPrivateLibPath = new PathEditor(KEY_PRIVATE_LIBRARY_PATHS, Messages.ui_private_lib_path,
+		this.arduinoPrivateLibPathPathEditor = new PathEditor(KEY_PRIVATE_LIBRARY_PATHS, Messages.ui_private_lib_path,
 				Messages.ui_private_lib_path_help, parent);
-		addField(this.arduinoPrivateLibPath);
+		addField(this.arduinoPrivateLibPathPathEditor);
 
-		this.arduinoPrivateHardwarePath = new PathEditor(KEY_PRIVATE_HARDWARE_PATHS, Messages.ui_private_hardware_path,
+		this.arduinoPrivateHardwarePathPathEditor = new PathEditor(KEY_PRIVATE_HARDWARE_PATHS, Messages.ui_private_hardware_path,
 				Messages.ui_private_hardware_path_help, parent);
-		addField(this.arduinoPrivateHardwarePath);
+		addField(this.arduinoPrivateHardwarePathPathEditor);
 
 		Dialog.applyDialogFont(parent);
 		createLine(parent, 4);
 		String[][] YesNoAskOptions = new String[][] { { Messages.ui_ask_every_upload, "ASK" }, //$NON-NLS-1$
 				{ "Yes", TRUE }, { "No", FALSE } }; //$NON-NLS-1$ //$NON-NLS-2$
-		this.buildBeforeUploadOption = new ComboFieldEditor(MyPreferences.KEY_BUILD_BEFORE_UPLOAD_OPTION,
+		this.buildBeforeUploadOptionEditor = new ComboFieldEditor(MyPreferences.KEY_BUILD_BEFORE_UPLOAD_OPTION,
 				Messages.ui_build_before_upload, YesNoAskOptions, parent);
-		addField(this.buildBeforeUploadOption);
+		addField(this.buildBeforeUploadOptionEditor);
 		createLine(parent, 4);
 
-		this.openSerialMonitorOpensSerialsOption = new BooleanFieldEditor(MyPreferences.KEY_OPEN_SERIAL_WITH_MONITOR,
+		this.useArduinoToolchainSelectionEditor = new BooleanFieldEditor(KEY_TOOLCHAIN_SELECTION,
+				Messages.ui_use_arduino_toolchain_selection, BooleanFieldEditor.DEFAULT, parent);
+		addField(this.useArduinoToolchainSelectionEditor);
+
+		createLine(parent, 4);
+		this.openSerialMonitorOpensSerialsOptionEditor = new BooleanFieldEditor(MyPreferences.KEY_OPEN_SERIAL_WITH_MONITOR,
 				Messages.ui_open_serial_with_monitor, BooleanFieldEditor.DEFAULT, parent);
-		addField(this.openSerialMonitorOpensSerialsOption);
+		addField(this.openSerialMonitorOpensSerialsOptionEditor);
 		createLine(parent, 4);
 
-		this.automaticallyImportLibrariesOption = new BooleanFieldEditor(KEY_AUTO_IMPORT_LIBRARIES,
+
+		this.automaticallyImportLibrariesOptionEditor = new BooleanFieldEditor(KEY_AUTO_IMPORT_LIBRARIES,
 				Messages.ui_auto_import_libraries, BooleanFieldEditor.DEFAULT, parent);
-		addField(this.automaticallyImportLibrariesOption);
+		addField(this.automaticallyImportLibrariesOptionEditor);
 
-		this.PragmaOnceHeaderOption = new BooleanFieldEditor(KEY_PRAGMA_ONCE_HEADERS, Messages.ui_pragma_once_headers,
+		this.pragmaOnceHeaderOptionEditor = new BooleanFieldEditor(KEY_PRAGMA_ONCE_HEADERS, Messages.ui_pragma_once_headers,
 				BooleanFieldEditor.DEFAULT, parent);
-		addField(this.PragmaOnceHeaderOption);
+		addField(this.pragmaOnceHeaderOptionEditor);
 
-		this.cleanSerialMonitorAfterUpload = new BooleanFieldEditor(MyPreferences.getCleanSerialMonitorAfterUploadKey(),
+		this.cleanSerialMonitorAfterUploadEditor = new BooleanFieldEditor(MyPreferences.getCleanSerialMonitorAfterUploadKey(),
 				Messages.ui_Clean_Serial_Monitor_After_Upload, BooleanFieldEditor.DEFAULT, parent);
-		addField(this.cleanSerialMonitorAfterUpload);
+		addField(this.cleanSerialMonitorAfterUploadEditor);
 
 		createLine(parent, 4);
 		Label label = new Label(parent, SWT.LEFT);

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,8 @@ public static String getPrivateHardwarePath() {`
`35`	`35`	`public static String getDefaultUploadProtocol() {`
`36`	`36`	`return DEFAULT;`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ public static boolean getUseArduinoToolSelection() {`
	`40`	`+ return true;`
	`41`	`+ }`
`38`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`import io.sloeber.core.api.CodeDescriptor;`
`24`	`24`	`import io.sloeber.core.api.CompileOptions;`
`25`	`25`	`import io.sloeber.core.api.ConfigurationDescriptor;`
	`26`	`+import io.sloeber.core.api.Preferences;`
`26`	`27`
`27`	`28`	`@SuppressWarnings("nls")`
`28`	`29`	`@RunWith(Parameterized.class)`
`@@ -144,6 +145,8 @@ public static void installAdditionalBoards() {`
`144`	`145`	`BoardsManager.installAllLatestPlatforms();`
`145`	`146`	`BoardsManager.onlyKeepLatestPlatforms();`
`146`	`147`	`}`
	`148`	`+ //build the Arduino way`
	`149`	`+ Preferences.setUseArduinoToolSelection(false);`
`147`	`150`	`Shared.waitForAllJobsToFinish();`
`148`	`151`	`}`
`149`	`152`