Update of
/var/cvs/contributions/CMSContainer_Modules/staticdownload/src/java/com/finalist/cmsc/staticdownload
In directory
james.mmbase.org:/tmp/cvs-serv13927/staticdownload/src/java/com/finalist/cmsc/staticdownload
Modified Files:
DownloadThread.java
Log Message:
CMSC-907 - Added Generics and removed unread/unused code. Renamed bad method
and classes names
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/staticdownload/src/java/com/finalist/cmsc/staticdownload
See also: http://www.mmbase.org/jira/browse/CMSC-907
Index: DownloadThread.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/staticdownload/src/java/com/finalist/cmsc/staticdownload/DownloadThread.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- DownloadThread.java 30 Jun 2008 10:41:44 -0000 1.6
+++ DownloadThread.java 7 Jul 2008 20:52:35 -0000 1.7
@@ -13,14 +13,11 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
-import java.io.StringReader;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
@@ -90,6 +87,9 @@
if (is != null) {
is.close();
}
+ if (br!= null) {
+ br.close();
+ }
}
suffix = buffer.toString().split(";");
}
@@ -101,7 +101,7 @@
File file = new
File(downloadSettings.getTempPath());//get the files which wget last download
setupSuffix();
modifyDownloadPath();
- findAssociatdFiles(file, new MyFilenameFilter(".css",
".js",
+ findAssociatedFiles(file, new MyFilenameFilter(".css",
".js",
".html"));
redownload(redownloadfiles);
redownloadfiles.clear();//this will avoid to redownload
picture in different request
@@ -459,12 +459,12 @@
/**Use the filter to find the associated files which last wget
downloads,
* then pick up the getTargetStringAndWriteFile() method
* @throws IOException */
- private void findAssociatdFiles(File file, MyFilenameFilter myfilter)
+ private void findAssociatedFiles(File file, MyFilenameFilter myfilter)
throws IOException {
- String fileName = file.getAbsolutePath();
- if (!fileName.endsWith(File.separator)) {
- fileName = fileName + File.separator;
- }
+ //String fileName = file.getAbsolutePath();
+ //if (!fileName.endsWith(File.separator)) {
+ // fileName = fileName + File.separator;
+ //}
if (!file.exists()) {
return;
}
@@ -484,7 +484,7 @@
}
}
} else if (files[i].isDirectory()) {
- findAssociatdFiles(files[i], myfilter);
+ findAssociatedFiles(files[i], myfilter);
}
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
