Merge pull request #22 from Lothar-Tradescape/timeout_preferences

Implemented preferences to set the UI thread script timeout.

Author: fornwall

plugin.xml

@@ -65,6 +65,20 @@
     <startup
           class="org.eclipsescript.core.Autostart">
     </startup>
+ </extension>
+ <extension
+       point="org.eclipse.ui.preferencePages">
+    <page
+          class="org.eclipsescript.preferences.EclipseScriptPreferencePage"
+          id="org.eclipsescript.preferences.EclipseScriptPreferencePage"
+          name="EclipseScript Preferences">
+    </page>
+ </extension>
+ <extension
+       point="org.eclipse.core.runtime.preferences">
+    <initializer
+          class="org.eclipsescript.preferences.PreferenceInitializer">
+    </initializer>
  </extension> 
 
 </plugin>

src/org/eclipsescript/javascript/CustomContextFactory.java

@@ -3,9 +3,12 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.PlatformUI;
+import org.eclipsescript.core.Activator;
 import org.eclipsescript.messages.Messages;
+import org.eclipsescript.preferences.PreferenceConstants;
 import org.eclipsescript.rhino.javascript.Callable;
 import org.eclipsescript.rhino.javascript.Context;
 import org.eclipsescript.rhino.javascript.ContextFactory;
@@ -18,10 +21,22 @@ static class CustomContext extends Context {
 		public JavascriptRuntime jsRuntime;
 
 		long startTime;
+		int timeout;
 		volatile boolean useTimeout = true;
 
 		public CustomContext(ContextFactory factory) {
 			super(factory);
+			try {
+				IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();
+				timeout = preferenceStore.getInt(PreferenceConstants.P_TIMEOUT);
+			} catch (Throwable t) {
+				System.err.println(t.getMessage());
+			}
+
+			if (timeout == 0) {
+				timeout = PreferenceConstants.P_TIMEOUT_DEFAULT;
+			}
+			// System.out.println("timeout=" + timeout + " @" + this);
 		}
 	}
 
@@ -75,7 +90,7 @@ protected void observeInstructionCount(Context cx, int instructionCount) {
 		CustomContext mcx = (CustomContext) cx;
 		if (!mcx.useTimeout)
 			return;
-		final int MAX_SECONDS = 10;
+		final int MAX_SECONDS = mcx.timeout;
 		long currentTime = System.currentTimeMillis();
 		if (currentTime - mcx.startTime > MAX_SECONDS * 1000) {
 			mcx.jsRuntime.abortRunningScript(NLS.bind(Messages.scriptTimeout, MAX_SECONDS));

src/org/eclipsescript/preferences/EclipseScriptPreferencePage.java

@@ -0,0 +1,46 @@
+package org.eclipsescript.preferences;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IntegerFieldEditor;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipsescript.core.Activator;
+
+/**
+ * This class represents a preference page that is contributed to the Preferences dialog. By subclassing
+ * <samp>FieldEditorPreferencePage</samp>, we can use the field support built into JFace that allows us to create a page
+ * that is small and knows how to save, restore and apply itself.
+ * <p>
+ * This page is used to modify preferences only. They are stored in the preference store that belongs to the main
+ * plug-in class. That way, preferences can be accessed directly via the preference store.
+ */
+
+public class EclipseScriptPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+
+	public EclipseScriptPreferencePage() {
+		super(GRID);
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setDescription(Messages.EclipseScriptPreferencePage_0);
+	}
+
+	/**
+	 * Creates the field editors. Field editors are abstractions of the common GUI blocks needed to manipulate various
+	 * types of preferences. Each field editor knows how to save and restore itself.
+	 */
+	@Override
+	public void createFieldEditors() {
+		addField(new IntegerFieldEditor(PreferenceConstants.P_TIMEOUT, Messages.EclipseScriptPreferencePage_1,
+				getFieldEditorParent()));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+	 */
+	@Override
+	public void init(IWorkbench workbench) {
+		// nothing to do here
+	}
+
+}

src/org/eclipsescript/preferences/Messages.java

@@ -0,0 +1,16 @@
+package org.eclipsescript.preferences;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipsescript.preferences.messages"; //$NON-NLS-1$
+	public static String EclipseScriptPreferencePage_0;
+	public static String EclipseScriptPreferencePage_1;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}

src/org/eclipsescript/preferences/PreferenceConstants.java

@@ -0,0 +1,9 @@
+package org.eclipsescript.preferences;
+
+/**
+ * Constant definitions for plug-in preferences
+ */
+public class PreferenceConstants {
+	public static final String P_TIMEOUT = "timeout"; //$NON-NLS-1$
+	public static final int P_TIMEOUT_DEFAULT = 10;
+}

src/org/eclipsescript/preferences/PreferenceInitializer.java

@@ -0,0 +1,23 @@
+package org.eclipsescript.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipsescript.core.Activator;
+
+/**
+ * Class used to initialize default preference values.
+ */
+public class PreferenceInitializer extends AbstractPreferenceInitializer {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
+	 */
+	@Override
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+		store.setDefault(PreferenceConstants.P_TIMEOUT, PreferenceConstants.P_TIMEOUT_DEFAULT);
+	}
+
+}

src/org/eclipsescript/preferences/messages.properties

@@ -0,0 +1,2 @@
+EclipseScriptPreferencePage_0=EclipseScript
+EclipseScriptPreferencePage_1=Script &timeout (seconds):