From b3fd22db7d35ec7046a8d63d25f37104ebf78aff Mon Sep 17 00:00:00 2001
From: relves
Date: Tue, 6 Apr 2010 23:20:40 +0000
Subject: NEW - bug 303015: [oslc] implement boiler plate oslc connector
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=303015

---
 .../mylyn/internal/oslc/core/client/AbstractOslcClient.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'org.eclipse.mylyn.oslc.core')

diff --git a/org.eclipse.mylyn.oslc.core/src/org/eclipse/mylyn/internal/oslc/core/client/AbstractOslcClient.java b/org.eclipse.mylyn.oslc.core/src/org/eclipse/mylyn/internal/oslc/core/client/AbstractOslcClient.java
index 2c1081cf9..a85005218 100644
--- a/org.eclipse.mylyn.oslc.core/src/org/eclipse/mylyn/internal/oslc/core/client/AbstractOslcClient.java
+++ b/org.eclipse.mylyn.oslc.core/src/org/eclipse/mylyn/internal/oslc/core/client/AbstractOslcClient.java
@@ -14,6 +14,7 @@ package org.eclipse.mylyn.internal.oslc.core.client;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -378,8 +379,13 @@ public abstract class AbstractOslcClient {
 		return configuration;
 	}
 
-	public Collection<AbstractChangeRequest> performQuery(String queryUrl, IProgressMonitor monitor)
-			throws CoreException {
+	public Collection<AbstractChangeRequest> performQuery(String query, IProgressMonitor monitor) throws CoreException {
+		try {
+			query = URLEncoder.encode(query, "UTF-8"); //$NON-NLS-1$
+		} catch (UnsupportedEncodingException e) {
+			query = URLEncoder.encode(query);
+		}
+		final String requestUrl = getConfiguration(monitor).getSimpleQueryUrl() + "?oslc_cm.query=" + query; //$NON-NLS-1$
 
 		RequestHandler<Collection<AbstractChangeRequest>> handler = new RequestHandler<Collection<AbstractChangeRequest>>(
 				"Performing Query") { //$NON-NLS-1$
@@ -393,7 +399,7 @@ public abstract class AbstractOslcClient {
 			}
 		};
 
-		return executeMethod(createGetMethod(queryUrl), handler, monitor);
+		return executeMethod(createGetMethod(requestUrl), handler, monitor);
 
 	}
 
-- 
cgit v1.2.3