Changeset 2937

Timestamp:

Nov 20, 2006, 8:33:37 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixed a windows bug with path separators

File:

• trunk/src/core/net/sf/basedb/core/File.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/core/File.java

@@ -893 +893 @@
   private static final String separator = java.io.File.separator;
   private static final SimpleDateFormat SUBDIR_FORMAT = 
-    new SimpleDateFormat("yyyy-ww"+separator+"F-ss");
+    new SimpleDateFormat("yyyy-ww"+separator+"dd-ss");
 
   /**
@@ -945 +945 @@
     String absPath = file.getAbsolutePath();
     String rootPath = Application.getUserFilesDirectory().getAbsolutePath();
-    String relPath = absPath.replace(rootPath, "");
+    String relPath = absPath.replaceFirst(rootPath, "");
     if (relPath.startsWith(separator))
     {
       relPath = relPath.substring(separator.length());
     }
-    relPath = relPath.replaceAll(separator, "/");
+    relPath = relPath.replace(separator, "/");
     return relPath;
   }
@@ -962 +962 @@
   {
     // Convert forward slash to file system separator
-    relativePath = relativePath.replaceAll("/", separator);
+    relativePath = relativePath.replace("/", separator);
     return new java.io.File(Application.getUserFilesDirectory(), relativePath);
   }