Wrap classpath entries which contains spaces in quotation marks

src/fitnesse/testsystems/ClassPath.java

@@ -22,34 +22,32 @@ public ClassPath(String defaultPath, String pathSeparator) {
 
   public ClassPath(List<ClassPath> paths) {
     this.elements = new ArrayList<String>();
-    this.separator = paths.get(0).getSeparator();
+    this.separator = paths.get(0).separator;
 
     for (ClassPath path : paths) {
-      for (String element : path.getElements()) {
+      for (String element : path.elements) {
         if (!elements.contains(element)) {
           elements.add(element);
         }
       }
     }
   }
 
-  public List<String> getElements() {
-    return elements;
-  }
-
-  public String getSeparator() {
-    return separator;
-  }
-
   @Override
   public String toString() {
     if (elements.isEmpty()) {
       return "defaultPath";
     } else {
-      String result = StringUtils.join(elements, separator);
-      if (result.contains(" ") && !(result.startsWith("\"") && result.endsWith("\""))) {
-    	 result = "\""+result +"\"";
+      List<String> newElements = new ArrayList<String>();
+      for (String element : elements) {
+        if (element.contains(" ") && !(element.startsWith("\"") && element.endsWith("\""))) {
+          newElements.add("\""+element +"\"");
+        } else {
+          newElements.add(element);
+        }
       }
+
+      String result = StringUtils.join(newElements, separator);
       return result;
     }
   }

test/fitnesse/testsystems/ClassPathTest.java

@@ -17,4 +17,10 @@ public void shouldMergeClassPaths() {
 
     assertThat(cp.toString(), is("foo.jar,baz.jar,bar.jar"));
   }
+
+  @Test
+  public void shouldHandleSpaceInPath() {
+    ClassPath cp = new ClassPath(asList("dir/foo.jar", "other dir/bar.jar"), ";");
+    assertThat(cp.toString(), is("dir/foo.jar;\"other dir/bar.jar\""));
+  }
 }