diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java index ecff2e1906a7..d42e32e368b6 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java @@ -19,6 +19,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.refactoring.RefactoringBundle; import com.intellij.ui.ScrollPaneFactory; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -48,8 +49,7 @@ public class FailedConversionsDialog extends DialogWrapper { protected JComponent createCenterPanel() { JPanel panel = new JPanel(new BorderLayout()); - @NonNls final String contentType = "text/html"; - final JEditorPane messagePane = new JEditorPane(contentType, ""); + final JEditorPane messagePane = new JEditorPane(UIUtil.HTML_MIME, ""); messagePane.setEditable(false); JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(messagePane); scrollPane.setPreferredSize(new Dimension(500, 400)); diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java index a61880eeff76..5f539a0946fc 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java @@ -56,6 +56,7 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.testFramework.LightVirtualFile; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SeparatorFactory; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -79,7 +80,6 @@ import java.util.ArrayList; public class FileTemplateConfigurable implements Configurable, Configurable.NoScroll { private static final Logger LOG = Logger.getInstance("#com.intellij.ide.fileTemplates.impl.FileTemplateConfigurable"); - @NonNls private static final String CONTENT_TYPE_HTML = "text/html"; @NonNls private static final String EMPTY_HTML = ""; @NonNls private static final String CONTENT_TYPE_PLAIN = "text/plain"; @@ -167,7 +167,7 @@ public class FileTemplateConfigurable implements Configurable, Configurable.NoSc myTemplateEditor = createEditor(); - myDescriptionComponent = new JEditorPane(CONTENT_TYPE_HTML, EMPTY_HTML); + myDescriptionComponent = new JEditorPane(UIUtil.HTML_MIME, EMPTY_HTML); myDescriptionComponent.setEditable(false); myAdjustBox = new JCheckBox(IdeBundle.message("checkbox.reformat.according.to.style")); @@ -343,7 +343,7 @@ public class FileTemplateConfigurable implements Configurable, Configurable.NoSc myDescriptionComponent.setContentType(CONTENT_TYPE_PLAIN); myDescriptionComponent.setEditable(true); myDescriptionComponent.setText(desc); - myDescriptionComponent.setContentType(CONTENT_TYPE_HTML); + myDescriptionComponent.setContentType(UIUtil.HTML_MIME); myDescriptionComponent.setText(desc); myDescriptionComponent.setCaretPosition(0); myDescriptionComponent.setEditable(false); diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java index 3976c912b9a9..b6572c7ea191 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java @@ -24,6 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.refactoring.RefactoringBundle; import com.intellij.ui.ScrollPaneFactory; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -54,8 +55,7 @@ public class UnsafeUsagesDialog extends DialogWrapper { protected JComponent createCenterPanel() { JPanel panel = new JPanel(new BorderLayout()); - @NonNls final String contentType = "text/html"; - myMessagePane = new JEditorPane(contentType, ""); + myMessagePane = new JEditorPane(UIUtil.HTML_MIME, ""); myMessagePane.setEditable(false); JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myMessagePane); scrollPane.setPreferredSize(new Dimension(500, 400)); diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java index 3838a332f917..e344a5ed402c 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java @@ -34,6 +34,7 @@ import com.intellij.usageView.UsageInfo; import com.intellij.usages.*; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.MultiMap; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -118,13 +119,12 @@ public class ConflictsDialog extends DialogWrapper{ panel.add(new JLabel(RefactoringBundle.message("the.following.problems.were.found")), BorderLayout.NORTH); - @NonNls String contentType = "text/html"; @NonNls StringBuilder buf = new StringBuilder(); for (String description : myConflictDescriptions) { buf.append(description); buf.append("

"); } - JEditorPane messagePane = new JEditorPane(contentType, buf.toString()); + JEditorPane messagePane = new JEditorPane(UIUtil.HTML_MIME, buf.toString()); messagePane.setEditable(false); JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(messagePane, ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, diff --git a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java index a6c0cec69314..5f91404727ea 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java @@ -1005,7 +1005,7 @@ public class Messages { final HTMLEditorKit editorKit = new HTMLEditorKit(); editorKit.getStyleSheet().addRule(UIUtil.displayPropertiesToCSS(UIUtil.getLabelFont(), UIUtil.getLabelForeground())); messageComponent.setEditorKit(editorKit); - messageComponent.setContentType("text/html"); + messageComponent.setContentType(UIUtil.HTML_MIME); if (addBrowserHyperlinkListener) { messageComponent.addHyperlinkListener(new BrowserHyperlinkListener()); } diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java b/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java index eecdd541cbda..1599479c176b 100644 --- a/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java +++ b/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java @@ -34,6 +34,7 @@ import com.intellij.ui.table.TableView; import com.intellij.util.text.DateFormatUtil; import com.intellij.util.ui.ColumnInfo; import com.intellij.util.ui.ListTableModel; +import com.intellij.util.ui.UIUtil; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -172,8 +173,7 @@ public class ShowFeatureUsageStatisticsDialog extends DialogWrapper { splitter.setFirstComponent(topPanel); - //noinspection HardCodedStringLiteral - final JEditorPane browser = new JEditorPane("text/html", ""); + final JEditorPane browser = new JEditorPane(UIUtil.HTML_MIME, ""); browser.setEditable(false); splitter.setSecondComponent(ScrollPaneFactory.createScrollPane(browser)); diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java b/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java index bb8919a436ef..e557dadc28dc 100644 --- a/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java +++ b/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java @@ -24,6 +24,7 @@ import com.intellij.ide.util.TipUIUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.ScrollPaneFactory; +import com.intellij.util.ui.UIUtil; import javax.swing.*; import java.awt.*; @@ -60,7 +61,7 @@ public class AdaptiveTipDialog extends DialogWrapper { protected JComponent createCenterPanel() { JPanel panel = new JPanel(new BorderLayout()); - myBrowser = new JEditorPane("text/html", ""); + myBrowser = new JEditorPane(UIUtil.HTML_MIME, ""); panel.add(ScrollPaneFactory.createScrollPane(myBrowser)); panel.setPreferredSize(new Dimension(DEFAULT_WIDTH, DEFAULT_HEIGHT)); diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NewChannelDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NewChannelDialog.java index e00c7240bb69..22b002594631 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NewChannelDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NewChannelDialog.java @@ -72,7 +72,7 @@ public class NewChannelDialog extends DialogWrapper { @Override protected JComponent createCenterPanel() { - JEditorPane pane = new JEditorPane("text/html", myInformationText); + JEditorPane pane = new JEditorPane(UIUtil.HTML_MIME, myInformationText); pane.addHyperlinkListener(new BrowserHyperlinkListener()); pane.setEditable(false); pane.setBackground(UIUtil.getLabelBackground());