Author: jerome
Date: 2009-01-26 14:47:56 +0100 (Mon, 26 Jan 2009)
New Revision: 3530
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Listener/ExitControlListener.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/FileUtils.java
Log:
Fixed : #114 ?\226?\128?\148 Protection sur /tmp/MyTux/tempDirectory.
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Listener/ExitControlListener.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Listener/ExitControlListener.java
2009-01-26 13:22:27 UTC (rev 3529)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Listener/ExitControlListener.java
2009-01-26 13:47:56 UTC (rev 3530)
@@ -22,12 +22,15 @@
package com.tuxdroid.cc.Listener;
+import java.io.File;
+
import javax.swing.ImageIcon;
import javax.swing.JButton;
import com.tuxdroid.cc.CcCommons;
import com.tuxdroid.cc.CcConstants;
import com.tuxdroid.cc.Object.PseudoFileBrowser.FileBrowser;
+import com.tuxdroid.cc.Utils.FileUtils;
import com.tuxisalive.api.SThread;
public class ExitControlListener extends java.awt.event.MouseAdapter{
@@ -56,9 +59,12 @@
fileBrowser.stopPlaying(CcConstants.TYPE_ATTITUNES,
FileBrowser.REMOTELIST_TYPE);
CcCommons.tux.server.disconnect();
CcCommons.tux.destroy();
- fileBrowser.deleteTemp();
+
try
{
+ //Delete all temporary files.
+ System.out.println(new
File(System.getProperty("java.io.tmpdir") + File.separator +
"MyTux").getAbsolutePath());
+ FileUtils.deleteDirectory(new
File(System.getProperty("java.io.tmpdir") + File.separator + "MyTux"));
fileBrowser.getFramework().shutDownFramework();
}
catch(NullPointerException except) {}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2009-01-26 13:22:27 UTC (rev 3529)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2009-01-26 13:47:56 UTC (rev 3530)
@@ -38,8 +38,6 @@
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import net.karmaLab.tools.SystemInformation;
-
import com.kysoh.tuxdroid.gadget.framework.container.GadgetInstance;
import com.kysoh.tuxdroid.gadget.framework.container.GadgetInstanceParameters;
import com.kysoh.tuxdroid.gadget.framework.container.GadgetToken;
@@ -795,42 +793,13 @@
return path;
}
- private void del(File f){
- if(!(f.listFiles().length > 0)){
- f.delete();
- }
- else{
- for(File file : f.listFiles()){
- if(!(file.isDirectory())){
- file.delete();
- }else{
- for(File file2 :
file.listFiles()){
- file2.delete();
- }
- file.delete();
- }
- }
- f.delete();
- }
- }
-
-
- public void deleteTemp(){
- File[] to_delete;
- if(CcCommons.AttTempDirectory.exists()){
- to_delete =
CcCommons.AttTempDirectory.listFiles();
- for(File file : to_delete){
- if(SystemInformation.isUnix()){
- String path =
file.getAbsolutePath();
- path.replace("\\", "/");
- file = new File(path);
- }
- this.del(file);
- }
- }
- CcCommons.AttTempDirectory.delete();
- }
+ /**
+ * Return a structure matching with the favorites list.
+ * @param type
+ * @param view
+ * @return
+ */
public Object[] getDatasAsRemoteStruct(int type, int view){
Object[] retour = new Object[]{"", "", "", ""};
if(type == FileBrowser.ATTITUNES_TYPES){
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/FileUtils.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/FileUtils.java
2009-01-26 13:22:27 UTC (rev 3529)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/FileUtils.java
2009-01-26 13:47:56 UTC (rev 3530)
@@ -51,4 +51,47 @@
throw new FileNotFoundException(from.toString() + "
does not exist" );
}
}
+
+
+ /**
+ * Delete a directory.
+ * @param target ==> remove target directory.
+ */
+ public static void deleteDirectory(File target)
+ {
+ if(!target.isDirectory())
+ {
+ deleteFile(target);
+ return;
+ }
+ else
+ {
+ for(File file : target.listFiles())
+ {
+ if(file.isFile())
+ {
+ deleteFile(file);
+ }
+ else
+ {
+ deleteDirectory(file);
+ }
+ }
+
+ target.delete();
+ }
+ }
+
+
+ /**
+ * Delete a file.
+ * @param target ==> remove target file.
+ */
+ public static void deleteFile(File target)
+ {
+ if((target!= null) && (target.isFile()))
+ {
+ target.delete();
+ }
+ }
}
\ No newline at end of file
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
