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

AppCode:Scheme: properly escape xml text and attributes (OC-3323)

Browse Source
This commit is contained in:
Anton Makeev
2012-03-13 14:42:31 +01:00
parent f9a2b821e1
commit 14b5456d72
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/openapi/util/JDOMUtil.java
+8 -2
View File
@@ -514,7 +514,7 @@ public class JDOMUtil {
* Returns null if no escapement necessary.
*/
@Nullable
private static String escapeChar(char c, boolean escapeSpaces, boolean escapeLineEnds) {
private static String escapeChar(char c, boolean escapeApostrophes, boolean escapeSpaces, boolean escapeLineEnds) {
switch (c) {
case '\n': return escapeLineEnds ? "
" : null;
case '\r': return escapeLineEnds ? "
" : null;
@@ -523,6 +523,7 @@ public class JDOMUtil {
case '<': return "&lt;";
case '>': return "&gt;";
case '\"': return "&quot;";
case '\'': return escapeApostrophes ? "&apos;": null;
case '&': return "&amp;";
}
return null;
@@ -535,10 +536,15 @@ public class JDOMUtil {
@NotNull
public static String escapeText(String text, boolean escapeSpaces, boolean escapeLineEnds) {
return escapeText(text, false, escapeSpaces, escapeLineEnds);
}
@NotNull
public static String escapeText(String text, boolean escapeApostrophes, boolean escapeSpaces, boolean escapeLineEnds) {
StringBuffer buffer = null;
for (int i = 0; i < text.length(); i++) {
final char ch = text.charAt(i);
final String quotation = escapeChar(ch, escapeSpaces, escapeLineEnds);
final String quotation = escapeChar(ch, escapeApostrophes, escapeSpaces, escapeLineEnds);
if (buffer == null) {
if (quotation != null) {