Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditor.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditor.java	(revision 1339)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditor.java	(revision 1340)
@@ -84,16 +84,4 @@
      * @param req
      *                request object
-     * @deprecated According to Server Side Integration, Request and instanceName should be passed at least
-     */
-    @Deprecated
-    public FCKeditor(HttpServletRequest req) {
-	this(req, null, null, null, null, null);
-    }
-
-    /**
-     * Just a wrapper to {@link FCKeditor}.
-     * 
-     * @param req
-     *                request object
      * @param parInstanceName
      *                unique name
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditorConfigurations.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditorConfigurations.java	(revision 1339)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditorConfigurations.java	(revision 1340)
@@ -22,4 +22,5 @@
 package net.fckeditor;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.HashMap;
@@ -36,44 +37,34 @@
 public class FCKeditorConfigurations extends HashMap {
 
-    /**
-     * Initialize the configuration collection
-     */
-    public FCKeditorConfigurations() {
-	super();
-    }
+	/**
+	 * Initialize the configuration collection
+	 */
+	public FCKeditorConfigurations() {
+		super();
+	}
 
-    /**
-     * Generate the url parameter sequence used to pass this configuration to
-     * the editor.
-     * 
-     * @return html endocode sequence of configuration parameters
-     */
-    public String getUrlParams() {
-	StringBuffer osParams = new StringBuffer();
-
-	for (Iterator i = this.entrySet().iterator(); i.hasNext();) {
-	    Map.Entry entry = (Map.Entry) i.next();
-	    if (entry.getValue() != null) {
-		osParams.append("&");
-		osParams.append(encodeConfig(entry.getKey().toString()));
-		osParams.append("=");
-		osParams.append(encodeConfig(entry.getValue().toString()));
-	    }
+	/**
+	 * Generate the url parameter sequence used to pass this configuration to
+	 * the editor.
+	 * 
+	 * @return html endocode sequence of configuration parameters
+	 */
+	public String getUrlParams() {
+		StringBuffer osParams = new StringBuffer();
+		try {
+			for (Iterator i = this.entrySet().iterator(); i.hasNext();) {
+				Map.Entry entry = (Map.Entry) i.next();
+				if (entry.getValue() != null) {
+					osParams.append("&");
+					osParams.append(URLEncoder.encode(
+							entry.getKey().toString(), "UTF-8"));
+					osParams.append("=");
+					osParams.append(URLEncoder.encode(entry.getValue()
+							.toString(), "UTF-8"));
+				}
+			}
+		} catch (UnsupportedEncodingException e) {
+		}
+		return osParams.toString();
 	}
-	return osParams.toString();
-    }
-
-    /**
-     * @see URLEncoder#encode(String, String)
-     * @param txt
-     * @return
-     */
-    @Deprecated
-    private String encodeConfig(String txt) {
-	txt = txt.replaceAll("&", "%26");
-	txt = txt.replaceAll("=", "%3D");
-	txt = txt.replaceAll("\"", "%22");
-	return txt;
-    }
-
 }