Author: jerome
Date: 2009-01-08 13:53:59 +0100 (Thu, 08 Jan 2009)
New Revision: 3392
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/Listener/ExitControlListener.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
Log:
* Fixed a bug with iuuid file (the one Renato has some times ago ).
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-07 09:21:31 UTC (rev 3391)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-01-08 12:53:59 UTC (rev 3392)
@@ -533,8 +533,8 @@
final String path =
CcCommons.language.getMenuSubDirectory();
//Add exit menu item that allow to exit application.
exit = new
JMenuItem(CcCommons.language.getMenuFileExit());
- exit.addMouseListener(new
ExitControlListener(CcCommons.type, fileBrowser, fileMenu,
-
"saveFavoritesParams", path + "file.png"));
+ exit.addMouseListener(new
ExitControlListener(fileBrowser, fileMenu,
+
"doneWhenExit", path + "file.png"));
popupFileMenu.add(exit);
//Create a menu listener com.tuxdroid.cc.Listener.
@@ -840,8 +840,8 @@
private JButton getFermerControl() {
if (fermerB == null) {
fermerB = new TuxButton("images/buttons/fermer.png",
new Rectangle(720, 4, 32, 16));
- fermerB.addMouseListener(new
ExitControlListener(CcCommons.type, fileBrowser, fermerB,
-
"saveFavoritesParams", "images/buttons/fermer_down.png"));
+ fermerB.addMouseListener(new
ExitControlListener(fileBrowser, fermerB,
+
"doneWhenExit", "images/buttons/fermer_down.png"));
}
return fermerB;
}
@@ -2637,7 +2637,19 @@
public void dragEnter(DropTargetDragEvent arg0) {}
public void dragExit(DropTargetEvent arg0) {}
public void dragOver(DropTargetDragEvent arg0) {}
- public void dropActionChanged(DropTargetDragEvent arg0) {}
+ public void dropActionChanged(DropTargetDragEvent arg0) {}
+
+ public void doneWhenExit()
+ {
+ if(CcCommons.type == CcConstants.TYPE_REMOTELIST) {
+ this.remotePlaylist.checkForEdition();
+ saveFavoritesParams();
+ }
+
+ else if(CcCommons.type == CcConstants.TYPE_ALERT){
+ this.alertPlaylist.checkForEdition();
+ }
+ }
/******************************************************************************/
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-07 09:21:31 UTC (rev 3391)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Listener/ExitControlListener.java
2009-01-08 12:53:59 UTC (rev 3392)
@@ -30,18 +30,16 @@
import com.tuxdroid.cc.CcCommons;
import com.tuxdroid.cc.CcConstants;
import com.tuxdroid.cc.Object.PseudoFileBrowser.FileBrowser;
+import com.tuxisalive.api.SThread;
public class ExitControlListener extends java.awt.event.MouseAdapter{
- private int type;
private FileBrowser fileBrowser;
private JButton fermer;
- private Object sender;
private String method;
private String iconPath;
- public ExitControlListener(int type, FileBrowser fileBrowser, JButton
fermer, String method, String iconPath){
- this.type = type;
+ public ExitControlListener(FileBrowser fileBrowser, JButton fermer,
String method, String iconPath){
this.fileBrowser = fileBrowser;
this.fermer = fermer;
this.method = method;
@@ -51,13 +49,6 @@
public void mouseReleased(java.awt.event.MouseEvent e) {
//Delete temporary files when quit control center.
- if(type == CcConstants.TYPE_REMOTELIST)
- try{
- Method targetMethod =
CcCommons.targetClass.getDeclaredMethod(method);
- targetMethod.invoke(sender, (Object[])null);
-
- } catch(Exception ex){}
-
fileBrowser.deleteTemp();
CcCommons.tux.tts.stop();
fileBrowser.stopPlaying(CcConstants.TYPE_ATTITUNES,
FileBrowser.REMOTELIST_TYPE);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
2009-01-07 09:21:31 UTC (rev 3391)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
2009-01-08 12:53:59 UTC (rev 3392)
@@ -225,7 +225,6 @@
if(!iuuidFile.exists())
{
//IUUID has never been registered so create it, and
update gadgets, attitunes, and tools.
- this.generateIUUIDFile(iuuidFile, this.newIUUID);
JOptionPane.showMessageDialog(null,
CcCommons.language.messages.getSoftwareUpdateMessage(),
CcCommons.language.getTitle(), JOptionPane.WARNING_MESSAGE);
if(this.updateAttitunes)
@@ -234,6 +233,7 @@
this.updateGadgets();
if(this.updateTools)
this.updateTools();
+ this.generateIUUIDFile(iuuidFile, this.newIUUID);
}
else
{
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
2009-01-07 09:21:31 UTC (rev 3391)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
2009-01-08 12:53:59 UTC (rev 3392)
@@ -518,28 +518,36 @@
}
- public GadgetInstanceParameters getRemoteGadgetParameters(String name,
GadgetInstance instance){
+ public GadgetInstanceParameters getRemoteGadgetParameters(String name,
GadgetInstance instance)
+ {
CcCommons.logger.append("Getting playlist gadget parameters ("
+ instance.getGadget().getDescription().getName() + ")", true);
//Create gadget parameters instance.
GadgetInstanceParameters parameters = new
GadgetInstanceParameters();
NodeList attElem =
this.getDocument().getElementsByTagName("remoted");
- for(int i=0; i < attElem.getLength(); i++){
+ for(int i=0; i < attElem.getLength(); i++)
+ {
String regName =
attElem.item(i).getAttributes().getNamedItem("name").getTextContent();
String type =
attElem.item(i).getAttributes().getNamedItem("type").getTextContent();
- if(regName.equals(name) &&
type.toLowerCase().equals("gadget")){
+
+ if(regName.equals(name) &&
type.toLowerCase().equals("gadget"))
+ {
NodeList config =
((Element)attElem.item(i)).getElementsByTagName("Parameters");
NodeList conf = config.item(0).getChildNodes();
- for(int y=0; y < conf.getLength(); y++){
+ for(int y=0; y < conf.getLength(); y++)
+ {
Node param = conf.item(y);
-
if(param.getNodeName().equalsIgnoreCase("parameter")){
+
if(param.getNodeName().equalsIgnoreCase("parameter"))
+ {
String pname =
param.getAttributes().getNamedItem("name").getTextContent();
String value =
param.getAttributes().getNamedItem("value").getTextContent();
//Register new gadget
parameter.
- for(int x=0; x <
instance.getGadget().getParameters().size(); x++){
+ for(int x=0; x <
instance.getGadget().getParameters().size(); x++)
+ {
GadgetParameter
gdgParam = instance.getGadget().getParameters().get(x);
-
if(gdgParam.getName().equals(pname)){
+
if(gdgParam.getName().equals(pname))
+ {
parameters.setValue(gdgParam, value);
}
}
------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
