Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Connector.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Connector.java	(revision 2459)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Connector.java	(revision 2460)
@@ -66,9 +66,11 @@
 	 * @throws UnknownException
 	 */
+	// TODO is Map really suitable? I'd return List<Map<String, Object>>
+	// every map is a file with keys like: name, size, date. This would give us more freedom
 	public Map<String, Long> getFiles(final ResourceType type, final String currentFolder)
 		throws InvalidCurrentFolderException, SecurityIssueException, UnknownException;
 	
 	/**
-	 * Returns a list of file names which are inside the abstract path
+	 * Returns a list of folders which are inside the abstract path
 	 * <code>/[type-folder]/[currentFolder]</code>.
 	 * 
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/ConnectorServlet.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 2459)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 2460)
@@ -31,13 +31,14 @@
 
 /**
- * This is the FCKeditor servlet. It has the following jobs:
+ * This is the FCKeditor Connector servlet. It has the following jobs:
  * <ul>
- * <li>Initialization of the {@link Dispatcher}-object.</li>
+ * <li>Initialization of the {@link Dispatcher} object.</li>
  * <li>Calling {@link ThreadLocalData#beginRequest(HttpServletRequest)}
  * (It is an object that holds request-based objects.)</li>
- * <li>Dispatching the doGet-request to
+ * <li>Dispatching the <code>GET</code> request to
  * {@link Dispatcher#doGet(HttpServletRequest, HttpServletResponse)} and the
- * doPost-request to
+ * <code>POST</code> request to
  * {@link Dispatcher#doPost(HttpServletRequest, HttpServletResponse)}.</li>
+ * TODO improve the forthcoming sentence, weird English!
  * <li>Calling {@link ThreadLocalData#endRequest()} to cleanup all ThreadLocal
  * objects independent of if an exception was thrown or not. That's very
@@ -76,4 +77,5 @@
 		} catch (Exception e) {
 			// if an exception wasn't catched by the Dispatcher, it is a fatal one and has to re-thrown.
+			// FIXME we can simply rethrow e instead of creating a new object
 			if (e instanceof IOException)
 				throw new IOException(e.getLocalizedMessage());
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java	(revision 2459)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java	(revision 2460)
@@ -138,4 +138,5 @@
 						}
 					} else if (command.equals(CommandHandler.GET_FOLDERS) || command.equals(CommandHandler.GET_FOLDERS_AND_FILES)) {
+						// TODO I don't like this code, it has to be more generic
 						String responseUrl = UtilsResponse.constructResponseUrl( 
 								ConnectorHandler.getUserFilesPath(),
@@ -250,4 +251,5 @@
 					String fileName = FilenameUtils.getName(UtilsFile.sanitizeFileName(uplFile.getName()));
 					String newFileName = connector.fileUpload(type, currentFolderStr, fileName, uplFile.getInputStream());
+					// TODO I don't like this either
 					String responseUrl = UtilsResponse.constructResponseUrl( 
 							ConnectorHandler.getUserFilesPath(),
@@ -261,4 +263,5 @@
 			} catch (InvalidCurrentFolderException e) {
 				uploadResponse = UploadResponse.getErrorInvalidCurrentFolder();
+			// TODO could be one catch if response is the same
 			} catch (SecurityIssueException e) {
 				uploadResponse = UploadResponse.getErrorSecurity();
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/impl/SimpleFileSystemConnector.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/impl/SimpleFileSystemConnector.java	(revision 2459)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/impl/SimpleFileSystemConnector.java	(revision 2460)
@@ -58,4 +58,6 @@
  * @version $Id$
  */
+// FIXME the name is inappropriate, it should be ContextFileSystemConnector
+// we should provide another implementation which leads outside of the context
 public class SimpleFileSystemConnector implements Connector {
 	private static final Logger logger = LoggerFactory.getLogger(SimpleFileSystemConnector.class);
@@ -63,4 +65,5 @@
 	private static ServletContext servletContext;
 	
+	// TODO I don't like this because every one has to initialize this on his own
 	static {
 		// initialize the sub folders for each resource type
@@ -179,4 +182,5 @@
 	}
 	
+	// TODO maybe this can be achieved in fewer lines
 	private static File getUniqueFile(final File file) {
 		if (!file.exists())
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java	(revision 2459)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java	(revision 2460)
@@ -62,4 +62,5 @@
 	 *         set else <code>false</code>.
 	 */
+	// TODO we have to figure out if other implementations do fullUrl on a boolean basis or just retrieve a host string.
 	public static boolean isFullUrl() {
 		return Boolean.valueOf(PropertiesLoader.getProperty("connector.fullUrl"));
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/handlers/ResourceType.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/handlers/ResourceType.java	(revision 2459)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/handlers/ResourceType.java	(revision 2460)
@@ -130,3 +130,5 @@
 		}
 	}
+	
+	// FIXME override #hashCode
 }
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/ThreadLocalData.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/ThreadLocalData.java	(revision 2459)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/ThreadLocalData.java	(revision 2460)
@@ -32,4 +32,5 @@
 	
 	public static void beginRequest(final HttpServletRequest servletRequest) {
+		// TODO NullPointer would be mor suitable, wouldn't it?
 		if (servletRequest == null)
 			throw new IllegalArgumentException();
@@ -39,4 +40,5 @@
 	}
 	
+	// TODO I'd rather raise an exception telling that #beginRequest has to be called before this method
 	public static HttpServletRequest getServletRequest() {
 		return (servletRequest == null) ? null : servletRequest.get();