Author: jerome
Date: 2009-01-23 09:47:54 +0100 (Fri, 23 Jan 2009)
New Revision: 3520
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/settings/XMLReader.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
Log:
* Fixed: #55 ?\226?\128?\148 Mes Alertes - Configuration.
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 08:06:36 UTC (rev 3519)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2009-01-23 08:47:54 UTC (rev 3520)
@@ -1842,7 +1842,7 @@
String[] values = (String[])arg0.getNewValue();
CcCommons.settings.setAlertNameValue(values[0],
values[1]);
}
-
+ //XXX
else
if(arg0.getPropertyName().equalsIgnoreCase("Alert-Value-Changed")){
final String kind = alertPlaylist.getSelectedItemKind();
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-23 08:06:36 UTC (rev 3519)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
2009-01-23 08:47:54 UTC (rev 3520)
@@ -52,6 +52,9 @@
/** xml document representation **/
private Document document;
+ /** This var register a setting.xml edition. **/
+ public static boolean edited = true;
+
public Object mutex = new Object();
/**
@@ -111,10 +114,16 @@
public Document getDocument(){
synchronized(this.mutex)
{
+ if(!XMLReader.edited)
+ {
+ return this.document;
+ }
+
try
{
CcCommons.logger.append("Parsing settings.xml",
true);
this.parse();
+ XMLReader.edited = false;
}
catch (ParserConfigurationException e)
{
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 08:06:36 UTC (rev 3519)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
2009-01-23 08:47:54 UTC (rev 3520)
@@ -178,11 +178,13 @@
transformer.setOutputProperty(OutputKeys.ENCODING,
CcCommons.settingsEncoding);
}
// Registration.
- transformer.transform(source, resultat);
+ transformer.transform(source, resultat);
+ XMLReader.edited = true;
}
catch(Exception e)
{
- CcCommons.logger.appendError(e.getStackTrace());
+ CcCommons.logger.appendError(e.getStackTrace());
+ XMLReader.edited = true;
}
}
@@ -569,7 +571,8 @@
{
CcCommons.logger.append("Registering alert gadget
parameters (" + gadget.getName() + ")", true);
int index = Settings.reader.getIndexByUUID(uid);
- Node attElem =
Settings.reader.getDocument().getElementsByTagName("alert").item(index);
+ Document doc = Settings.reader.getDocument();
+ Node attElem =
doc.getElementsByTagName("alert").item(index);
//Deleting old gadget parameters.
Element oneObjectDatas = (Element)attElem;
NodeList conf =
oneObjectDatas.getElementsByTagName("Parameters");
@@ -583,22 +586,23 @@
if(index != -1){
String name = param.getName();
String value = parameters.get(param);
-
+
//Create new configuration.
- Element Conf =
Settings.reader.getDocument().createElement("parameter");
+ Element Conf =
doc.createElement("parameter");
Conf.setAttribute("name", name);
Conf.setAttribute("value", value);
parametersElem.appendChild(Conf);
//write changes.
-
this.registerChanges(Settings.reader.getDocument());
+ this.registerChanges(doc);
}
}
}
catch(Exception e)
{
CcCommons.logger.appendError(e.getStackTrace());
+ e.printStackTrace();
}
}
------------------------------------------------------------------------------
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
