### Eclipse Workspace Patch 1.0
#P org.jboss.tools.vpe.browsersim.eclipse
Index: src/org/jboss/tools/vpe/browsersim/eclipse/actions/RunBrowserSimAction.java
===================================================================
--- src/org/jboss/tools/vpe/browsersim/eclipse/actions/RunBrowserSimAction.java	(revision 0)
+++ src/org/jboss/tools/vpe/browsersim/eclipse/actions/RunBrowserSimAction.java	(working copy)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ *     Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.browsersim.eclipse.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.jboss.tools.vpe.browsersim.eclipse.util.BrowserSimLauncher;
+
+/**
+ * @author "Yahor Radtsevich (yradtsevich)"
+ */
+public class RunBrowserSimAction implements IWorkbenchWindowActionDelegate {
+
+	@Override
+	public void run(IAction action) {
+		BrowserSimLauncher.launchBrowserSim(null);
+	}
+
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+	@Override
+	public void dispose() {
+	}
+
+	@Override
+	public void init(IWorkbenchWindow window) {
+	}
+}
Index: src/org/jboss/tools/vpe/browsersim/eclipse/handlers/RunBrowserSimHandler.java
===================================================================
--- src/org/jboss/tools/vpe/browsersim/eclipse/handlers/RunBrowserSimHandler.java	(revision 37127)
+++ src/org/jboss/tools/vpe/browsersim/eclipse/handlers/RunBrowserSimHandler.java	(working copy)
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- *     Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.browsersim.eclipse.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.jboss.tools.vpe.browsersim.eclipse.util.BrowserSimLauncher;
-
-/**
- * @author "Yahor Radtsevich (yradtsevich)"
- */
-public class RunBrowserSimHandler extends AbstractHandler {
-	/**
-	 * The constructor.
-	 */
-	public RunBrowserSimHandler() {
-	}
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		BrowserSimLauncher.launchBrowserSim(null);			
-		//Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event).getShell();
-		return null;
-	}
-}
Index: plugin.xml
===================================================================
--- plugin.xml	(revision 37127)
+++ plugin.xml	(working copy)
@@ -13,13 +13,6 @@
             id="org.jboss.tools.vpe.browsersim.eclipse.commands.runBrowserSim">
       </command>
    </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            commandId="org.jboss.tools.vpe.browsersim.eclipse.commands.runBrowserSim"
-            class="org.jboss.tools.vpe.browsersim.eclipse.handlers.RunBrowserSimHandler">
-      </handler>
-   </extension>
    <!--extension
          point="org.eclipse.ui.bindings">
       <key
@@ -30,19 +23,20 @@
       </key>
    </extension-->
    <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
-         <toolbar
-               id="org.jboss.tools.vpe.browsersim.eclipse.toolbars.sampleToolbar">
-            <command
-                  commandId="org.jboss.tools.vpe.browsersim.eclipse.commands.runBrowserSim"
-                  icon="icons/sample.gif"
-                  tooltip="Run Mobile Browser Simulator"
-                  id="org.jboss.tools.vpe.browsersim.eclipse.toolbars.runBrowserSim">
-            </command>
-         </toolbar>
-      </menuContribution>
+         point="org.eclipse.ui.actionSets">
+      <actionSet
+            id="org.jboss.tools.vpe.browsersim.eclipse.actionSet"
+            label="Mobile Browser Simulator"
+            visible="false">
+            	<action
+                   id="org.jboss.tools.vpe.browsersim.eclipse.runBrowserSim"
+                   definitionId="org.jboss.tools.vpe.browsersim.eclipse.commands.runBrowserSim"
+                   toolbarPath="browserSim"
+                   label="Run Mobile Browser Simulator"
+                   class="org.jboss.tools.vpe.browsersim.eclipse.actions.RunBrowserSimAction"
+                   icon="icons/sample.gif">
+            	</action>
+      </actionSet>
    </extension>
    <extension
          point="org.eclipse.ui.editors">