From 7d11c392903cca7d77d5fd7947cf2449fe834e18 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 30 Aug 2010 13:02:08 +0400
Subject: [PATCH] WI-2928: Open in browser action has no default text and
 description

---
 .../src/messages/XmlBundle.properties           |  2 --
 .../src/META-INF/XmlActions.xml                 | 15 +++++++++++++++
 .../src/META-INF/XmlPlugin.xml                  | 17 -----------------
 .../ide/browsers/OpenFileInBrowserAction.java   |  2 --
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/platform/platform-resources-en/src/messages/XmlBundle.properties b/platform/platform-resources-en/src/messages/XmlBundle.properties
index da65f049895b..9e64e62cff5b 100644
--- a/platform/platform-resources-en/src/messages/XmlBundle.properties
+++ b/platform/platform-resources-en/src/messages/XmlBundle.properties
@@ -160,8 +160,6 @@ browser.path.not.specified=Please, set the path to the browser at Settings / Web
 browser.path.not.specified.title=Browser Path Was Not Specified
 browser.error=Browser Error
 web.editor.configuration.title=Web
-action.OpenInBrowser.text=Open in _Browser
-action.open.file.in.browser.description=Open a selected file in browser
 
 
 xml.split.tag.intention.action=Split current tag
diff --git a/platform/platform-resources/src/META-INF/XmlActions.xml b/platform/platform-resources/src/META-INF/XmlActions.xml
index 243c6ea3713c..d158451fa8b1 100644
--- a/platform/platform-resources/src/META-INF/XmlActions.xml
+++ b/platform/platform-resources/src/META-INF/XmlActions.xml
@@ -64,6 +64,21 @@
       </action>
     </group>
 
+    <group id="NewXml" text="XML">
+      <!--<action id="NewHtmlType" class="com.intellij.ide.actions.CreateHtmlAction" text="HTML File"/>-->
+      <!--<action id="NewHtml5Type" class="com.intellij.ide.actions.CreateHtml5Action" text="HTML5 File"/>-->
+      <!--<action id="NewXhtmlType" class="com.intellij.ide.actions.CreateXhtmlAction" text="XHTML File"/>-->
+      <action id="NewHtmlFile" class="com.intellij.ide.actions.CreateHtmlFileAction"/>
+      <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFromTemplate"/>
+    </group>
+
+    <action id="OpenInBrowser" class="com.intellij.ide.browsers.OpenFileInBrowserAction"
+            text="Open in _Browser" description="Open a selected file in browser"
+            icon="/nodes/ppWeb.png">
+      <add-to-group group-id="ViewMenu" anchor="after" relative-to-action="ViewSource"/>
+      <add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="CutCopyPasteGroup"/>
+      <add-to-group group-id="ProjectViewPopupMenu" anchor="after" relative-to-action="EditSource"/>
+    </action>
 
   </actions>
 </component>
diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
index 0950e06abc04..836f090855fa 100644
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -328,21 +328,4 @@
     <renameInputValidator implementation="com.intellij.lang.xml.XmlElementRenameValidator"/>
     <renameInputValidator implementation="com.intellij.lang.xml.XmlAttributeValueRenameValidator"/>
   </extensions>
-
-  <actions>
-    <group id="NewXml" text="XML">
-      <!--<action id="NewHtmlType" class="com.intellij.ide.actions.CreateHtmlAction" text="HTML File"/>-->
-      <!--<action id="NewHtml5Type" class="com.intellij.ide.actions.CreateHtml5Action" text="HTML5 File"/>-->
-      <!--<action id="NewXhtmlType" class="com.intellij.ide.actions.CreateXhtmlAction" text="XHTML File"/>-->
-      <action id="NewHtmlFile" class="com.intellij.ide.actions.CreateHtmlFileAction"/>
-      <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFromTemplate"/>
-    </group>
-
-    <action id="OpenInBrowser" class="com.intellij.ide.browsers.OpenFileInBrowserAction"
-            icon="/nodes/ppWeb.png">
-      <add-to-group group-id="ViewMenu" anchor="after" relative-to-action="ViewSource"/>
-      <add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="CutCopyPasteGroup"/>
-      <add-to-group group-id="ProjectViewPopupMenu" anchor="after" relative-to-action="EditSource"/>
-    </action>
-  </actions>
 </idea-plugin>
diff --git a/xml/impl/src/com/intellij/ide/browsers/OpenFileInBrowserAction.java b/xml/impl/src/com/intellij/ide/browsers/OpenFileInBrowserAction.java
index f94b8f29a8cc..364a9717eafe 100644
--- a/xml/impl/src/com/intellij/ide/browsers/OpenFileInBrowserAction.java
+++ b/xml/impl/src/com/intellij/ide/browsers/OpenFileInBrowserAction.java
@@ -19,8 +19,6 @@ public class OpenFileInBrowserAction extends DumbAwareAction {
 
     if (file != null) {
       presentation.setVisible(true);
-      presentation.setText(XmlBundle.message("action.OpenInBrowser.text"));
-      presentation.setDescription(XmlBundle.message("action.open.file.in.browser.description"));
 
       final WebBrowserUrlProvider browserUrlProvider = WebBrowserUrlProviders.getProvider(file);
       presentation.setEnabled(browserUrlProvider != null);