Author: jerome
Date: 2008-12-14 12:41:43 +0100 (Sun, 14 Dec 2008)
New Revision: 3106
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
Log:
* Settings.xml parsing is now only allowed if it was edited.
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
2008-12-14 11:16:32 UTC (rev 3105)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
2008-12-14 11:41:43 UTC (rev 3106)
@@ -48,16 +48,20 @@
/** xml document representation **/
private Document document;
+ /** This var register a setting.xml edition. **/
+ public static boolean edited = true;
+
public Object mutex = new Object();
/**
* This object is a cc settings xml reader.
* @param xmlFile : xml file to read.
*/
- public XMLReader(File xmlFile){
+ public XMLReader(File xmlFile){
+
this.xmlFile = xmlFile;
try
- {
+ {
this.parse(); //Parse xml file.
}
catch (ParserConfigurationException e)
@@ -103,9 +107,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/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
2008-12-14 11:16:32 UTC (rev 3105)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
2008-12-14 11:41:43 UTC (rev 3106)
@@ -93,7 +93,9 @@
transformer.setOutputProperty(OutputKeys.ENCODING, "ISO-8859-1");
// Registration.
- transformer.transform(source, resultat);
+ transformer.transform(source, resultat);
+ //Sets global var 'edited' at true to avoid a new xml parsing.
+ XMLReader.edited = true;
}
catch(Exception e)
{
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
