fix in saving openocd timeout preference (#477)

Author: sigmaaa

bundles/com.espressif.idf.debug.gdbjtag.openocd/src/com/espressif/idf/debug/gdbjtag/openocd/dsf/GdbServerBackend.java

@@ -15,24 +15,27 @@
 package com.espressif.idf.debug.gdbjtag.openocd.dsf;
 
 import ilg.gnumcueclipse.core.StringUtils;
+import ilg.gnumcueclipse.core.preferences.ScopedPreferenceStoreWithoutDefaults;
 import ilg.gnumcueclipse.debug.gdbjtag.dsf.GnuMcuGdbServerBackend;
 
 import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
 import org.eclipse.cdt.dsf.service.DsfSession;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.osgi.framework.BundleContext;
 
 import com.espressif.idf.debug.gdbjtag.openocd.Activator;
 import com.espressif.idf.debug.gdbjtag.openocd.Configuration;
+import com.espressif.idf.ui.UIPlugin;
 
 public class GdbServerBackend extends GnuMcuGdbServerBackend {
 
 	// ------------------------------------------------------------------------
 
-//	protected int fGdbServerLaunchTimeout = 25;
 	protected boolean fDoStartGdbClient;
 
 	// ------------------------------------------------------------------------
@@ -139,7 +142,8 @@ public String getServerCommandName() {
 
 	@Override
 	public int getServerLaunchTimeoutSeconds() {
-		return Activator.getInstance().getPreferenceStore().getInt(Activator.GDB_SERVER_LAUNCH_TIMEOUT);
+		IPreferenceStore preferenceStore = new ScopedPreferenceStoreWithoutDefaults(InstanceScope.INSTANCE, UIPlugin.PLUGIN_ID);
+		return preferenceStore.getInt(Activator.GDB_SERVER_LAUNCH_TIMEOUT);
 	}
 
 	public String getServerName() {

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/preferences/messages.properties

@@ -1,5 +1,5 @@
 EspresssifPreferencesPage_IDFSpecificPrefs=ESP-IDF Specific Preferences.
-GDBServerTimeoutPage_TimeoutField=GDB server launch timeout(ms)
+GDBServerTimeoutPage_TimeoutField=GDB server launch timeout(s)
 SerialMonitorPage_Field_NumberOfCharsInLine=Console Line Width (maximum characters):
 SerialMonitorPage_Field_NumberOfLines=Limit Console Output (number of lines):
 SerialMonitorPage_GroupHeading=Serial Monitor Setting