[diablu commit] r304 - trunk/MailMan/src/pt/citar/diablu/mailman/bluetooth

[codesite...@google.com]

Author: jorgediablu
Date: Mon Oct 6 02:53:56 2008
New Revision: 304

Modified:

trunk/MailMan/src/pt/citar/diablu/mailman/bluetooth/MailManBTRequestHandler.java

Log:
[Mailman] Corrected bug in local filename generation.

Modified:
trunk/MailMan/src/pt/citar/diablu/mailman/bluetooth/MailManBTRequestHandler.java
==============================================================================
---
trunk/MailMan/src/pt/citar/diablu/mailman/bluetooth/MailManBTRequestHandler.java
(original)
+++
trunk/MailMan/src/pt/citar/diablu/mailman/bluetooth/MailManBTRequestHandler.java
Mon Oct 6 02:53:56 2008
@@ -127,7 +127,7 @@
}

private String getFinalFilename(String filename) {
- File file = new File(filename);
+ File file = new File(mailman.getGui().getDirectory() +
System.getProperty("file.separator") + filename);
String path;
String extention = "";

@@ -154,8 +154,11 @@
filename = Integer.toString(rand.nextInt(10000)) + extention;
}

+
int i = 0;
while (file.exists()) {
+ mailman.getLogger().log(MailManLogger.OTHER, "File: " +
file.getAbsolutePath() + " already exists. Creating new...");
+
i++;
if(filename.lastIndexOf('.') > -1)
path = filename.substring(0, filename.lastIndexOf('.'));
@@ -166,9 +169,11 @@
else
path = path.concat("" + i).concat(extention);
filename = path;
- file = new File(filename);
+ file = new File(mailman.getGui().getDirectory() +
System.getProperty("file.separator") + filename);
+ }
+ if (!file.exists()) {
+ mailman.getLogger().log(MailManLogger.OTHER, "File: " +
file.getAbsolutePath() + " does not exist.");
}
-

return filename;
}