From a07a0f2c7cdcb1eedba70068bed0c0cc3c1f067a Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Mon, 16 Dec 2013 16:09:14 +0100 Subject: [PATCH] better method name --- .../src/com/intellij/ide/highlighter/HtmlFileType.java | 4 ++-- xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileType.java b/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileType.java index 9341d99c8031..ca24a52762db 100644 --- a/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileType.java +++ b/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileType.java @@ -79,7 +79,7 @@ public class HtmlFileType extends XmlLikeFileType { catch (UnsupportedEncodingException e) { return null; } - Charset c = HtmlUtil.detectCharsetFromMetaHttpEquiv(strContent); + Charset c = HtmlUtil.detectCharsetFromMetaTag(strContent); return c == null ? null : c.name(); } @@ -91,6 +91,6 @@ public class HtmlFileType extends XmlLikeFileType { if (charset != null) { return charset; } - return HtmlUtil.detectCharsetFromMetaHttpEquiv(content); + return HtmlUtil.detectCharsetFromMetaTag(content); } } diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java index 85410a764d94..adcfba57d616 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java @@ -445,7 +445,7 @@ public class HtmlUtil { private static final TerminateException INSTANCE = new TerminateException(); } - public static Charset detectCharsetFromMetaHttpEquiv(@NotNull String content) { + public static Charset detectCharsetFromMetaTag(@NotNull String content) { // check for or and return Charset // because we will lightly parse and explicit charset isn't used very often do quick check for applicability int charPrefix = content.indexOf(CHARSET);