From b4eb412d8a2de4f5b4b38a0dceaa8bd87dbe60e1 Mon Sep 17 00:00:00 2001
From: Oleg Shpynov <oleg.shpynov@jebrains.com>
Date: Thu, 11 Nov 2010 17:45:34 +0300
Subject: [PATCH] IDEA-60683 GitHub integration: Share project on GitHub:
 multiline comment is not supported

---
 .../src/com/intellij/openapi/util/JDOMUtil.java     | 13 +++++++------
 .../org/jetbrains/plugins/github/GithubUtil.java    |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
index f71c8bb6f10e..9abb7c0f743f 100644
--- a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
@@ -482,11 +482,12 @@ public class JDOMUtil {
    * Returns null if no escapement necessary.
    */
   @Nullable
-  private static String escapeChar(char c, boolean escapeLineEnds) {
+  private static String escapeChar(char c, boolean escapeSpaces, boolean escapeLineEnds) {
     switch (c) {
       case '\n': return escapeLineEnds ? "&#10;" : null;
       case '\r': return escapeLineEnds ? "&#13;" : null;
       case '\t': return escapeLineEnds ? "&#9;" : null;
+      case ' ' : return escapeSpaces  ? "&#20" : null;
       case '<':  return "&lt;";
       case '>':  return "&gt;";
       case '\"': return "&quot;";
@@ -497,15 +498,15 @@ public class JDOMUtil {
 
   @NotNull
   public static String escapeText(String text) {
-    return escapeText(text, false);
+    return escapeText(text, false, false);
   }
 
   @NotNull
-  private static String escapeText(String text, boolean escapeLineEnds) {
+  public static String escapeText(String text, 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, escapeLineEnds);
+      final String quotation = escapeChar(ch, escapeSpaces, escapeLineEnds);
 
       if (buffer == null) {
         if (quotation != null) {
@@ -548,11 +549,11 @@ public class JDOMUtil {
 
   public static class MyXMLOutputter extends XMLOutputter {
     public String escapeAttributeEntities(String str) {
-      return escapeText(str, true);
+      return escapeText(str, false, true);
     }
 
     public String escapeElementEntities(String str) {
-      return escapeText(str, false);
+      return escapeText(str, false, false);
     }
   }
 
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
index 61606a2d0969..f9d4ef55250b 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
@@ -42,7 +42,7 @@ public class GithubUtil {
   public static HttpMethod doREST(final String login, final String password, final String request, final boolean post) throws Exception {
     final HttpClient client = getHttpClient(login, password);
     client.getParams().setContentCharset("UTF-8");
-    final String uri = getUrl() + JDOMUtil.escapeText(request).replaceAll(" ", "%20");
+    final String uri = JDOMUtil.escapeText(getUrl() + request, true, true);
     final HttpMethod method = post ? new PostMethod(uri) : new GetMethod(uri);
     client.executeMethod(method);
     return method;