IEP-868: Fixing the export of global openocd path in preferences (esp…

…ressif#690) * IEP-868: Fixing the export of global openocd path in preferences * IEP-868: Refactoring to reuse same code by moving function to IDFUtil
rymcu · Feb 7, 2023 · 372969e · 372969e
1 parent fa9a33e
commit 372969e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/bundles/com.espressif.idf.core/src/com/espressif/idf/core/util/IDFUtil.java b/bundles/com.espressif.idf.core/src/com/espressif/idf/core/util/IDFUtil.java
@@ -24,9 +24,11 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.osgi.service.prefs.BackingStoreException;
 
 import com.espressif.idf.core.ExecutableFinder;
 import com.espressif.idf.core.IDFConstants;
@@ -615,4 +617,21 @@ public static String getNvsGeneratorScriptPath()
 				.collect(Collectors.joining(String.valueOf(IPath.SEPARATOR)));
 
 	}
+
+	/**
+	 * Update the openocd path in configurations
+	 */
+	public static void updateEspressifPrefPageOpenocdPath()
+	{
+		IEclipsePreferences newNode = DefaultScope.INSTANCE.getNode("com.espressif.idf.debug.gdbjtag.openocd"); //$NON-NLS-1$
+		newNode.put("install.folder", getOpenOCDLocation()); //$NON-NLS-1$
+		try
+		{
+			newNode.flush();
+		}
+		catch (BackingStoreException e)
+		{
+			Logger.log(e);
+		}
+	}
 }
diff --git a/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/tools/ToolsInstallationHandler.java b/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/tools/ToolsInstallationHandler.java
@@ -557,6 +557,7 @@ public Boolean call() throws Exception
 			configureToolChain();
 			configEnv();
 			copyOpenOcdRules();
+			IDFUtil.updateEspressifPrefPageOpenocdPath();
 			return Boolean.TRUE;
 		}
 

diff --git a/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/InstallToolsHandler.java b/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/InstallToolsHandler.java
@@ -26,8 +26,6 @@
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.IJobChangeListener;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.launchbar.core.target.ILaunchTargetManager;
 import org.eclipse.swt.SWT;
@@ -368,21 +366,7 @@ public void done(IJobChangeEvent event)
 			}
 			else
 			{
-				updateEspressifPrefPageOpenocdPath();
-			}
-		}
-
-		private void updateEspressifPrefPageOpenocdPath()
-		{
-			IEclipsePreferences newNode = DefaultScope.INSTANCE.getNode("com.espressif.idf.debug.gdbjtag.openocd"); //$NON-NLS-1$
-			newNode.put("install.folder", IDFUtil.getOpenOCDLocation()); //$NON-NLS-1$
-			try
-			{
-				newNode.flush();
-			}
-			catch (BackingStoreException e)
-			{
-				Logger.log(e);
+				IDFUtil.updateEspressifPrefPageOpenocdPath();
 			}
 		}