MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use UIUtil.HTML_MIME

Browse Source
This commit is contained in:
Yann Cebron
2012-01-04 13:44:25 +01:00
parent a6a1646162
commit ce7c8fe646
8 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java
+2 -2
View File
@@ -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));
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java
+3 -3
View File
@@ -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 = "<html></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);
platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java
+2 -2
View File
@@ -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));
platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java
+2 -2
View File
@@ -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("<br><br>");
}
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,
platform/platform-api/src/com/intellij/openapi/ui/Messages.java
+1 -1
View File
@@ -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());
}
platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java
+2 -2
View File
@@ -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));
platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java
+2 -1
View File
@@ -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));
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NewChannelDialog.java
+1 -1
View File
@@ -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());