Author: jerome
Date: 2008-09-22 12:45:10 +0200 (Mon, 22 Sep 2008)
New Revision: 1955
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsThumbnailView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
Log:
* Changed the way to drag and drop attitunes / gadgets, these files are now
copied instead to be moved.
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-09-22 10:40:59 UTC (rev 1954)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-09-22 10:45:10 UTC (rev 1955)
@@ -1737,7 +1737,7 @@
this.scroll_fileBrowser_gadgets.setVisible(false);
this.scroll_fileBrowser_thumbnailAttitunes.setVisible(false);
this.scroll_fileBrowser_thumbnailGadgets.setVisible(false);
- this.pBrowser.setVisible(false);
+ if(pBrowser != null) this.pBrowser.setVisible(false);
this.jListLibrary.clearSelection();
if(index == 1){
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
2008-09-22 10:40:59 UTC (rev 1954)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
2008-09-22 10:45:10 UTC (rev 1955)
@@ -38,6 +38,7 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URL;
import java.util.Iterator;
@@ -58,6 +59,7 @@
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
+import com.sun.org.apache.xml.internal.resolver.helpers.FileURL;
import com.tuxdroid.cc.CcInterface;
import com.tuxdroid.cc.Listener.ColumnHeaderListener;
import com.tuxdroid.cc.Models.AttitunesModel;
@@ -65,6 +67,7 @@
import com.tuxdroid.cc.Renderer.ColorCellRenderer;
import com.tuxdroid.cc.Renderer.MyHeaderRenderer;
import com.tuxdroid.cc.UI.MyScrollBarUI;
+import com.tuxdroid.cc.Utils.FileUtils;
import com.tuxdroid.cc.Utils.Settings;
import com.tuxdroid.cc.Utils.TuxLanguagesMenu;
import com.tuxdroid.cc.Utils.languages.Languages;
@@ -451,53 +454,36 @@
@SuppressWarnings("unchecked")
public void drop(DropTargetDropEvent dtde) {
- if (dtde.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
+ if (dtde.isDataFlavorSupported(DataFlavor.stringFlavor)) {
dtde.acceptDrop(DnDConstants.ACTION_LINK);
- } else {
- dtde.rejectDrop();
- return;
+ } else{
+ dtde.rejectDrop();
+ return;
}
-
Transferable transObj = dtde.getTransferable();
- java.util.List transData = null;
+ String transData = null;
try {
- transData =
(java.util.List)transObj.getTransferData(DataFlavor.javaFileListFlavor);
+
+ transData =
(String)transObj.getTransferData(DataFlavor.stringFlavor);
+
+ URL test = new URL(transData);
+ File from = new File(test.getFile());
+
+ File destination = new File(transfertPath + File.separator +
from.getName());
+
+ if(from.getName().endsWith(".att")){
+ FileUtils.copyFile(from, destination);
+ changes.firePropertyChange("Attitunes-Update-Needed",
null, null);
+ }
+
} catch(UnsupportedFlavorException flavorErr) {
flavorErr.printStackTrace();
} catch(IOException ioErr) {
+
ioErr.printStackTrace();
- }
-
-
- for(Iterator i = transData.iterator(); i.hasNext(); ) {
- File nextobj = (File)i.next();
-
- try {
- String path = nextobj.getCanonicalPath();
- file_path = path;
- String filename = nextobj.getName();
- boolean exists = (new File(filename)).exists();
- if (!exists) {
- // File doesn't exist in the attitunes control center
directory.
- File destination = new File(transfertPath +
File.separator + filename);
- //verifying if file has a gadget extension.
- if (filename.endsWith(".att")){
- nextobj.renameTo(destination);
- }
- }
-
- } catch (IOException exp) {
- if(this.language != null){
- String title =
this.language.messages.getMessageBoxTitle();
- String msg =
this.language.messages.getFileErrorMessage();
- JOptionPane.showMessageDialog(null, msg, title,
JOptionPane.CANCEL_OPTION);
- }
- }
-
}
- changes.firePropertyChange("Attitunes-Update-Needed", null,
null);
}
public void dropActionChanged(DropTargetDragEvent dtde) {}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
2008-09-22 10:40:59 UTC (rev 1954)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
2008-09-22 10:45:10 UTC (rev 1955)
@@ -365,53 +365,7 @@
@SuppressWarnings("unchecked")
public void drop(DropTargetDropEvent dtde) {
- if (dtde.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
- dtde.acceptDrop(DnDConstants.ACTION_LINK);
- } else {
- dtde.rejectDrop();
- return;
- }
-
-
- Transferable transObj = dtde.getTransferable();
- java.util.List transData = null;
-
- try {
- transData =
(java.util.List)transObj.getTransferData(DataFlavor.javaFileListFlavor);
- } catch(UnsupportedFlavorException flavorErr) {
- flavorErr.printStackTrace();
- } catch(IOException ioErr) {
- ioErr.printStackTrace();
- }
-
-
- for(Iterator i = transData.iterator(); i.hasNext(); ) {
- File nextobj = (File)i.next();
-
- try {
- String path = nextobj.getCanonicalPath();
- this.modele.file_path = path;
- String filename = nextobj.getName();
- boolean exists = (new File(filename)).exists();
- if (!exists) {
- // File doesn't exist in the attitunes control center
directory.
- File destination = new File(this.modele.transfertPath +
File.separator + filename);
- //verifying if file has a gadget extension.
- if (filename.endsWith(".att")){
- nextobj.renameTo(destination);
- }
- }
-
- } catch (IOException exp) {
- if(this.language != null){
- String title =
this.language.messages.getMessageBoxTitle();
- String msg =
this.language.messages.getFileErrorMessage();
- JOptionPane.showMessageDialog(null, msg, title,
JOptionPane.CANCEL_OPTION);
- }
- }
-
- }
-
+ modele.drop(dtde);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
2008-09-22 10:40:59 UTC (rev 1954)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
2008-09-22 10:45:10 UTC (rev 1955)
@@ -75,6 +75,7 @@
import com.tuxdroid.cc.Renderer.ColorCellRenderer;
import com.tuxdroid.cc.Renderer.MyHeaderRenderer;
import com.tuxdroid.cc.UI.MyScrollBarUI;
+import com.tuxdroid.cc.Utils.FileUtils;
import com.tuxdroid.cc.Utils.GadgetObject;
import com.tuxdroid.cc.Utils.languages.Languages;
import com.tuxdroid.cc.swing.TuxDegradeePanelWithInset;
@@ -242,59 +243,40 @@
@SuppressWarnings("unchecked")
public void drop(DropTargetDropEvent dtde) {
- if (dtde.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
- dtde.acceptDrop(DnDConstants.ACTION_LINK);
- } else {
- dtde.rejectDrop();
- return;
- }
-
-
- Transferable transObj = dtde.getTransferable();
- java.util.List transData = null;
-
- try {
- transData =
(java.util.List)transObj.getTransferData(DataFlavor.javaFileListFlavor);
- } catch(UnsupportedFlavorException flavorErr) {
- flavorErr.printStackTrace();
- } catch(IOException ioErr) {
- ioErr.printStackTrace();
- }
-
-
- for(Iterator i = transData.iterator(); i.hasNext(); ) {
- File nextobj = (File)i.next();
-
- try {
- String path = nextobj.getCanonicalPath();
- file_path = path;
- String filename = nextobj.getName();
- boolean exists = (new File(filename)).exists();
- if (!exists) {
- // File doesn't exist in the attitunes control center
directory.
- File destination = new File(transfertPath +
File.separator + filename);
- //verifying if file has a gadget extension.
- if (filename.endsWith(".tgf")){
- nextobj.renameTo(destination);
- }
- }
-
- } catch (IOException exp) {
- if(this.language != null){
- String title =
this.language.messages.getMessageBoxTitle();
- String msg =
this.language.messages.getFileErrorMessage();
- JOptionPane.showMessageDialog(null, msg, title,
JOptionPane.CANCEL_OPTION);
- }
- }
-
-
- }
- //mise a jour valeurs
- dtde.dropComplete(true);
- if(this.values == null){
- changes.firePropertyChange("Need-Gadget-Framework", null, null);
- }
- changes.firePropertyChange("Gadgets-Update-Needed", null, null);
+ if (dtde.isDataFlavorSupported(DataFlavor.stringFlavor)) {
+ dtde.acceptDrop(DnDConstants.ACTION_LINK);
+ } else{
+ dtde.rejectDrop();
+ return;
+ }
+
+ Transferable transObj = dtde.getTransferable();
+ String transData = null;
+
+ try {
+
+ transData =
(String)transObj.getTransferData(DataFlavor.stringFlavor);
+
+ URL test = new URL(transData);
+ File from = new File(test.getFile());
+
+ File destination = new File(transfertPath +
File.separator + from.getName());
+
+ if(from.getName().endsWith(".tgf")){
+ FileUtils.copyFile(from, destination);
+ dtde.dropComplete(true);
+ if(this.values == null){
+
changes.firePropertyChange("Need-Gadget-Framework", null, null);
+ }
+ changes.firePropertyChange("Gadgets-Update-Needed",
null, null);
+ }
+
+ } catch(UnsupportedFlavorException flavorErr) {
+ flavorErr.printStackTrace();
+ } catch(IOException ioErr) {
+
+ ioErr.printStackTrace();
+ }
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsThumbnailView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsThumbnailView.java
2008-09-22 10:40:59 UTC (rev 1954)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsThumbnailView.java
2008-09-22 10:45:10 UTC (rev 1955)
@@ -174,57 +174,7 @@
@SuppressWarnings("unchecked")
public void drop(DropTargetDropEvent dtde) {
- if (dtde.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
- dtde.acceptDrop(DnDConstants.ACTION_LINK);
- } else {
- dtde.rejectDrop();
- return;
- }
-
-
- Transferable transObj = dtde.getTransferable();
- java.util.List transData = null;
-
- try {
- transData =
(java.util.List)transObj.getTransferData(DataFlavor.javaFileListFlavor);
- } catch(UnsupportedFlavorException flavorErr) {
- flavorErr.printStackTrace();
- } catch(IOException ioErr) {
- ioErr.printStackTrace();
- }
-
-
- for(Iterator i = transData.iterator(); i.hasNext(); ) {
- File nextobj = (File)i.next();
-
- try {
- String path = nextobj.getCanonicalPath();
- this.modele.file_path = path;
- String filename = nextobj.getName();
- boolean exists = (new File(filename)).exists();
- if (!exists) {
- // File doesn't exist in the attitunes control center
directory.
- File destination = new File(this.modele.transfertPath +
File.separator + filename);
- //verifying if file has a gadget extension.
- if (filename.endsWith(".tgf")){
- nextobj.renameTo(destination);
- }
- }
-
- } catch (IOException exp) {
- if(this.modele.language != null){
- String title =
this.modele.language.messages.getMessageBoxTitle();
- String msg =
this.modele.language.messages.getFileErrorMessage();
- JOptionPane.showMessageDialog(null, msg, title,
JOptionPane.CANCEL_OPTION);
- }
- }
-
- }
- if(this.modele.values == null){
- this.firePropertyChange("Need-Gadget-Framework", null, null);
- }
- this.firePropertyChange("Gadgets-Update-Needed", null, null);
-
+ modele.drop(dtde);
}
public void propertyChange(PropertyChangeEvent arg0) {
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
2008-09-22 10:40:59 UTC (rev 1954)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
2008-09-22 10:45:10 UTC (rev 1955)
@@ -93,6 +93,16 @@
private void download(URL url){
System.out.println("downloading application");
}
+
+
+ private void playOnlineAttiitune(URL url){
+
+ }
+
+
+ public void playOnlineDefaultGadget(URL url){
+
+ }
public void goTo(URL url) {
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
