Author: jerome
Date: 2009-02-11 14:26:39 +0100 (Wed, 11 Feb 2009)
New Revision: 3604
Modified:
software_suite_v2/software/control_center/trunk/control_center/.classpath
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
Log:
* Added a protection if an error occurred parsing settings.xml file.
Modified:
software_suite_v2/software/control_center/trunk/control_center/.classpath
===================================================================
--- software_suite_v2/software/control_center/trunk/control_center/.classpath
2009-02-11 11:53:49 UTC (rev 3603)
+++ software_suite_v2/software/control_center/trunk/control_center/.classpath
2009-02-11 13:26:39 UTC (rev 3604)
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="sources"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-openjdk"/>
- <classpathentry combineaccessrules="false" kind="src" path="/TuxAPI"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-framework"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/commons-collections-3.2.1.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/commons-logging-1.1.1.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/javassist-3.7.ga.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/jdic.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/jdic_stub.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/karmalab-commons-1.2.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/quartz-all-1.6.1-RC1.jar"/>
- <classpathentry kind="lib"
path="/usr/share/tuxdroid/resources/control_center/deps/tuxdroid-installer-paths.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="sources"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/TuxAPI"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-framework"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/cc_launcher.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/commons-collections-3.2.1.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/javassist-3.7.ga.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/jdic.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/jdic_stub.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/karmalab-commons-1.2.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/quartz-all-1.6.1-RC1.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/tuxdroid-gadget-framework-0.1.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/tuxdroid-installer-paths.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
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-02-11 11:53:49 UTC (rev 3603)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
2009-02-11 13:26:39 UTC (rev 3604)
@@ -95,12 +95,19 @@
DocumentBuilder builder = fact.newDocumentBuilder();
CcCommons.logger.appendDone();
+ Document doc = null;
try
- {
+ {
+ doc = this.document;
this.document = builder.parse(this.xmlFile);
}
catch(Exception except)
- {}
+ {
+ if(doc != null)
+ {
+ this.document = doc;
+ }
+ }
}
}
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
