Author: jerome
Date: 2009-02-11 12:13:19 +0100 (Wed, 11 Feb 2009)
New Revision: 3602
Modified:
software_suite_v2/software/control_center/trunk/control_center/.classpath
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/WebBrowser/webBrowser.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
Log:
*Fixed: #141 ?\226?\128?\148 Library list not refreshing when D&D from online
into lib.
Modified:
software_suite_v2/software/control_center/trunk/control_center/.classpath
===================================================================
--- software_suite_v2/software/control_center/trunk/control_center/.classpath
2009-02-10 17:26:53 UTC (rev 3601)
+++ software_suite_v2/software/control_center/trunk/control_center/.classpath
2009-02-11 11:13:19 UTC (rev 3602)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="sources"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/TuxAPI"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/karmalab-commons"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-framework"/>
- <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/commons-collections-3.2.1.jar"/>
- <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/commons-logging-1.1.1.jar"/>
- <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/javassist-3.7.ga.jar"/>
- <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/jdic_stub.jar"/>
- <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/quartz-all-1.6.1-RC1.jar"/>
- <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/tuxdroid-installer-paths.jar"/>
- <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/jdic.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="sources"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-openjdk"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/TuxAPI"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-framework"/>
+ <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/commons-collections-3.2.1.jar"/>
+ <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/javassist-3.7.ga.jar"/>
+ <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/jdic.jar"/>
+ <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/jdic_stub.jar"/>
+ <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/karmalab-commons-1.2.jar"/>
+ <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/quartz-all-1.6.1-RC1.jar"/>
+ <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/tuxdroid-installer-paths.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
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-02-10 17:26:53 UTC (rev 3601)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2009-02-11 11:13:19 UTC (rev 3602)
@@ -168,6 +168,15 @@
thumbnailAttitunes.updateThumbs(attitunesListView);
changes.firePropertyChange("Updated", null, null);
}
+
+
+ public void removeAllGadgetsFromViews()
+ {
+ FileBrowser.GadgetsDatas = null;
+ this.GadgetsDatasToDisplay = null;
+ this.gadgetsListView.privatesValues = null;
+ this.gadgetsListView.values = null;
+ }
@SuppressWarnings("unchecked")
public void propertyChange(PropertyChangeEvent arg0) {
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/WebBrowser/webBrowser.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/WebBrowser/webBrowser.java
2009-02-10 17:26:53 UTC (rev 3601)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/WebBrowser/webBrowser.java
2009-02-11 11:13:19 UTC (rev 3602)
@@ -40,6 +40,7 @@
import com.tuxdroid.cc.CcCommons;
import com.tuxdroid.cc.Object.PseudoFileBrowser.FileBrowser;
+import com.tuxdroid.cc.Utils.FileUtils;
import com.tuxdroid.cc.swing.JBrowser;
public class webBrowser extends JBrowser{
@@ -88,7 +89,13 @@
}
- public boolean CopyFromWebsite(DropTargetDropEvent arg0, JComponent
parent, FileBrowser fileBrowser){
+ public boolean CopyFromWebsite(DropTargetDropEvent arg0, JComponent
parent, FileBrowser fileBrowser)
+ {
+ File temp = new File(System.getProperty("java.io.tmpdir") +
File.separator + "MyTux" + File.separator + "tmp");
+ if(!temp.exists())
+ {
+ temp.mkdirs();
+ }
webBrowser.downloadedGadget = true;
String title = CcCommons.language.messages.getMessageBoxTitle();
if (arg0.isDataFlavorSupported(DataFlavor.stringFlavor)) {
@@ -136,11 +143,10 @@
InputStream inputStream =
url.openStream();
FileOutputStream fileOutputStream=null;
- //Create real file.
- File f = new
File(directory.getAbsolutePath() + File.separator + name);
+ File output = new
File(temp.getAbsolutePath() + File.separator + name);
//Copying to file output stream
- fileOutputStream = new
FileOutputStream(f);
+ fileOutputStream = new
FileOutputStream(output);
int oneChar;
while((oneChar=inputStream.read()) != -1)
{
@@ -150,19 +156,29 @@
inputStream.close();
fileOutputStream.close();
- if(f.getAbsolutePath().endsWith(".tgf"))
+ if(output.getAbsolutePath().endsWith(".tgf"))
{
this.downloadKind = "gadget";
}
- else if(f.getAbsolutePath().endsWith(".att")){
- this.downloadName = f.getName();
+ else
if(output.getAbsolutePath().endsWith(".att")){
+ this.downloadName = output.getName();
this.downloadKind = "attitune";
}
+
+ //Copy file into the good folder.
+ File to = new File(directory.getAbsolutePath()
+ File.separator + name);
+ FileUtils.copyFile(output, to);
+ if(to.exists() &&
this.downloadKind.equalsIgnoreCase("gadget"))
+ {
+
fileBrowser.removeAllGadgetsFromViews();
+
fileBrowser.getFramework().refresh();
+ }
}
} catch (UnsupportedFlavorException e) {
JOptionPane.showMessageDialog(parent, message,
title, JOptionPane.ERROR_MESSAGE);
} catch (IOException e) {
+ e.printStackTrace();
JOptionPane.showMessageDialog(parent, message,
title, JOptionPane.ERROR_MESSAGE);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
2009-02-10 17:26:53 UTC (rev 3601)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetsFramework.java
2009-02-11 11:13:19 UTC (rev 3602)
@@ -232,6 +232,12 @@
public void addAutodeployer() {
container.addAutoDeployer(CcCommons.GdgTempDirectory,
CcCommons.MyTuxGadgetsDirectory);
+ }
+
+
+ public void refresh()
+ {
+ container.reload();
}
/**
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
2009-02-10 17:26:53 UTC (rev 3601)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
2009-02-11 11:13:19 UTC (rev 3602)
@@ -42,6 +42,7 @@
import com.tuxdroid.cc.CcCommons;
import com.tuxdroid.cc.Object.PseudoFileBrowser.FileBrowser;
import com.tuxdroid.cc.UI.MyScrollBarUI;
+import com.tuxdroid.cc.Utils.FileUtils;
import net.karmaLab.tools.SystemInformation;
@@ -146,6 +147,12 @@
private void download(URL url) {
if(actualBrowser != JBrowser.UNIX) return;
else{
+
+ File temp = new
File(System.getProperty("java.io.tmpdir") + File.separator + "MyTux" +
File.separator + "tmp");
+ if(!temp.exists())
+ {
+ temp.mkdirs();
+ }
CcCommons.logger.append("Starting downloading at " +
url.toExternalForm(), true);
String title =
CcCommons.language.messages.getMessageBoxTitle();
@@ -182,7 +189,7 @@
FileOutputStream fileOutputStream=null;
//Create real file.
- File f = new File(directory +
File.separator + name);
+ File f = new
File(temp.getAbsolutePath() + File.separator + name);
//Copying to file output stream
fileOutputStream = new
FileOutputStream(f);
@@ -193,6 +200,16 @@
}
inputStream.close();
fileOutputStream.close();
+
+ //Copy file into the good folder.
+ File to = new File(directory.getAbsolutePath()
+ File.separator + name);
+ FileUtils.copyFile(f, to);
+ if(to.exists() && name.endsWith(".tgf"))
+ {
+
fileBrowser.removeAllGadgetsFromViews();
+
fileBrowser.getFramework().refresh();
+ }
+
} catch (IOException e) {
String message =
CcCommons.language.messages.getURLErrorMessage();
JOptionPane.showMessageDialog(this,
message, title, JOptionPane.ERROR_MESSAGE);
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
