[Zerofile-svn] SF.net SVN: zerofile: [65] trunk/src

[<kar...@us...>]

Revision: 65
          http://zerofile.svn.sourceforge.net/zerofile/?rev=65&view=rev
Author:   karl-bengtsson
Date:     2007-12-04 06:00:29 -0800 (Tue, 04 Dec 2007)

Log Message:
-----------
further refinement of download methods

Modified Paths:
--------------
    trunk/src/XMPPLinkLocalChatSession.java
    trunk/src/ZeroFile.java

Modified: trunk/src/XMPPLinkLocalChatSession.java
===================================================================
--- trunk/src/XMPPLinkLocalChatSession.java	2007-12-04 13:49:00 UTC (rev 64)
+++ trunk/src/XMPPLinkLocalChatSession.java	2007-12-04 14:00:29 UTC (rev 65)
@@ -120,9 +120,16 @@
 						if (stanza.contains("<x xmlns=\"jabber:x:oob\">"))
 						{
 							System.out.println(XMPPDOMParser.getUrlFromFileTransferStanza(stanza));
-							ZeroFile.downloadFileFromHTTP(XMPPDOMParser.getUrlFromFileTransferStanza(stanza));
-							// This is a file
-							
+							if (ZeroFileSettings.getCheckBox().equals("true"))
+							{
+								ZeroFile.downloadFileFromHTTP(XMPPDOMParser.getUrlFromFileTransferStanza(stanza));
+								_chatWindow.printText("Downloading file from chat partner");
+							}
+							else
+							{
+								ZeroFile.downloadFileFromHTTP(XMPPDOMParser.getUrlFromFileTransferStanza(stanza));
+								_chatWindow.printText("Downloading file from chat partner");
+							}
 						}
 					}
 					else

Modified: trunk/src/ZeroFile.java
===================================================================
--- trunk/src/ZeroFile.java	2007-12-04 13:49:00 UTC (rev 64)
+++ trunk/src/ZeroFile.java	2007-12-04 14:00:29 UTC (rev 65)
@@ -62,9 +62,9 @@
 			{
 				String localFileName;
 				if (!ZeroFileSettings.getDownloadFolder().equals(""))
-					localFileName = ZeroFileSettings.getDownloadFolder() + address.substring(lastSlashIndex + 1);
+					localFileName = ZeroFileSettings.getDownloadFolder() +"/"+ address.substring(lastSlashIndex + 1);
 				else
-					localFileName = System.getProperty("user.home") + address.substring(lastSlashIndex + 1);
+					localFileName = System.getProperty("user.home") +"/"+ address.substring(lastSlashIndex + 1);
 				URL url = new URL(address);
 				out = new BufferedOutputStream(
 					new FileOutputStream(localFileName));
@@ -73,11 +73,11 @@
 				byte[] buffer = new byte[1024];
 				int numRead;
 				long numWritten = 0;
-				/*while ((numRead = in.read(buffer)) != -1)
+				while ((numRead = in.read(buffer)) != -1)
 				{
 					out.write(buffer, 0, numRead);
 					numWritten += numRead;
-				}*/
+				}
 				System.out.println(localFileName + "\t" + numWritten);
 			}
 			catch (Exception exception)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.