diff --git a/xml/impl/src/com/intellij/ide/browsers/BrowserFamily.java b/platform/platform-api/src/com/intellij/ide/browsers/BrowserFamily.java similarity index 100% rename from xml/impl/src/com/intellij/ide/browsers/BrowserFamily.java rename to platform/platform-api/src/com/intellij/ide/browsers/BrowserFamily.java diff --git a/xml/impl/src/com/intellij/ide/browsers/BrowserSpecificSettings.java b/platform/platform-api/src/com/intellij/ide/browsers/BrowserSpecificSettings.java similarity index 100% rename from xml/impl/src/com/intellij/ide/browsers/BrowserSpecificSettings.java rename to platform/platform-api/src/com/intellij/ide/browsers/BrowserSpecificSettings.java diff --git a/xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettings.java b/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettings.java similarity index 100% rename from xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettings.java rename to platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettings.java diff --git a/xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.form b/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.form similarity index 100% rename from xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.form rename to platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.form diff --git a/xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java b/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java similarity index 100% rename from xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java rename to platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java diff --git a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxProfile.java b/platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxProfile.java similarity index 100% rename from xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxProfile.java rename to platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxProfile.java diff --git a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettings.java b/platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettings.java similarity index 100% rename from xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettings.java rename to platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettings.java diff --git a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.form b/platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.form similarity index 97% rename from xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.form rename to platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.form index bd1e753ec59b..27890c577f2f 100644 --- a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.form +++ b/platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.form @@ -29,19 +29,19 @@ - - - - - - - - + + + + + + + + @@ -66,7 +66,7 @@ - + diff --git a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java b/platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java similarity index 97% rename from xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java rename to platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java index 9aedd893b31d..effd129eeb55 100644 --- a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java +++ b/platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettingsConfigurable.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.browsers.firefox; +import com.intellij.ide.IdeBundle; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.PathChooserDialog; import com.intellij.openapi.options.Configurable; @@ -25,7 +26,6 @@ import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.DocumentAdapter; -import com.intellij.xml.XmlBundle; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.Nullable; @@ -50,7 +50,7 @@ public class FirefoxSettingsConfigurable implements Configurable { public FirefoxSettingsConfigurable(FirefoxSettings settings) { mySettings = settings; - myProfilesIniPathField.addBrowseFolderListener(XmlBundle.message("chooser.title.select.profiles.ini.file"), null, null, PROFILES_INI_CHOOSER_DESCRIPTOR); + myProfilesIniPathField.addBrowseFolderListener(IdeBundle.message("chooser.title.select.profiles.ini.file"), null, null, PROFILES_INI_CHOOSER_DESCRIPTOR); myProfilesIniPathField.getTextField().getDocument().addDocumentListener(new DocumentAdapter() { @Override protected void textChanged(DocumentEvent e) { @@ -144,7 +144,7 @@ public class FirefoxSettingsConfigurable implements Configurable { @Override @Nls public String getDisplayName() { - return XmlBundle.message("display.name.firefox.settings"); + return IdeBundle.message("display.name.firefox.settings"); } @Override diff --git a/xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxUtil.java b/platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxUtil.java similarity index 100% rename from xml/impl/src/com/intellij/ide/browsers/firefox/FirefoxUtil.java rename to platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxUtil.java diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index 39fd5a3d3238..7e82df4f4f1b 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -3,6 +3,12 @@ error.cannot.start.browser=Cannot start browser: {0} error.please.specify.path.to.web.browser=Please specify a path to web browser in {0} | Web Browsers title.browser.not.found=Browser Not Found +chooser.title.select.profiles.ini.file=Select \"profiles.ini\" File +label.text.path.to.profiles.ini=Path to \"profiles.ini\": +label.text.profile=&Profile: +button.text.settings=Settings... +display.name.firefox.settings=Firefox Settings + browsers.explorer=Internet Explorer browsers.safari=Safari browsers.opera=Opera diff --git a/platform/platform-resources-en/src/messages/XmlBundle.properties b/platform/platform-resources-en/src/messages/XmlBundle.properties index 82c72e9b0662..ee7468c273d7 100644 --- a/platform/platform-resources-en/src/messages/XmlBundle.properties +++ b/platform/platform-resources-en/src/messages/XmlBundle.properties @@ -222,12 +222,6 @@ cant.rename.file=Can't rename {0} to {1} cant.delete.file=Can't delete file {0} select.xsd.schema.dialog.title=Select XSD Schema -chooser.title.select.profiles.ini.file=Select \"profiles.ini\" File -label.text.path.to.profiles.ini=Path to \"profiles.ini\": -label.text.profile=&Profile: -button.text.settings=Settings... -display.name.firefox.settings=Firefox Settings - emmet.title=Emmet emmet.configuration.title=Emmet (Zen Coding) emmet.enable.label=&Enable XML Emmet