Index: Keditor.Java/branches/2.4/src/test/java/com/fredck/fckeditor/tool/TEstScl.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/com/fredck/fckeditor/tool/TEstScl.java	(revision 1308)
+++ 	(revision )
@@ -1,23 +1,0 @@
-package com.fredck.fckeditor.tool;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-public class TEstScl {
-	
-	public static void main(String[] args) throws IOException {
-		
-		Properties pros = new Properties();
-		InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("com/fredck/fckeditor/default.properties");
-		//InputStream is = Properties.class.getClassLoader().getResourceAsStream("/com/fredck/fckeditor/default.properties");
-		ResourceBundle bundle = ResourceBundle.getBundle("com.fredck.fckeditor.default");
-		
-		pros.load(is);
-		System.out.println(pros.getProperty("fckeditor.dir"));
-		System.out.println(bundle.getString("fckeditor.dir"));
-		
-	}
-
-}
Index: Keditor.Java/branches/2.4/src/test/java/com/fredck/fckeditor/tool/Util_getSet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/com/fredck/fckeditor/tool/Util_getSet.java	(revision 1308)
+++ 	(revision )
@@ -1,62 +1,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 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 com.fredck.fckeditor.tool;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link Utils#getSet(String, String)}.
- *
- * @version $Id: Util_getSet.java 1184 2008-01-03 10:39:36Z th-schwarz $
- * @author <a href="mailto:th-schwarz@users.sourceforge.net">Thilo Schwarz</a>
- */
-public class Util_getSet extends TestCase {
-
-    public void test_getSet01() throws Exception {
-	Set set = new HashSet();
-	set.add("a");
-	set.add("ab");
-	set.add("c");
-	
-	Set newSet = Utils.getSet("a|Ab|c", "|");
-	for (Iterator iterator = newSet.iterator(); iterator.hasNext();) {
-	    String val = (String) iterator.next();
-	    assertEquals(true, set.contains(val));
-	}
-    }
-    
-    public void test_getSet02() throws Exception {
-	Set set = new HashSet();
-	set.add("png");
-	set.add("jpg");
-	set.add("gif");
-	
-	Set newSet = Utils.getSet("png|jpg|gif");
-	for (Iterator iterator = newSet.iterator(); iterator.hasNext();) {
-	    String val = (String) iterator.next();
-	    assertEquals(true, set.contains(val));
-	}
-    }
-}
Index: Keditor.Java/branches/2.4/src/test/java/com/fredck/fckeditor/tool/Util_replace.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/com/fredck/fckeditor/tool/Util_replace.java	(revision 1308)
+++ 	(revision )
@@ -1,52 +1,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 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 com.fredck.fckeditor.tool;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link Utils#replaceAll(String, String, String)};
- *
- * @version $Id: Util_replace.java 1184 2008-01-03 10:39:36Z th-schwarz $
- * @author <a href="mailto:th-schwarz@users.sourceforge.net">Thilo Schwarz</a>
- */
-public class Util_replace extends TestCase {
-
-    public void test_replace01() {
-	String str =  Utils.replaceAll("//a/b//c", "//", "/");
-	assertEquals(str, "/a/b/c");
-    }
-    
-    public void test_replace02() {
-	String str = Utils.replaceAll(null, "a", "c");
-	assertEquals(str, "");
-    }
-
-    public void test_replace03() {
-	String str = Utils.replaceAll("foo", null, "c");
-	assertEquals(str, "foo");
-    }
-
-    public void test_replace04() {
-	String str = Utils.replaceAll("foo", "o", "a");
-	assertEquals(str, "faa");
-    }
-}
Index: /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/TestResourceStream.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/TestResourceStream.java	(revision 1309)
+++ /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/TestResourceStream.java	(revision 1309)
@@ -0,0 +1,23 @@
+package com.fredck.fckeditor.tool;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+public class TEstScl {
+	
+	public static void main(String[] args) throws IOException {
+		
+		Properties pros = new Properties();
+		InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("com/fredck/fckeditor/default.properties");
+		//InputStream is = Properties.class.getClassLoader().getResourceAsStream("/com/fredck/fckeditor/default.properties");
+		ResourceBundle bundle = ResourceBundle.getBundle("com.fredck.fckeditor.default");
+		
+		pros.load(is);
+		System.out.println(pros.getProperty("fckeditor.dir"));
+		System.out.println(bundle.getString("fckeditor.dir"));
+		
+	}
+
+}
Index: /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_getSet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_getSet.java	(revision 1309)
+++ /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_getSet.java	(revision 1309)
@@ -0,0 +1,62 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 com.fredck.fckeditor.tool;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests for {@link Utils#getSet(String, String)}.
+ *
+ * @version $Id: Util_getSet.java 1184 2008-01-03 10:39:36Z th-schwarz $
+ * @author <a href="mailto:th-schwarz@users.sourceforge.net">Thilo Schwarz</a>
+ */
+public class Util_getSet extends TestCase {
+
+    public void test_getSet01() throws Exception {
+	Set set = new HashSet();
+	set.add("a");
+	set.add("ab");
+	set.add("c");
+	
+	Set newSet = Utils.getSet("a|Ab|c", "|");
+	for (Iterator iterator = newSet.iterator(); iterator.hasNext();) {
+	    String val = (String) iterator.next();
+	    assertEquals(true, set.contains(val));
+	}
+    }
+    
+    public void test_getSet02() throws Exception {
+	Set set = new HashSet();
+	set.add("png");
+	set.add("jpg");
+	set.add("gif");
+	
+	Set newSet = Utils.getSet("png|jpg|gif");
+	for (Iterator iterator = newSet.iterator(); iterator.hasNext();) {
+	    String val = (String) iterator.next();
+	    assertEquals(true, set.contains(val));
+	}
+    }
+}
Index: /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_replace.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_replace.java	(revision 1309)
+++ /FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/Util_replace.java	(revision 1309)
@@ -0,0 +1,52 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 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 com.fredck.fckeditor.tool;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests for {@link Utils#replaceAll(String, String, String)};
+ *
+ * @version $Id: Util_replace.java 1184 2008-01-03 10:39:36Z th-schwarz $
+ * @author <a href="mailto:th-schwarz@users.sourceforge.net">Thilo Schwarz</a>
+ */
+public class Util_replace extends TestCase {
+
+    public void test_replace01() {
+	String str =  Utils.replaceAll("//a/b//c", "//", "/");
+	assertEquals(str, "/a/b/c");
+    }
+    
+    public void test_replace02() {
+	String str = Utils.replaceAll(null, "a", "c");
+	assertEquals(str, "");
+    }
+
+    public void test_replace03() {
+	String str = Utils.replaceAll("foo", null, "c");
+	assertEquals(str, "foo");
+    }
+
+    public void test_replace04() {
+	String str = Utils.replaceAll("foo", "o", "a");
+	assertEquals(str, "faa");
+    }
+}