Changeset 3780

Timestamp:

Sep 25, 2007, 1:20:55 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #784: PackedFileExporter? chews first character from file and directory names in the root directory

File:

• branches/2.4-stable/src/plugins/core/net/sf/basedb/plugins/PackedFileExporter.java (modified) (3 diffs)

branches/2.4-stable/src/plugins/core/net/sf/basedb/plugins/PackedFileExporter.java

@@ -376 +376 @@
     // Prepare for compression
     String rootPath = rootDir.getPath().toString();
+    if (!rootPath.endsWith("/")) rootPath += "/";
     out.setMimeType(packer.getMimeType());
     out.setFilename(generateDefaultName(packer, rootDir, itemsToPack));
@@ -405 +406 @@
       
       // Remove rootPath from entryPath
-      entryPath = entryPath.substring(rootPath.length()+1);
+      entryPath = entryPath.substring(rootPath.length());
       
       // Update progress
@@ -657 +658 @@
   private String generateDefaultPath(FilePacker packer, Directory rootDir, Collection<Nameable> selectedItems)
   {
-    String defaultPath = rootDir == null ? "~/" : rootDir.getPath().toString() + "/";
+    String defaultPath = rootDir == null ? "~/" : rootDir.getPath().toString();
+    if (!defaultPath.endsWith("/")) defaultPath += "/";
     defaultPath +=  generateDefaultName(packer, rootDir, selectedItems);
     return defaultPath;