--- old/src/share/tools/MakeDeps/Util.java	2010-11-16 18:23:04.000000000 +0100
+++ /dev/null	2010-11-10 09:01:45.529476373 +0100
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-import java.util.*;
-import java.io.File;
-
-public class Util {
-    static String join(String padder, Vector v) {
-        return join(padder, v, false);
-    }
-
-    static String join(String padder, Vector v, boolean quoted) {
-        StringBuffer sb = new StringBuffer();
-
-        for (Iterator iter = v.iterator(); iter.hasNext(); ) {
-            if (quoted) {
-                sb.append('"');
-            }
-            sb.append((String)iter.next());
-            if (quoted) {
-                sb.append('"');
-            }
-            if (iter.hasNext()) sb.append(padder);
-        }
-
-        return sb.toString();
-    }
-
-     static String join(String padder, String v[]) {
-        StringBuffer sb = new StringBuffer();
-
-        for (int i=0; i<v.length; i++) {
-            sb.append(v[i]);
-            if (i < (v.length  - 1)) sb.append(padder);
-        }
-
-        return sb.toString();
-    }
-
-
-
-    static String prefixed_join(String padder, Vector v, boolean quoted) {
-        StringBuffer sb = new StringBuffer();
-
-        for (Iterator iter = v.iterator(); iter.hasNext(); ) {
-            sb.append(padder);
-
-            if (quoted) {
-                sb.append('"');
-            }
-            sb.append((String)iter.next());
-            if (quoted) {
-                sb.append('"');
-            }
-        }
-
-        return sb.toString();
-    }
-
-
-    static String normalize(String file) {
-        return file.replace('\\', '/');
-    }
-
-    static String sep = File.separator;
-    static String os = "Win32"; //System.getProperty("os.name");
-}
--- /dev/null	2010-11-10 09:01:45.529476373 +0100
+++ new/src/share/tools/ProjectCreator/Util.java	2010-11-16 18:23:04.000000000 +0100
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+import java.util.*;
+import java.io.File;
+
+public class Util {
+    static String join(String padder, Vector v) {
+        return join(padder, v, false);
+    }
+
+    static String join(String padder, Vector v, boolean quoted) {
+        StringBuffer sb = new StringBuffer();
+
+        for (Iterator iter = v.iterator(); iter.hasNext(); ) {
+            if (quoted) {
+                sb.append('"');
+            }
+            sb.append((String)iter.next());
+            if (quoted) {
+                sb.append('"');
+            }
+            if (iter.hasNext()) sb.append(padder);
+        }
+
+        return sb.toString();
+    }
+
+     static String join(String padder, String v[]) {
+        StringBuffer sb = new StringBuffer();
+
+        for (int i=0; i<v.length; i++) {
+            sb.append(v[i]);
+            if (i < (v.length  - 1)) sb.append(padder);
+        }
+
+        return sb.toString();
+    }
+
+
+
+    static String prefixed_join(String padder, Vector v, boolean quoted) {
+        StringBuffer sb = new StringBuffer();
+
+        for (Iterator iter = v.iterator(); iter.hasNext(); ) {
+            sb.append(padder);
+
+            if (quoted) {
+                sb.append('"');
+            }
+            sb.append((String)iter.next());
+            if (quoted) {
+                sb.append('"');
+            }
+        }
+
+        return sb.toString();
+    }
+
+
+    static String normalize(String file) {
+        return file.replace('\\', '/');
+    }
+
+    static String sep = File.separator;
+    static String os = "Win32"; //System.getProperty("os.name");
+}