# HG changeset patch
# User Eugene Ostroukhov <eugeneo@symbian.org>
# Date 1283545557 25200
# Node ID 356e574037782de7d7aa85ad08f9537b87a51a18
# Parent  f0031abe2cd6af89963e144715fc857208d939ad
Debugger action was moved to Symbian-specific plugin as it slightly conflicts with Eclipse.org policy

diff -r f0031abe2cd6 -r 356e57403778 plugins/org.symbian.tools.tmw.debug/icons/debug_exc.gif
Binary file plugins/org.symbian.tools.tmw.debug/icons/debug_exc.gif has changed
diff -r f0031abe2cd6 -r 356e57403778 plugins/org.symbian.tools.tmw.debug/plugin.xml
--- a/plugins/org.symbian.tools.tmw.debug/plugin.xml	Thu Sep 02 16:34:16 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.debug/plugin.xml	Fri Sep 03 13:25:57 2010 -0700
@@ -15,7 +15,7 @@
             id="org.symbian.tools.tmwtools.debug"
             name="Tools for Mobile Web">
          <keywordReference
-               id="org.symbian.tools.tmwtools.tmwwords">
+               id="org.symbian.tools.wrttools.wrtwords">
          </keywordReference>
          <keywordReference
                id="org.symbian.tools.tmwtools.debug.page">
@@ -144,52 +144,6 @@
                menubarPath="group.properties">
          </action>
       </viewerContribution>
-      <objectContribution
-            id="org.symbian.tools.tmwtools.debug.core.context"
-            objectClass="java.lang.Object">
-         <enablement>
-            <or>
-               <and>
-                  <not>
-                     <with
-                           variable="org.eclipse.core.runtime.Platform">
-                        <test
-                              args="org.eclipse.debug.core"
-                              property="org.eclipse.core.runtime.bundleState"
-                              value="ACTIVE">
-                        </test>
-                     </with>
-                  </not>
-                  <adapt
-                        type="org.eclipse.core.resources.IResource">
-                  </adapt>
-               </and>
-               <and>
-                  <with
-                        variable="org.eclipse.core.runtime.Platform">
-                     <test
-                           args="org.eclipse.debug.core"
-                           property="org.eclipse.core.runtime.bundleState"
-                           value="ACTIVE">
-                     </test>
-                  </with>
-                  <test
-                        property="org.eclipse.debug.core.launchable"
-                        value="debug">
-                  </test>
-               </and>
-            </or>
-         </enablement>
-         <action
-               class="org.symbian.tools.tmw.debug.ui.actions.DebugAction"
-               enablesFor="+"
-               icon="icons/debug_exc.gif"
-               id="org.eclipse.debug.ui.contextualLaunch.debug.submenu"
-               label="Debug"
-               menubarPath="additions"
-               style="push">
-         </action>
-      </objectContribution>
       <viewerContribution
             id="org.symbian.tools.tmwtools.debug.core.watch"
             targetID="#JavaScriptEditorContext">
@@ -236,15 +190,6 @@
       </editorContribution>
    </extension>
    <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.debug.ui.DebugPerspective">
-         <actionSet
-               id="org.symbian.tools.tmwtools.debug.core.mainActions">
-         </actionSet>
-      </perspectiveExtension>
-   </extension>
-   <extension
          point="org.eclipse.debug.ui.debugModelPresentations">
       <debugModelPresentation
             class="org.symbian.tools.tmw.debug.internal.model.SymbianDebugModelPresentation"
@@ -280,24 +225,7 @@
             <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
          </factory>
     </extension>
-    <extension
-          point="org.eclipse.ui.actionSets">
-       <actionSet
-             description="Actions for Mobile Web debugging"
-             id="org.symbian.tools.tmwtools.debug.core.mainActions"
-             label="Mobile Web Debug">
-          <action
-                class="org.symbian.tools.tmw.debug.ui.actions.DebugAction"
-                helpContextId="debug_last_action_context"
-                icon="icons/debug_exc.gif"
-                id="org.symbian.tools.tmwtools.debug.core.debug"
-                label="Debug"
-                menubarPath="org.eclipse.ui.run/relaunchGroup"
-                style="push"
-                toolbarPath="debug">
-          </action>
-       </actionSet>
-    </extension>
+
     <extension
           point="org.eclipse.ui.keywords">
        <keyword
diff -r f0031abe2cd6 -r 356e57403778 plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/ui/actions/DebugAction.java
--- a/plugins/org.symbian.tools.tmw.debug/src/org/symbian/tools/tmw/debug/ui/actions/DebugAction.java	Thu Sep 02 16:34:16 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/**
- * Copyright (c) 2010 Symbian Foundation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of the License "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Symbian Foundation - initial contribution.
- * Contributors:
- * Description:
- * Overview:
- * Details:
- * Platforms/Drives/Compatibility:
- * Assumptions/Requirement/Pre-requisites:
- * Failures and causes:
- */
-package org.symbian.tools.tmw.debug.ui.actions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.debug.internal.ui.actions.DebugLastAction;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.symbian.tools.tmw.core.TMWCore;
-
-@SuppressWarnings("restriction")
-public class DebugAction extends DebugLastAction {
-    @Override
-    public void run(IAction action) {
-        boolean hasTmwProjects = false;
-        IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-        for (IProject project : projects) {
-            if (project.isAccessible() && TMWCore.create(project) != null) {
-                hasTmwProjects = true;
-                break;
-            }
-        }
-        if (hasTmwProjects) {
-            super.run(action);
-        } else {
-            MessageDialog.openInformation(getShell(), "Cannot launch debugger",
-                    "There are no open projects in your workspace");
-        }
-    }
-}
diff -r f0031abe2cd6 -r 356e57403778 plugins/org.symbian.tools.wrttools.product/META-INF/MANIFEST.MF
--- a/plugins/org.symbian.tools.wrttools.product/META-INF/MANIFEST.MF	Thu Sep 02 16:34:16 2010 -0700
+++ b/plugins/org.symbian.tools.wrttools.product/META-INF/MANIFEST.MF	Fri Sep 03 13:25:57 2010 -0700
@@ -19,6 +19,7 @@
  org.symbian.tools.tmw.previewer;bundle-version="0.9.0",
  org.eclipse.ui.intro,
  org.symbian.tools.tmw.ui;bundle-version="1.0.0",
- org.eclipse.wst.common.project.facet.ui;bundle-version="1.4.100"
+ org.eclipse.wst.common.project.facet.ui;bundle-version="1.4.100",
+ org.symbian.tools.tmw.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff -r f0031abe2cd6 -r 356e57403778 plugins/org.symbian.tools.wrttools.product/icons/debug_exc.gif
Binary file plugins/org.symbian.tools.wrttools.product/icons/debug_exc.gif has changed
diff -r f0031abe2cd6 -r 356e57403778 plugins/org.symbian.tools.wrttools.product/plugin.xml
--- a/plugins/org.symbian.tools.wrttools.product/plugin.xml	Thu Sep 02 16:34:16 2010 -0700
+++ b/plugins/org.symbian.tools.wrttools.product/plugin.xml	Fri Sep 03 13:25:57 2010 -0700
@@ -250,6 +250,9 @@
          <showInPart
                id="org.eclipse.ui.navigator.ProjectExplorer">
          </showInPart>
+         <actionSet
+               id="org.symbian.tools.tmwtools.debug.core.mainActions">
+         </actionSet>
       </perspectiveExtension>
       <perspectiveExtension
             targetID="org.eclipse.debug.ui.DebugPerspective">
@@ -260,6 +263,9 @@
                id="org.symbian.tools.wrttools.mainPerspective">
          </perspectiveShortcut>
          <actionSet
+               id="org.symbian.tools.tmwtools.debug.core.mainActions">
+         </actionSet>
+         <actionSet
                id="org.eclipse.debug.ui.breakpointActionSet">
          </actionSet>
          <actionSet
@@ -269,6 +275,72 @@
                id="org.symbian.tools.tmwtools.debug.core.mainActions">
          </actionSet>
       </perspectiveExtension>
-
+   </extension>
+    <extension
+          point="org.eclipse.ui.actionSets">
+       <actionSet
+             description="Actions for Mobile Web debugging"
+             id="org.symbian.tools.tmwtools.debug.core.mainActions"
+             label="Mobile Web Debug">
+          <action
+                class="org.symbian.tools.wrttools.product.actions.DebugAction"
+                helpContextId="debug_last_action_context"
+                icon="icons/debug_exc.gif"
+                id="org.symbian.tools.tmwtools.debug.core.debug"
+                label="Debug"
+                menubarPath="org.eclipse.ui.run/relaunchGroup"
+                style="push"
+                toolbarPath="debug">
+          </action>
+       </actionSet>
+    </extension>
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            id="org.symbian.tools.tmwtools.debug.core.context"
+            objectClass="java.lang.Object">
+         <enablement>
+            <or>
+               <and>
+                  <not>
+                     <with
+                           variable="org.eclipse.core.runtime.Platform">
+                        <test
+                              args="org.eclipse.debug.core"
+                              property="org.eclipse.core.runtime.bundleState"
+                              value="ACTIVE">
+                        </test>
+                     </with>
+                  </not>
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </and>
+               <and>
+                  <with
+                        variable="org.eclipse.core.runtime.Platform">
+                     <test
+                           args="org.eclipse.debug.core"
+                           property="org.eclipse.core.runtime.bundleState"
+                           value="ACTIVE">
+                     </test>
+                  </with>
+                  <test
+                        property="org.eclipse.debug.core.launchable"
+                        value="debug">
+                  </test>
+               </and>
+            </or>
+         </enablement>
+         <action
+               class="org.symbian.tools.wrttools.product.actions.DebugAction"
+               enablesFor="+"
+               icon="icons/debug_exc.gif"
+               id="org.eclipse.debug.ui.contextualLaunch.debug.submenu"
+               label="Debug"
+               menubarPath="additions"
+               style="push">
+         </action>
+      </objectContribution>
    </extension>
 </plugin>
diff -r f0031abe2cd6 -r 356e57403778 plugins/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/DebugAction.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/DebugAction.java	Fri Sep 03 13:25:57 2010 -0700
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2010 Symbian Foundation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Symbian Foundation - initial contribution.
+ * Contributors:
+ * Description:
+ * Overview:
+ * Details:
+ * Platforms/Drives/Compatibility:
+ * Assumptions/Requirement/Pre-requisites:
+ * Failures and causes:
+ */
+package org.symbian.tools.wrttools.product.actions;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.debug.internal.ui.actions.DebugLastAction;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.symbian.tools.tmw.core.TMWCore;
+
+@SuppressWarnings("restriction")
+public class DebugAction extends DebugLastAction {
+    @Override
+    public void run(IAction action) {
+        boolean hasTmwProjects = false;
+        IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+        for (IProject project : projects) {
+            if (project.isAccessible() && TMWCore.create(project) != null) {
+                hasTmwProjects = true;
+                break;
+            }
+        }
+        if (hasTmwProjects) {
+            super.run(action);
+        } else {
+            MessageDialog.openInformation(getShell(), "Cannot launch debugger",
+                    "There are no open projects in your workspace");
+        }
+    }
+}