Add ui to json update frequency functionality

Externalized some strings

Author: jan

io.sloeber.core/src/io/sloeber/arduinoFramework/api/BoardDescription.java

@@ -35,9 +35,9 @@
 import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
 import io.sloeber.autoBuild.helpers.api.KeyValueTree;
 import io.sloeber.core.Activator;
+import io.sloeber.core.Messages;
 import io.sloeber.core.api.ConfigurationPreferences;
 import io.sloeber.core.api.Const;
-import io.sloeber.core.api.Preferences;
 import io.sloeber.core.api.VersionNumber;
 import io.sloeber.core.tools.KeyValue;
 import io.sloeber.core.txt.BoardTxtFile;
@@ -1005,7 +1005,7 @@ public Map<String, String> getEnvVars() {
 			allVars.putAll(getEnVarPlatformInfo());
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
-			Activator.log(new Status(IStatus.ERROR, CORE_PLUGIN_ID, "failed to get platform paths", e));
+			Activator.log(new Status(IStatus.ERROR, CORE_PLUGIN_ID, Messages.BoardDescription_0, e));
 		}
 
 		// boards settings not coming from menu selections
@@ -1078,7 +1078,7 @@ private Map<String, String> getEnVarPlatformInfo() throws IOException {
 			return ret;
 		}
 
-		boolean jsonBasedPlatformManagement = !Preferences.getUseArduinoToolSelection();
+		boolean jsonBasedPlatformManagement = !ConfigurationPreferences.getUseArduinoToolSelection();
 		if (jsonBasedPlatformManagement) {
 			// overrule the Arduino IDE way of working and use the json refereced tools
 			ret.putAll(getEnvVarPlatformFileTools(referencingPlatform));

io.sloeber.core/src/io/sloeber/core/Activator.java

@@ -467,8 +467,8 @@ public static void log(IStatus status) {
     private static synchronized void startup_BoardsManager(IProgressMonitor monitor) {
     	//ConfigurationPreferences.getUpdateJasonFilesFlag();
     	Instant currentTime=Instant.now();
-    	Instant latestUpdate= ConfigurationPreferences.getLatestUpdateTime();
-    	Duration requestedDelay=ConfigurationPreferences.getUpdateDelay();
+    	Instant latestUpdate= ConfigurationPreferences.getLatestJsonUpdateTime();
+    	Duration requestedDelay=ConfigurationPreferences.getJsonUpdateDelay();
     	Instant nextUpdate=latestUpdate.plus(requestedDelay);
     	boolean needsUpdate = nextUpdate.isBefore(currentTime);
 

io.sloeber.core/src/io/sloeber/core/Messages.java

@@ -39,7 +39,8 @@ public class Messages extends NLS {
     public static String ArduinoSerial_unable_to_open_serial_port;
     public static String ArduinoSerial_Using_1200bps_touch;
     public static String ArduinoSerial_Using_comport;
-    public static String Boards_Failed_to_read_boards;
+    public static String BoardDescription_0;
+	public static String Boards_Failed_to_read_boards;
     public static String Boards_Get_menu_item_name_from_id_did_not_find;
     public static String Boards_menu_ID_not_found;
     public static String Boards_menu_name_not_found;

io.sloeber.core/src/io/sloeber/core/api/ConfigurationPreferences.java

@@ -5,13 +5,18 @@
 import java.io.File;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.HashSet;
 
+import org.eclipse.cdt.core.parser.util.StringUtil;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.osgi.service.prefs.BackingStoreException;
 
+import cc.arduino.packages.discoverers.SloeberNetworkDiscovery;
+import io.sloeber.core.common.InstancePreferences;
+
 /**
  * Items on the Configuration level are linked to the ConfigurationScope
  * (=eclipse install base).
@@ -29,7 +34,85 @@ public class ConfigurationPreferences {
 	private static final String POST_PROCESSING_BOARDS_TXT = "post_processing_boards.txt"; //$NON-NLS-1$
 
 	private static final String KEY_LATEST_JSON_UPDATE_TIME ="latest time the json files were updated";//$NON-NLS-1$
+	private static final String KEY_JSON_UPDATE_DELAY="Duration between json file updates";//$NON-NLS-1$
+
+    private static String stringSplitter = "\n";//$NON-NLS-1$
+    private static final String KEY_DISCONNECT_SERIAL_TAGETS = "Target names that require serial disconnect to run";//$NON-NLS-1$
+
+	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();
+	}
+
+//	public static void setUpdateJsonFiles(boolean flag) {
+//		ConfigurationPreferences.setUpdateJasonFilesFlag(flag);
+//	}
+//	public static boolean getUpdateJsonFiles() {
+//		return ConfigurationPreferences.getUpdateJasonFilesFlag();
+//	}
+
+	/**
+	 *wrapper for ConfigurationPreferences.useBonjour();
+	 */
+	public static boolean useBonjour() {
+		return InstancePreferences.useBonjour();
+	}
+
+	/**
+	 *wrapper for ConfigurationPreferences.setUseBonjour(newFlag);
+	 */
+	public static void setUseBonjour(boolean newFlag) {
+		InstancePreferences.setUseBonjour(newFlag);
+		if(newFlag) {
+			SloeberNetworkDiscovery.start();
+		}else {
+			SloeberNetworkDiscovery.stop();
+		}
+	}
+
+
+
+    public static String[] getDisconnectSerialTargetsList() {
+        return getDisconnectSerialTargets().split(stringSplitter);
+    }
+
+    public static String getDisconnectSerialTargets() {
+        return getString(KEY_DISCONNECT_SERIAL_TAGETS, Defaults.getDefaultDisconnectSerialTargets()).replace("\r", EMPTY);//$NON-NLS-1$
+    }
+
+    public static void setDisconnectSerialTargets(String targets) {
+        setString(KEY_DISCONNECT_SERIAL_TAGETS, targets);
+    }
 
+    public static void setDisconnectSerialTargets(String targets[]) {
+        setString(KEY_DISCONNECT_SERIAL_TAGETS, StringUtil.join(targets, stringSplitter));
+    }
+
+    public static void setDisconnectSerialTargets(HashSet<String> targets) {
+        setString(KEY_DISCONNECT_SERIAL_TAGETS, StringUtil.join(targets, stringSplitter));
+    }
 
 	public static void removeKey(String key) {
 		IEclipsePreferences myScope = ConfigurationScope.INSTANCE.getNode(NODE_ARDUINO);
@@ -130,7 +213,7 @@ public static IPath getAwkPath() {
 		return new Path(getInstallationPath().append("tools/awk").toString()); //$NON-NLS-1$
 	}
 
-	public static Instant getLatestUpdateTime() {
+	public static Instant getLatestJsonUpdateTime() {
 		return getInstant(KEY_LATEST_JSON_UPDATE_TIME, Instant.now());
 	}
 
@@ -139,9 +222,31 @@ public static void setLatestUpdateTime(Instant currentTime) {
 
 	}
 
-	public static Duration getUpdateDelay() {
-		// TODO Auto-generated method stub
-		return Duration.ofDays(10);
+	public static Duration getJsonUpdateDelay() {
+		return getDuration(KEY_JSON_UPDATE_DELAY,Defaults.getJsonUpdateDuration());
+	}
+
+	public static void setJsonUpdateDelay(Duration jsunUpdateDuration) {
+		setDuration(KEY_JSON_UPDATE_DELAY,jsunUpdateDuration);
+	}
+
+	private static void setDuration(String key, Duration value) {
+		IEclipsePreferences myScope = ConfigurationScope.INSTANCE.getNode(NODE_ARDUINO);
+		myScope.putLong(key, value.toDays());
+		try {
+			myScope.flush();
+		} catch (BackingStoreException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private static Duration getDuration(String key, Duration defaultValue) {
+		IEclipsePreferences myScope = ConfigurationScope.INSTANCE.getNode(NODE_ARDUINO);
+		long ret = myScope.getLong(key, 0);
+		if(ret==0) {
+			return defaultValue;
+		}
+		return Duration.ofDays(ret);
 	}
 
 }

io.sloeber.core/src/io/sloeber/core/api/Defaults.java

@@ -2,6 +2,8 @@
 
 import static io.sloeber.core.api.Const.*;
 
+import java.time.Duration;
+
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 
@@ -11,6 +13,8 @@ public class Defaults {
 	public static final String JANTJE_BOARD_JSON_URL = "https://raw.githubusercontent.com/jantje/hardware/master/package_jantje_index.json";
 	public static final String DEFAULT_INSTALL_ARCHITECTURE = "avr";
     public static final String DEFAULT_INSTALL_MAINTAINER = "arduino";
+    private static final String DEFAULT_DISCONNECT_SERIAL_TARGETS = "BurnBootLoader\nuploadWithBuild\nuploadWithoutBuild\nuploadWithProgrammerWithBuild\nuploadWithProgrammerWithoutBuild"; //$NON-NLS-1$
+
 	public static final String[] DEFAULT_JSON_URLS = {DEFAULT_INSTALL_JSON,
 			JANTJE_BOARD_JSON_URL,
             "https://raw.githubusercontent.com/jantje/ArduinoLibraries/master/library_jantje_index.json",
@@ -29,7 +33,6 @@ public class Defaults {
             "LiquidCrystal", "Mouse", "SD", "Servo", "Stepper", "TFT", "WiFi", "CapacitiveSensor" };
     public static final String DEFAULT = "Default";
 
-    public static final boolean updateJsonFiles = true;
     public static final boolean useBonjour = true;
     public static final boolean autoInstallLibraries = true;
     public static final boolean useArduinoToolSelection = true;
@@ -57,4 +60,12 @@ public static String getPrivateHardwarePath() {
         return homPath.append("Arduino").append(ARDUINO_HARDWARE_FOLDER_NAME).toString();
     }
 
+    public static String getDefaultDisconnectSerialTargets() {
+        return DEFAULT_DISCONNECT_SERIAL_TARGETS;
+    }
+
+	public static Duration getJsonUpdateDuration() {
+		return  Duration.ofDays(7);
+	}
+
 }

io.sloeber.core/src/io/sloeber/core/api/Preferences.java

@@ -12,6 +12,7 @@ ArduinoSerial_reset_failed=reset using 1200bps touch failed
 ArduinoSerial_unable_to_open_serial_port=Unable to open Serial port "{PORT}"
 ArduinoSerial_Using_1200bps_touch=Forcing reset using 1200bps open/close on port : "{PORT}"
 ArduinoSerial_Using_comport=Using port "{PORT}" from now onwards
+BoardDescription_0=failed to get platform paths
 Boards_Failed_to_read_boards=Failed to read arduino boards file "{FILE}"!!
 Boards_Get_menu_item_name_from_id_did_not_find=getMenuItemNameFromMenuItemID did not find menu item with ID "{MENUITEMID}" menu ID "{MENUID}" for board "{BOARDID}"
 Boards_menu_ID_not_found=menu ID "{ID}" not found

io.sloeber.core/src/io/sloeber/core/messages.properties

@@ -52,7 +52,7 @@
 import io.sloeber.core.api.CompileDescription.WarningLevels;
 import io.sloeber.core.api.ISloeberConfiguration;
 import io.sloeber.core.api.OtherDescription;
-import io.sloeber.core.api.Preferences;
+import io.sloeber.core.api.ConfigurationPreferences;
 import io.sloeber.core.api.SloeberProject;
 import io.sloeber.providers.Arduino;
 import io.sloeber.providers.ESP32;
@@ -76,7 +76,7 @@ public class BuildTests {
     public static void beforeClass() throws Exception {
         Shared.waitForBoardsManager();
         Shared.setDeleteProjects(false);
-        Preferences.setUseBonjour(false);
+        ConfigurationPreferences.setUseBonjour(false);
         installAdditionalBoards();
         installAdditionalLibs();
     }
@@ -754,7 +754,7 @@ static Stream<Arguments> openAndClosePreservesSettingsValueCmd() throws Exceptio
     }
 
     public static Stream<Arguments> NightlyBoardPatronTestData() throws Exception {
-        Preferences.setUseArduinoToolSelection(true);
+    	ConfigurationPreferences.setUseArduinoToolSelection(true);
         CompileDescription compileOptions = new CompileDescription();
         MCUBoard zeroBoard = Arduino.zeroProgrammingPort();
 

io.sloeber.tests/src/io/sloeber/core/BuildTests.java

@@ -39,7 +39,7 @@
 import io.sloeber.core.api.CompileDescription;
 import io.sloeber.core.api.ConfigurationPreferences;
 import io.sloeber.core.api.ISloeberConfiguration;
-import io.sloeber.core.api.Preferences;
+import io.sloeber.core.api.ConfigurationPreferences;
 import io.sloeber.core.api.Sketch;
 import io.sloeber.core.api.SloeberProject;
 import io.sloeber.providers.Arduino;
@@ -98,7 +98,7 @@ static Stream<Arguments> uploadBourds() throws Exception {
 
 
 	public static void installAdditionalBoards() {
-		Preferences.setUseBonjour(false);
+		ConfigurationPreferences.setUseBonjour(false);
 		String[] packageUrlsToAdd = { ESP32.packageURL, ESP8266.packageURL };
 		BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)));