Author: jerome
Date: 2009-01-23 14:44:55 +0100 (Fri, 23 Jan 2009)
New Revision: 3525
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/Playlist/AlertPlaylist.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.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/Object/View/TuxAttitunesThumbnailView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetObject.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
Log:
* Fixed a bug copying an attitune from alerts to favorites.
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
2009-01-23 12:16:42 UTC (rev 3524)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-01-23 13:44:55 UTC (rev 3525)
@@ -1604,8 +1604,12 @@
*/
public void delete_current(){
if((CcCommons.type != CcConstants.TYPE_REMOTELIST) &&
(CcCommons.type != CcConstants.TYPE_ALERT))
- {
- fileBrowser.delete_current(CcCommons.type,
CcCommons.view);
+ {
+
+ String path =
fileBrowser.delete_current(CcCommons.type, CcCommons.view);
+ //remotePlaylist.removeAllByPath(path);
+ //alertPlaylist.removeAllByPath(path);
+ System.out.println(path);
if(CcCommons.type == CcConstants.TYPE_ATTITUNES)
{
if(this.savedProperties.containsKey("attitune"))
@@ -2521,6 +2525,7 @@
{
if(this.playlistDragToIndex == 1)
{ //then alert to remote copy.
+ //XXX
CcCommons.settings.registerAlertAsRemote(CcCommons.settings.getUID(alertPlaylist.getSelectedName()));
remotePlaylist.setDatas(CcCommons.settings.getRemoteListDatas());
remotePlaylist.refresh();
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/AlertPlaylist.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/AlertPlaylist.java
2009-01-23 12:16:42 UTC (rev 3524)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/AlertPlaylist.java
2009-01-23 13:44:55 UTC (rev 3525)
@@ -27,6 +27,7 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.Enumeration;
+import java.util.Vector;
import javax.swing.BorderFactory;
import javax.swing.ListSelectionModel;
@@ -91,7 +92,33 @@
}
+ //Removes all entries by gadget name.
+ public void removeAllByPath(String itemPath)
+ {
+ Vector<Object[]> toRemove = new Vector<Object[]>();
+ try
+ {
+ for(Object[] item : this.datas)
+ {
+ if(item[3].toString().equals(itemPath))
+ {
+ toRemove.add(item);
+ }
+ }
+
+ for(Object[] alert : toRemove)
+ {
+ CcCommons.settings.removeFromRemoteList(alert);
+ }
+ }
+ catch(NullPointerException listNotCreated)
+ {
+ //then list was not created yet must found a solution.
+ listNotCreated.printStackTrace();
+ }
+ }
+
public void setSelected(int row){
try{
if((row == -1) || (row == this.datas.length))
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.java
2009-01-23 12:16:42 UTC (rev 3524)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.java
2009-01-23 13:44:55 UTC (rev 3525)
@@ -28,6 +28,7 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.Enumeration;
+import java.util.Vector;
import javax.swing.BorderFactory;
import javax.swing.JScrollPane;
@@ -80,9 +81,29 @@
//Removes all entries by gadget name.
- public void removeAllByGadgetName(String gdgName)
+ public void removeAllByPath(String itemPath)
{
-
+ Vector<Object[]> toRemove = new Vector<Object[]>();
+ try
+ {
+ for(Object[] item : this.datas)
+ {
+ if(item[3].toString().equals(itemPath))
+ {
+ toRemove.add(item);
+ }
+ }
+
+ for(Object[] favoris : toRemove)
+ {
+
CcCommons.settings.removeFromRemoteList(favoris);
+ }
+ }
+ catch(NullPointerException listNotCreated)
+ {
+ //then list was not created yet must found a solution.
+ listNotCreated.printStackTrace();
+ }
}
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-23 12:16:42 UTC (rev 3524)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2009-01-23 13:44:55 UTC (rev 3525)
@@ -728,8 +728,15 @@
this.GadgetsDatasToDisplay = tmpToDisplay;
}
-
- public void delete_current(byte type, byte view){
+
+ /**
+ * Delete the current selected gadget/attitune into the labrary
and return the path that was deleted.
+ * @param type
+ * @param view
+ * @return
+ */
+ public String delete_current(byte type, byte view){
+ String path = null;
if(type == FileBrowser.GADGETS_TYPE)
{
String gdgName = null;
@@ -750,14 +757,12 @@
if(f.exists())
{
String realName = f.getName() +
".tgf";
- String p =
CcCommons.MyTuxGadgetsDirectory.getAbsolutePath() + File.separator + realName;
- File deleting = new File(p);
+ path =
CcCommons.MyTuxGadgetsDirectory.getAbsolutePath() + File.separator + realName;
+ File deleting = new File(path);
if(deleting.exists())
{
deleting.delete();
- }
-
-
CcCommons.settings.deleteFromPlaylists(p);
+ }
}
}
@@ -773,18 +778,21 @@
this.thumbnailGadgets.updateThumbs(gadgetsListView);
}
else if(type == FileBrowser.ATTITUNES_TYPES){
- if(view == FileBrowser.LIST_VIEW){
+ if(view == FileBrowser.LIST_VIEW){
+ path =
this.attitunesListView.getDatasAtSelectedIndex()[7].toString();
this.delete_attitune(getAttituneNameAtSelectedIndex().toString());
}
else if(view == FileBrowser.THUMBNAIL_VIEW){
-
this.thumbnailAttitunes.deleteCurrentThumbAttitune();
+ path =
this.thumbnailAttitunes.deleteCurrentThumbAttitune();
}
this.update_attitunes();
thumbnailAttitunes.updateThumbs(attitunesListView);
thumbnailAttitunes.repaint();
changes.firePropertyChange("Updated", null,
null);
- }
+ }
+
+ return path;
}
private void del(File f){
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
2009-01-23 12:16:42 UTC (rev 3524)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
2009-01-23 13:44:55 UTC (rev 3525)
@@ -372,12 +372,13 @@
}
- public void deleteCurrentThumbAttitune(){
+ public String deleteCurrentThumbAttitune(){
String path = this.getSelectedPath();
if (path != ""){
(new File(path)).delete();
this.firePropertyChange("Attitunes-Update-Needed",
null, null);
- }
+ }
+ return path;
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetObject.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetObject.java
2009-01-23 12:16:42 UTC (rev 3524)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/gadget/GadgetObject.java
2009-01-23 13:44:55 UTC (rev 3525)
@@ -196,7 +196,11 @@
public void notification(GadgetInstance instance, String name,
Object... parameters) {
- console.add(("[" +
instance.getGadget().getDescription().getName() + " # " + instance.getId() + "]
'" + name + "' notification > " + Strings.implode(parameters, ' ')));
+ try
+ {
+ console.add(("[" +
instance.getGadget().getDescription().getName() + " # " + instance.getId() + "]
'" + name + "' notification > " + Strings.implode(parameters, ' ')));
+ }
+ catch(NullPointerException except){}
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
2009-01-23 12:16:42 UTC (rev 3524)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
2009-01-23 13:44:55 UTC (rev 3525)
@@ -716,25 +716,28 @@
tableAlertDefinition.put("path",
oneObjectDatas.getAttribute("path"));
tableAlertDefinition.put("type",
oneObjectDatas.getAttribute("type"));
- Element parametersElem =
(Element)oneObjectDatas.getElementsByTagName("Parameters").item(0);
+
if(!tableAlertDefinition.get("type").equalsIgnoreCase("attitune"))
+ {
+ Element parametersElem =
(Element)oneObjectDatas.getElementsByTagName("Parameters").item(0);
+
+ NodeList parametersNode =
parametersElem.getElementsByTagName("parameter");
- NodeList parametersNode =
parametersElem.getElementsByTagName("parameter");
-
-
-
if(tableAlertDefinition.get("type").equalsIgnoreCase("gadget")){
- for(int i=0; i < parametersNode.getLength();
i++){
-
if(parametersNode.item(i).getNodeName().equalsIgnoreCase("parameter")){
- //then getting alert gadget
setting
- Hashtable<String, String> hash
= new Hashtable<String, String>();
- hash.put("name",
parametersNode.item(i).getAttributes()
-
.getNamedItem("name").getTextContent());
- hash.put("value",
parametersNode.item(i).getAttributes()
-
.getNamedItem("value").getTextContent());
- tableAlertParameters.add(hash);
// adding to parameters values.
+
if(tableAlertDefinition.get("type").equalsIgnoreCase("gadget")){
+
+ for(int i=0; i <
parametersNode.getLength(); i++){
+
if(parametersNode.item(i).getNodeName().equalsIgnoreCase("parameter")){
+ //then getting alert
gadget setting
+ Hashtable<String,
String> hash = new Hashtable<String, String>();
+ hash.put("name",
parametersNode.item(i).getAttributes()
+
.getNamedItem("name").getTextContent());
+ hash.put("value",
parametersNode.item(i).getAttributes()
+
.getNamedItem("value").getTextContent());
+
tableAlertParameters.add(hash); // adding to parameters values.
+ }
}
+
}
-
}
tableAlertDefinition.put("name",
CcInterfaceFunctions.rename
------------------------------------------------------------------------------
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
