Merge branch 'mylocal'

Author: jcompagner

features/org.eclipse.dltk.javascript-feature/feature.xml

@@ -15,7 +15,7 @@
  */
 -->
 <feature
-      id="org.eclipse.dltk.javascript"
+      id="org.eclipse.dltk.javascript.servoy"
       label="%featureName"
       version="4.0.0.qualifier"
       provider-name="%providerName"
@@ -37,8 +37,14 @@ http://www.eclipse.org/legal/epl-v10.html
       %license
    </license>
 
+   <url>
+      <update label="Servoy Update Site" url="http://www.servoy.com/developer/5xx_updates"/>
+      <discovery label="Servoy Update Site" url="http://www.servoy.com/developer/5xx_updates"/>
+   </url>
+
    <requires>
-      <import feature="org.eclipse.dltk.core" version="4.0.0" match="compatible"/>
+      <import feature="org.eclipse.dltk.core.servoy" version="4.0.0" match="compatible"/>
+      <import feature="org.eclipse.jdt" version="3.5.0.v20090527-2000-7r88FEeFJePyvYeA33DjZ_c1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -62,34 +68,13 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.dltk.javascript.jdt.integration"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.dltk.javascript.launching"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.dltk.javascript.rhino"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.dltk.javascript.rhino.dbgp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.dltk.javascript.ui"
          download-size="0"
@@ -125,4 +110,10 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.antlr.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 </feature>

plugins/org.eclipse.dltk.javascript.debug.ui/plugin.xml

@@ -27,11 +27,12 @@
 
   <extension point="org.eclipse.dltk.ui.editorTextHovers">
     <hover
-      label="%javascriptVariabl1eHoverLabel"
-      description="%javaVariableHoverDescription"
-      nature="org.eclipse.dltk.javascript.core.nature"
-      class="org.eclipse.dltk.javascript.internal.debug.ui.JavaScriptDebugHover"
-      id="org.eclipse.dltk.javascript.internal.debug.ui.JavaScriptDebugHover">
+          activate="true"
+          class="org.eclipse.dltk.javascript.internal.debug.ui.JavaScriptDebugHover"
+          description="%javaVariableHoverDescription"
+          id="org.eclipse.dltk.javascript.internal.debug.ui.JavaScriptDebugHover"
+          label="%javascriptVariabl1eHoverLabel"
+          nature="org.eclipse.dltk.javascript.core.nature">
     </hover>
   </extension>
 
@@ -230,9 +231,6 @@
           <instanceof
                 value="org.eclipse.dltk.debug.ui.ScriptDebugConsole">
           </instanceof>
-          <test
-            property="org.eclipse.debug.ui.processTypeTest"
-            value="javascriptInterpreter" />
        </enablement>
     </consolePatternMatchListener>
   </extension>

plugins/org.eclipse.dltk.javascript.jsjdtdebugger/src/org/eclipse/dltk/javascript/jsjdtdebugger/JavaScriptAndJdtDebuggerPlugin.java

@@ -65,18 +65,19 @@ private void resetSuspendProperties(Preferences prefs) {
 		// These preferences should be remembered but whatever i try its
 		// impossible (ToggleStates, AbstractHandlerWithState, Action that is
 		// pulldown)
-		prefs
-				.setValue(
-						IJavaScriptAndJdtDebuggerPreferenceConstants.PREF_BREAK_ON_METHOD_ENTRY,
-						false);
-		prefs
-				.setValue(
-						IJavaScriptAndJdtDebuggerPreferenceConstants.PREF_BREAK_ON_METHOD_EXIT,
-						false);
-		prefs
-				.setValue(
-						IJavaScriptAndJdtDebuggerPreferenceConstants.PREF_BREAK_ON_EXCEPTION,
-						false);
+		// Only a Toolbar button seems to work..
+		// prefs
+		// .setValue(
+		// IJavaScriptAndJdtDebuggerPreferenceConstants.PREF_BREAK_ON_METHOD_ENTRY,
+		// false);
+		// prefs
+		// .setValue(
+		// IJavaScriptAndJdtDebuggerPreferenceConstants.PREF_BREAK_ON_METHOD_EXIT,
+		// false);
+		// prefs
+		// .setValue(
+		// IJavaScriptAndJdtDebuggerPreferenceConstants.PREF_BREAK_ON_EXCEPTION,
+		// false);
 	}
 
 	/*