Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditorConfig.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditorConfig.java (revision 1470)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditorConfig.java (revision 1470)
@@ -0,0 +1,79 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+package net.fckeditor;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.fckeditor.tool.Utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Contains the configuration settings for the FCKEditor.
+ * Adding element to this collection you can override the settings specified in
+ * the config.js file.
+ *
+ * @version $Id: FCKeditorConfig.java 1444 2008-01-28 16:53:01Z mosipov $
+ */
+public class FCKeditorConfig extends HashMap {
+
+ private static final long serialVersionUID = -4831190504944866644L;
+ private final Logger logger = LoggerFactory.getLogger(FCKeditorConfig.class);
+
+ /**
+ * Initialize the configuration collection
+ */
+ public FCKeditorConfig() {
+ super();
+ }
+
+ /**
+ * Generate the url parameter sequence used to pass this configuration to
+ * the editor.
+ *
+ * @return html endocode sequence of configuration parameters
+ */
+ public String getUrlParams() {
+ StringBuilder osParams = new StringBuilder();
+ try {
+ for (Map.Entry entry : this.entrySet()) {
+ if (Utils.isNotEmpty(entry.getValue())) {
+ osParams.append("&");
+ osParams.append(URLEncoder.encode(entry.getKey(),"UTF-8"));
+ osParams.append("=");
+ osParams.append(URLEncoder.encode(entry.getValue(),"UTF-8"));
+ }
+ }
+
+ } catch (UnsupportedEncodingException e) {
+ logger.error("Configuration parameters could not be encoded", e);
+ }
+
+ if (osParams.length() > 0)
+ osParams.deleteCharAt(0);
+ return osParams.toString();
+ }
+}
Index: Keditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditorConfigurations.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/FCKeditorConfigurations.java (revision 1469)
+++ (revision )
@@ -1,79 +1,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- * - GNU General Public License Version 2 or later (the "GPL")
- * http://www.gnu.org/licenses/gpl.html
- *
- * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- * http://www.gnu.org/licenses/lgpl.html
- *
- * - Mozilla Public License Version 1.1 or later (the "MPL")
- * http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- */
-
-package net.fckeditor;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
-
-import net.fckeditor.tool.Utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Contains the configuration settings for the FCKEditor.
- * Adding element to this collection you can override the settings specified in
- * the config.js file.
- *
- * @version $Id$
- */
-public class FCKeditorConfigurations extends HashMap {
-
- private static final long serialVersionUID = -4831190504944866644L;
- private final Logger logger = LoggerFactory.getLogger(FCKeditorConfigurations.class);
-
- /**
- * 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() {
- StringBuilder osParams = new StringBuilder();
- try {
- for (Map.Entry entry : this.entrySet()) {
- if (Utils.isNotEmpty(entry.getValue())) {
- osParams.append("&");
- osParams.append(URLEncoder.encode(entry.getKey(),"UTF-8"));
- osParams.append("=");
- osParams.append(URLEncoder.encode(entry.getValue(),"UTF-8"));
- }
- }
-
- } catch (UnsupportedEncodingException e) {
- logger.error("Configuration parameters could not be encoded", e);
- }
-
- if (osParams.length() > 0)
- osParams.deleteCharAt(0);
- return osParams.toString();
- }
-}