Author: jerome
Date: 2008-12-15 17:11:07 +0100 (Mon, 15 Dec 2008)
New Revision: 3133
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcCommons.java
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Utils/AttitunesFunctions.java
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Settings.java
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:
* Sharing xml reader object to remove unneeded object.
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcCommons.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcCommons.java
2008-12-15 12:13:51 UTC (rev 3132)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/CcCommons.java
2008-12-15 16:11:07 UTC (rev 3133)
@@ -78,6 +78,7 @@
public static File MyTuxTools;
public static File TuxDroidSettingsDirectory;
public static File TuxDroidSettingsFile;
+ public static File TuxDroidSettingsBackup;
public static File TuxHelpFiles;
//Temporaries files.
@@ -151,6 +152,7 @@
MyTuxTools = new File(MyTuxDirectory.getAbsolutePath() +
File.separator + "MyTuxTools");
TuxDroidSettingsFile = new
File(TuxDroidSettingsDirectory.getAbsolutePath() + File.separator +
"settings.xml");
TuxHelpFiles = InstallerPaths.directoryControlCenterHelps;
+ TuxDroidSettingsBackup = new
File(TuxDroidSettingsDirectory.getAbsolutePath() + File.separator +
"settings.xml.bak");
//Temporaries files.
GdgTempDirectory = new
File(System.getProperty("java.io.tmpdir") + File.separator + "MyTux/gdgTmp");
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Utils/AttitunesFunctions.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Utils/AttitunesFunctions.java
2008-12-15 12:13:51 UTC (rev 3132)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Utils/AttitunesFunctions.java
2008-12-15 16:11:07 UTC (rev 3133)
@@ -210,6 +210,7 @@
}
+
@SuppressWarnings("unchecked")
public static boolean isValidAttitune(Hashtable<String, Object>
attitune){
if(log)
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Settings.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Settings.java
2008-12-15 12:13:51 UTC (rev 3132)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Settings.java
2008-12-15 16:11:07 UTC (rev 3133)
@@ -39,12 +39,12 @@
//Public object xml reader and writer.
/** Reader object **/
- private XMLReader reader;
+ public static XMLReader reader;
/** Writer object **/
- private XMLWriter writer;
+ public static XMLWriter writer;
/** Backup file **/
- public static File backup;
+ public static File backup = CcCommons.TuxDroidSettingsBackup;
/**
* Backup settings.xml file.
@@ -103,7 +103,7 @@
{
CcCommons.logger.append("Copying datas from
backup to new settings file.", true);
FileUtils.copy(Settings.backup,
CcCommons.TuxDroidSettingsFile);
- //No the settings file has changed, force to
parse again the new settings file.
+ //Now the settings file has changed, force to
parse again the new settings file.
XMLReader.edited = true;
CcCommons.logger.append("Restore completed.",
true);
return true;
@@ -166,7 +166,7 @@
*/
private void getReader(){
if(CcCommons.TuxDroidSettingsFile.isFile()){
- this.reader = new
XMLReader(CcCommons.TuxDroidSettingsFile);
+ reader = new XMLReader(CcCommons.TuxDroidSettingsFile);
}
}
@@ -174,9 +174,9 @@
* This procedure gets the xml writer object.
*/
private void getWriter(){
- this.writer = new XMLWriter(CcCommons.TuxDroidSettingsFile,
this.newXmlFile);
+ writer = new XMLWriter(CcCommons.TuxDroidSettingsFile,
this.newXmlFile);
if(this.newXmlFile){
- this.writer.createBaseSettingsStructure();
+ writer.createBaseSettingsStructure();
}
}
@@ -186,7 +186,7 @@
*/
public void updateVersionTag()
{
- this.writer.writeVersionIfDifferent();
+ writer.writeVersionIfDifferent();
}
/**
@@ -194,17 +194,17 @@
* @return Locale object containing language and country.
*/
public Locale getLocale(){
- String lang = this.reader.getLanguage();
- String country = this.reader.getCountry();
+ String lang = reader.getLanguage();
+ String country = reader.getCountry();
return new Locale(lang, country);
}
public String getLanguage(){
- return this.reader.getLanguage();
+ return reader.getLanguage();
}
public String getCountry(){
- return this.reader.getCountry();
+ return reader.getCountry();
}
@@ -213,7 +213,7 @@
* @return
*/
public String getSpeaker(){
- String speaker = this.reader.getSpeaker();
+ String speaker = reader.getSpeaker();
return speaker;
}
@@ -223,17 +223,17 @@
* @return
*/
public String getCurrentIPAdress(){
- return this.reader.getIP();
+ return reader.getIP();
}
public boolean haveRemoteList(){
- return this.reader.isRemoteListInitialized();
+ return reader.isRemoteListInitialized();
}
public boolean haveAlertList(){
- return this.reader.isAlertListInitialized();
+ return reader.isAlertListInitialized();
}
@@ -243,7 +243,7 @@
public Object[][] getAlertListDatas(){
- return this.reader.getAlertList();
+ return reader.getAlertList();
}
@@ -254,7 +254,7 @@
*/
public void saveLocale(String lang, String country){
if(lang.equals("en")) country = "US";
- this.writer.writeLocale(lang, country);
+ writer.writeLocale(lang, country);
}
@@ -263,7 +263,7 @@
* @param speaker
*/
public void saveSpeaker(String speaker){
- this.writer.writeSpeaker(speaker);
+ writer.writeSpeaker(speaker);
}
@@ -272,7 +272,7 @@
* @param ipadress
*/
public void saveIP(String ipadress){
- this.writer.writeIP(ipadress);
+ writer.writeIP(ipadress);
}
@@ -281,136 +281,136 @@
* @param datas
*/
public void addToRemoteList(Object[] datas){
- this.writer.saveToRemoteList(datas, null);
+ writer.saveToRemoteList(datas, null);
}
public void removeFromRemoteList(Object[] datas){
- this.writer.removeFromRemoteList(datas);
+ writer.removeFromRemoteList(datas);
}
public void addToAlertList(Object[] datas, Object[] config){
- this.writer.saveToAlertList(datas, config);
+ writer.saveToAlertList(datas, config);
}
public void removeFromAlertList(Object[] datas){
- this.writer.removeFromAlertList(datas);
+ writer.removeFromAlertList(datas);
}
public void registerAlertConfiguration(Object[] config, int index){
- this.writer.writeAlertConfiguration(index, config);
+ writer.writeAlertConfiguration(index, config);
}
public String getPathByUUID(String uid){
- return this.reader.getAttituneUid(uid);
+ return reader.getAttituneUid(uid);
}
public String getScheduledActionByUUID(String uid){
- return this.reader.getSchedulType(uid);
+ return reader.getSchedulType(uid);
}
public String getAlertObjectKind(String uid){
- return this.reader.getAlertObject(uid);
+ return reader.getAlertObject(uid);
}
public void registerGadgetParameter(String uuid,
GadgetInstanceParameters parameters,
GadgetObject gadget){
- this.writer.registerGadgetParameters(uuid, parameters, gadget);
+ writer.registerGadgetParameters(uuid, parameters, gadget);
}
public GadgetInstanceParameters
getGadgetInstanceRegisteredParameters(String uid, GadgetInstance instance){
- return this.reader.getGadgetParameters(uid, instance);
+ return reader.getGadgetParameters(uid, instance);
}
public GadgetInstanceParameters
getGadgetInstanceRegisteredRemoteParameters(
String name, GadgetInstance instance){
- return this.reader.getRemoteGadgetParameters(name, instance);
+ return reader.getRemoteGadgetParameters(name, instance);
}
public String getAlertActionValue(String uuid){
- return this.reader.getSchedulerAction(uuid);
+ return reader.getSchedulerAction(uuid);
}
public Vector<Object[]> getAlertsDatas(){
- return this.reader.getAlertsDatas();
+ return reader.getAlertsDatas();
}
public String getGadgetPath(String uid){
- return this.reader.getGadgetPathByUid(uid);
+ return reader.getGadgetPathByUid(uid);
}
public String getHours(String uid){
- return this.reader.getHours(uid);
+ return reader.getHours(uid);
}
public String getMins(String uid){
- return this.reader.getMins(uid);
+ return reader.getMins(uid);
}
public String getTimeType(String uid){
- return this.reader.getTimeType(uid);
+ return reader.getTimeType(uid);
}
public String getUID(String name){
- return this.reader.getUID(name);
+ return reader.getUID(name);
}
public String getActionType(String uid){
- return this.reader.getActionType(uid);
+ return reader.getActionType(uid);
}
public String getActionValue(String uid){
- return this.reader.getActionValue(uid);
+ return reader.getActionValue(uid);
}
public boolean haveConfiguration(String uid){
- return this.reader.haveRegisteredConfiguration(uid);
+ return reader.haveRegisteredConfiguration(uid);
}
public void setRemoteNameValue(String oldName, String newName){
- this.writer.setRemoteName(oldName, newName);
+ writer.setRemoteName(oldName, newName);
}
public void setAlertNameValue(String oldName, String newName){
- this.writer.setAlertName(oldName, newName);
+ writer.setAlertName(oldName, newName);
}
public void registerRemoteGadgetSettings(String name,
GadgetInstanceParameters parameters,
GadgetObject gadget){
- this.writer.registerRemotedGadgetParameters(name, parameters,
gadget);
+ writer.registerRemotedGadgetParameters(name, parameters,
gadget);
}
public boolean haveRemoteConfiguration(String name){
- return this.reader.haveConfigRemoted(name);
+ return reader.haveConfigRemoted(name);
}
//Set a pitch.
public void setPitch(int pitchValue){
- this.writer.writePitch(pitchValue);
+ writer.writePitch(pitchValue);
}
//Return registered pitch.
public int getPitch(){
- return this.reader.getPitch();
+ return reader.getPitch();
}
public void registerAlertAsRemote(String uid){
- this.writer.registerAlertDatasAsRemoteDatas(uid);
+ writer.registerAlertDatasAsRemoteDatas(uid);
}
public void registerRemoteAsAlert(String name){
- this.writer.registerRemoteDatasAsAlertDatas(name);
+ writer.registerRemoteDatasAsAlertDatas(name);
}
public void copyAlert(String uid){
- this.writer.copyAlert(uid);
+ writer.copyAlert(uid);
}
public void copyRemote(String name){
- this.writer.copyRemote(name);
+ writer.copyRemote(name);
}
@@ -420,30 +420,30 @@
public String getRegisteredRegistryLanguage(){
- return this.reader.getRegisteredRegistryLanguage();
+ return reader.getRegisteredRegistryLanguage();
}
public boolean isRegisteryLanguagePresent(){
- return this.reader.isRegisteryLanguagePresent();
+ return reader.isRegisteryLanguagePresent();
}
public void createRegisteryEntry(){
- this.writer.createRegisteryEntry();
+ writer.createRegisteryEntry();
}
public boolean showTooltip(){
- return this.reader.showTooltip();
+ return reader.showTooltip();
}
public void registerAvailablesLocutors(){
if(CcCommons.tux.tts.getVoices().size() > 0)
- this.writer.registerLocutors();
+ writer.registerLocutors();
}
public Vector<String> getRegisteredAvailablesLocutors(){
- return this.reader.getRegisteredLocutors();
+ return reader.getRegisteredLocutors();
}
}
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-15 12:13:51 UTC (rev 3132)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
2008-12-15 16:11:07 UTC (rev 3133)
@@ -67,17 +67,20 @@
catch (ParserConfigurationException e)
{
CcCommons.logger.appendError(e.getStackTrace());
- e.printStackTrace();
+ Settings.restore();
+ this.getDocument();
}
catch (SAXException e)
{
CcCommons.logger.appendError(e.getStackTrace());
- e.printStackTrace();
+ Settings.restore();
+ this.getDocument();
}
catch (IOException e)
{
CcCommons.logger.appendError(e.getStackTrace());
- e.printStackTrace();
+ Settings.restore();
+ this.getDocument();
}
}
@@ -98,7 +101,11 @@
{
this.document = builder.parse(this.xmlFile);
}
- catch(Exception except){}
+ catch(Exception except)
+ {
+ Settings.restore();
+ this.parse();
+ }
}
}
@@ -124,17 +131,20 @@
catch (ParserConfigurationException e)
{
CcCommons.logger.appendError(e.getStackTrace());
- e.printStackTrace();
+ Settings.restore();
+ return this.getDocument();
}
catch (SAXException e)
{
CcCommons.logger.appendError(e.getStackTrace());
- e.printStackTrace();
+ Settings.restore();
+ return this.getDocument();
}
catch (IOException e)
{
CcCommons.logger.appendError(e.getStackTrace());
- e.printStackTrace();
+ Settings.restore();
+ return this.getDocument();
}
return this.document;
}
@@ -156,6 +166,9 @@
catch(Exception e)
{
CcCommons.logger.appendError(e.getStackTrace());
+ Settings.restore();
+ this.getDocument();
+ return this.getLanguage();
}
return lang;
}
@@ -176,6 +189,9 @@
catch(Exception e)
{
CcCommons.logger.appendError(e.getStackTrace());
+ Settings.restore();
+ this.getDocument();
+ return this.getPitch();
}
return Integer.valueOf(pitch).intValue();
}
@@ -197,6 +213,9 @@
catch(Exception e)
{
CcCommons.logger.appendError(e.getStackTrace());
+ Settings.restore();
+ this.getDocument();
+ return this.getCountry();
}
return country;
}
@@ -218,6 +237,9 @@
catch(Exception e)
{
CcCommons.logger.appendError(e.getStackTrace());
+ Settings.restore();
+ this.getDocument();
+ return this.getSpeaker();
}
return speaker;
}
@@ -239,6 +261,9 @@
catch(Exception e)
{
CcCommons.logger.appendError(e.getStackTrace());
+ Settings.restore();
+ this.getDocument();
+ return this.getIP();
}
return ipadress;
}
@@ -277,8 +302,10 @@
catch(Exception e)
{
CcCommons.logger.appendError(e.getStackTrace());
+ Settings.restore();
+ this.getDocument();
+ return this.getPlaylistDatas(tagName);
}
- return null;
}
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-15 12:13:51 UTC (rev 3132)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
2008-12-15 16:11:07 UTC (rev 3133)
@@ -55,9 +55,7 @@
public class XMLWriter {
/** xml file reference **/
- private File xmlFile;
- /** xml reader to modify xml **/
- private XMLReader reader;
+ private File xmlFile;
public static boolean locked = false;
@@ -71,7 +69,7 @@
this.xmlFile = xmlFile;
if(!newFile){
- reader = new XMLReader(this.xmlFile);
+ Settings.reader = new XMLReader(this.xmlFile);
}
if(!this.isValid())
@@ -132,22 +130,22 @@
{
try
{
- Element version =
(Element)this.reader.getDocument().getElementsByTagName("version").item(0);
+ Element version =
(Element)Settings.reader.getDocument().getElementsByTagName("version").item(0);
String ccVersion = version.getTextContent();
if(!ccVersion.equals(CcCommons.language.getCcVersion()))
{
CcCommons.logger.append("New Control center
version to be written.", true);
version.setTextContent(CcCommons.language.getCcVersion());
- this.registerChanges(this.reader.getDocument());
+
this.registerChanges(Settings.reader.getDocument());
}
}
catch(NullPointerException noVersionFound)
{
CcCommons.logger.append("New Control center version to
be written.", true);
- Element version =
this.reader.getDocument().createElement("version");
+ Element version =
Settings.reader.getDocument().createElement("version");
version.setTextContent(CcCommons.language.getCcVersion());
-
this.reader.getDocument().getElementsByTagName("settings").item(0).appendChild(version);
- this.registerChanges(this.reader.getDocument());
+
Settings.reader.getDocument().getElementsByTagName("settings").item(0).appendChild(version);
+ this.registerChanges(Settings.reader.getDocument());
}
}
@@ -182,7 +180,7 @@
catch(Exception e)
{
CcCommons.logger.appendError(e.getStackTrace());
- e.printStackTrace();
+ e.printStackTrace();
CcCommons.logger.append(" -->> ERROR: An error occured trying to
register changes.", true);
CcCommons.logger.append("Trying to restore from a previous backup
file.", true);
Settings.restore();
@@ -265,7 +263,6 @@
CcCommons.logger.appendError(e.getStackTrace());
e.printStackTrace();
}
- reader = new XMLReader(this.xmlFile);
}
/**
@@ -278,11 +275,12 @@
try
{
CcCommons.logger.append("Writing locale", true);
- Node langn =
reader.getDocument().getElementsByTagName("lang").item(0);
+ Node langn =
Settings.reader.getDocument().getElementsByTagName("lang").item(0);
+ System.out.println("language to be writen : " +
langn.getChildNodes().item(0).getTextContent());
langn.getChildNodes().item(0).setNodeValue(lang);
- Node countryn =
reader.getDocument().getElementsByTagName("country").item(0);
+ Node countryn =
Settings.reader.getDocument().getElementsByTagName("country").item(0);
countryn.getChildNodes().item(0).setNodeValue(country);
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
catch(Exception e)
{
@@ -301,9 +299,9 @@
try
{
CcCommons.logger.append("Writing speaker", true);
- Node speak =
reader.getDocument().getElementsByTagName("speaker").item(0);
+ Node speak =
Settings.reader.getDocument().getElementsByTagName("speaker").item(0);
speak.getChildNodes().item(0).setNodeValue(speaker);
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
catch(Exception e)
{
@@ -321,9 +319,9 @@
try
{
CcCommons.logger.append("Writing pitch", true);
- Node pitch =
reader.getDocument().getElementsByTagName("pitch").item(0);
+ Node pitch =
Settings.reader.getDocument().getElementsByTagName("pitch").item(0);
pitch.getChildNodes().item(0).setNodeValue(String.valueOf(pitchValue));
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
catch(Exception e)
{
@@ -342,10 +340,10 @@
try
{
CcCommons.logger.append("Writing ip", true);
- Node ipadress =
reader.getDocument().getElementsByTagName("ip").item(0);
+ Node ipadress =
Settings.reader.getDocument().getElementsByTagName("ip").item(0);
if(ip != ""){
ipadress.getChildNodes().item(0).setNodeValue(ip);
- this.registerChanges(reader.getDocument());
+
this.registerChanges(Settings.reader.getDocument());
}
}
catch(Exception e)
@@ -367,9 +365,9 @@
{
CcCommons.logger.append("Saving to playlist: " +
TagName, true);
locked = true;
- Node attElem =
reader.getDocument().getElementsByTagName(TagName).item(0);
+ Node attElem =
Settings.reader.getDocument().getElementsByTagName(TagName).item(0);
//Create base element.
- Element newElem =
reader.getDocument().createElement(newTagName);
+ Element newElem =
Settings.reader.getDocument().createElement(newTagName);
//Adding attitunes attributes.
newElem.setAttribute("name", datas[0].toString());
newElem.setAttribute("type", datas[1].toString());
@@ -385,10 +383,10 @@
if(newTagName.equals("alert")){
if (config == null){
-
this.setDefaultAlertConfig(reader.getDocument(), newElem);
+
this.setDefaultAlertConfig(Settings.reader.getDocument(), newElem);
}
}
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
locked = false;
}
catch(Exception e)
@@ -444,7 +442,7 @@
try
{
CcCommons.logger.append("Removing " +
datas[0].toString() + " from playlist " + TagName, true);
- NodeList node =
reader.getDocument().getElementsByTagName(TagName);
+ NodeList node =
Settings.reader.getDocument().getElementsByTagName(TagName);
for(int i=0; i < node.getLength() ; i++){
Node oneObjectDatas = node.item(i);
@@ -454,7 +452,7 @@
node.item(i).getParentNode().removeChild(oneObjectDatas);
}
}
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
catch(Exception e)
@@ -469,7 +467,7 @@
{
try
{
- NodeList node =
reader.getDocument().getElementsByTagName(itemName);
+ NodeList node =
Settings.reader.getDocument().getElementsByTagName(itemName);
return !(node.getLength() <= 0);
}
catch(Exception e)
@@ -483,9 +481,9 @@
{
try
{
- Node node =
reader.getDocument().getElementsByTagName(playlist).item(0);
+ Node node =
Settings.reader.getDocument().getElementsByTagName(playlist).item(0);
node.getAttributes().getNamedItem("initialized").setTextContent("false");
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
catch(Exception e)
{
@@ -517,9 +515,9 @@
try
{
CcCommons.logger.append("Writing basic alert
configuration", true);
- Node attElem =
reader.getDocument().getElementsByTagName("alert").item(index);
+ Node attElem =
Settings.reader.getDocument().getElementsByTagName("alert").item(index);
//Create new configuration.
- Element attConf =
reader.getDocument().createElement("configuration");
+ Element attConf =
Settings.reader.getDocument().createElement("configuration");
attConf.setAttribute("type", config[0].toString());
attConf.setAttribute("hours", config[1].toString());
attConf.setAttribute("minutes", config[2].toString());
@@ -537,7 +535,7 @@
attElem.appendChild(attConf);
//write changes.
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
catch(Exception e)
{
@@ -552,15 +550,15 @@
try
{
CcCommons.logger.append("Registering alert gadget
parameters (" + gadget.getName() + ")", true);
- int index = this.reader.getIndexByUUID(uid);
- Node attElem =
reader.getDocument().getElementsByTagName("alert").item(index);
+ int index = Settings.reader.getIndexByUUID(uid);
+ Node attElem =
Settings.reader.getDocument().getElementsByTagName("alert").item(index);
//Deleting old gadget parameters.
Element oneObjectDatas = (Element)attElem;
NodeList conf =
oneObjectDatas.getElementsByTagName("Parameters");
for(int i=0; i < conf.getLength() ; i++){
attElem.removeChild(conf.item(i));
}
- Element parametersElem =
reader.getDocument().createElement("Parameters");
+ Element parametersElem =
Settings.reader.getDocument().createElement("Parameters");
attElem.appendChild(parametersElem);
for(GadgetParameter param :
gadget.getGadget().getParameters()){
@@ -569,14 +567,14 @@
String value = parameters.get(param);
//Create new configuration.
- Element Conf =
reader.getDocument().createElement("parameter");
+ Element Conf =
Settings.reader.getDocument().createElement("parameter");
Conf.setAttribute("name", name);
Conf.setAttribute("value", value);
parametersElem.appendChild(Conf);
//write changes.
-
this.registerChanges(reader.getDocument());
+
this.registerChanges(Settings.reader.getDocument());
}
}
}
@@ -593,7 +591,7 @@
try
{
CcCommons.logger.append("Changing favorite name of " +
oldName + " for : " + newName, true);
- NodeList node =
reader.getDocument().getElementsByTagName("remoted");
+ NodeList node =
Settings.reader.getDocument().getElementsByTagName("remoted");
for(int i=0; i < node.getLength() ; i++){
Node oneObjectDatas = node.item(i);
@@ -602,7 +600,7 @@
oneObjectDatas.getAttributes().getNamedItem("name").setTextContent(newName);
}
}
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
catch(Exception e)
{
@@ -616,7 +614,7 @@
try
{
CcCommons.logger.append("Changing alert name of " +
oldName + " for : " + newName, true);
- NodeList node =
reader.getDocument().getElementsByTagName("alert");
+ NodeList node =
Settings.reader.getDocument().getElementsByTagName("alert");
for(int i=0; i < node.getLength() ; i++){
Node oneObjectDatas = node.item(i);
@@ -625,7 +623,7 @@
oneObjectDatas.getAttributes().getNamedItem("name").setTextContent(newName);
}
}
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
catch(Exception e)
{
@@ -640,7 +638,7 @@
try
{
CcCommons.logger.append("Registering favorites gadget
parameters (" + gadget.getName() + ")", true);
- NodeList attElem =
reader.getDocument().getElementsByTagName("remoted");
+ NodeList attElem =
Settings.reader.getDocument().getElementsByTagName("remoted");
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();
@@ -656,7 +654,7 @@
}
//Adding news parameters.
- Element parametersElem =
reader.getDocument().createElement("Parameters");
+ Element parametersElem =
Settings.reader.getDocument().createElement("Parameters");
att.appendChild(parametersElem);
for(GadgetParameter param :
gadget.getGadget().getParameters()){
@@ -664,14 +662,14 @@
String value =
parameters.get(param);
//Create new configuration.
- Element Conf =
reader.getDocument().createElement("parameter");
+ Element Conf =
Settings.reader.getDocument().createElement("parameter");
Conf.setAttribute("name",
pname);
Conf.setAttribute("value",
value);
parametersElem.appendChild(Conf);
}
-
this.registerChanges(reader.getDocument());
+
this.registerChanges(Settings.reader.getDocument());
}
}
}
@@ -688,8 +686,8 @@
try
{
CcCommons.logger.append("Copying alert datas to
favorite datas", true);
- NodeList node =
this.reader.getDocument().getElementsByTagName("alert");
- int index = this.reader.getIndexByUUID(uid);
+ NodeList node =
Settings.reader.getDocument().getElementsByTagName("alert");
+ int index = Settings.reader.getIndexByUUID(uid);
Element oneObjectDatas = (Element)node.item(index);
//Getting attributes.
Hashtable<String, String> tableAlertDefinition = new
Hashtable<String, String>();
@@ -723,7 +721,7 @@
//Checking if they already have a named "name" item
into remote list.
- for(Object[] remote : this.reader.getRemoteList()){
+ for(Object[] remote : Settings.reader.getRemoteList()){
while(remote[0].toString().equalsIgnoreCase(tableAlertDefinition.get("name"))){
//An item is already named "name" then,
rename.
String name =
tableAlertDefinition.get("name");
@@ -732,17 +730,17 @@
}
}
//Registering new "alert" entry.
- Node root =
reader.getDocument().getElementsByTagName("RemoteList").item(0);
- Element remoteElem =
reader.getDocument().createElement("remoted");
+ Node root =
Settings.reader.getDocument().getElementsByTagName("RemoteList").item(0);
+ Element remoteElem =
Settings.reader.getDocument().createElement("remoted");
remoteElem.setAttribute("name",
tableAlertDefinition.get("name"));
remoteElem.setAttribute("author",
tableAlertDefinition.get("author"));
remoteElem.setAttribute("path",
tableAlertDefinition.get("path"));
remoteElem.setAttribute("type",
tableAlertDefinition.get("type"));
if(tableAlertParameters.size() > 0){ //then they have
parameters.
- Element remoteParams =
reader.getDocument().createElement("Parameters");
+ Element remoteParams =
Settings.reader.getDocument().createElement("Parameters");
for(Hashtable<String, String> hash :
tableAlertParameters){
- Element parameter =
reader.getDocument().createElement("parameter");
+ Element parameter =
Settings.reader.getDocument().createElement("parameter");
parameter.setAttribute("name",
hash.get("name"));
parameter.setAttribute("value",
hash.get("value"));
//adding one parameter.
@@ -752,7 +750,7 @@
remoteElem.appendChild(remoteParams);
}
root.appendChild(remoteElem);
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
catch(Exception e)
{
@@ -770,7 +768,7 @@
Hashtable<String, String> tableRemoteValues = new
Hashtable<String, String>();
Vector<Hashtable<String, String>> tableRemoteParams =
new Vector<Hashtable<String, String>>();
- Object[][] datas = this.reader.getRemoteList();
+ Object[][] datas = Settings.reader.getRemoteList();
boolean have = false;
Object[] objet = null;
@@ -783,7 +781,7 @@
if(have){ //then copy values
tableRemoteValues.put("name",
objet[0].toString() + " (Favorites copy)");
//Checking if they already have a named "name"
item into remote list.
- for(Object[] remote :
this.reader.getAlertList()){
+ for(Object[] remote :
Settings.reader.getAlertList()){
while(remote[0].toString().equalsIgnoreCase(tableRemoteValues.get("name"))){
//An item is already named
"name" then, rename.
String nam =
tableRemoteValues.get("name");
@@ -796,25 +794,25 @@
tableRemoteValues.put("type",
objet[1].toString());
if(objet[1].toString().equalsIgnoreCase("gadget")){
- if(this.reader.haveConfigRemoted(name)){
-
this.reader.getConfigRemoted(name);
- tableRemoteParams =
this.reader.getConfigRemoted(name);
+
if(Settings.reader.haveConfigRemoted(name)){
+
Settings.reader.getConfigRemoted(name);
+ tableRemoteParams =
Settings.reader.getConfigRemoted(name);
}
}
//Registering new "alert" entry.
- Node root =
reader.getDocument().getElementsByTagName("AlertList").item(0);
- Element remoteElem =
reader.getDocument().createElement("alert");
+ Node root =
Settings.reader.getDocument().getElementsByTagName("AlertList").item(0);
+ Element remoteElem =
Settings.reader.getDocument().createElement("alert");
remoteElem.setAttribute("name",
tableRemoteValues.get("name"));
remoteElem.setAttribute("author",
tableRemoteValues.get("author"));
remoteElem.setAttribute("path",
tableRemoteValues.get("path"));
remoteElem.setAttribute("type",
tableRemoteValues.get("type"));
//Setting default alert configuration.
-
this.setDefaultAlertConfig(reader.getDocument(), remoteElem);
+
this.setDefaultAlertConfig(Settings.reader.getDocument(), remoteElem);
if(tableRemoteParams.size() > 0){ //then they
have parameters.
- Element remoteParams =
reader.getDocument().createElement("Parameters");
+ Element remoteParams =
Settings.reader.getDocument().createElement("Parameters");
for(Hashtable<String, String> hash :
tableRemoteParams){
- Element parameter =
reader.getDocument().createElement("parameter");
+ Element parameter =
Settings.reader.getDocument().createElement("parameter");
parameter.setAttribute("name",
hash.get("name"));
parameter.setAttribute("value",
hash.get("value"));
//adding one parameter.
@@ -824,7 +822,7 @@
remoteElem.appendChild(remoteParams);
}
root.appendChild(remoteElem);
- this.registerChanges(reader.getDocument());
+
this.registerChanges(Settings.reader.getDocument());
}
}
catch(Exception e)
@@ -843,14 +841,14 @@
Hashtable<String, String> tableValues = new
Hashtable<String, String>();
Vector<Hashtable<String, String>> tableParams = new
Vector<Hashtable<String, String>>();
- NodeList node =
this.reader.getDocument().getElementsByTagName("alert");
- int index = this.reader.getIndexByUUID(uid);
+ NodeList node =
Settings.reader.getDocument().getElementsByTagName("alert");
+ int index = Settings.reader.getIndexByUUID(uid);
Element oneObjectDatas = (Element)node.item(index);
//processing to copy.
String name = oneObjectDatas.getAttribute("name");
//Checking for name
- for(Object[] obj : this.reader.getAlertList()){
+ for(Object[] obj : Settings.reader.getAlertList()){
while(obj[0].toString().equalsIgnoreCase(name)){
//An item is already named "name" then,
rename.
name += " (Alert copy)";
@@ -882,18 +880,18 @@
}
- Node root =
reader.getDocument().getElementsByTagName("AlertList").item(0);
- Element remoteElem =
reader.getDocument().createElement("alert");
+ Node root =
Settings.reader.getDocument().getElementsByTagName("AlertList").item(0);
+ Element remoteElem =
Settings.reader.getDocument().createElement("alert");
remoteElem.setAttribute("name",
tableValues.get("name"));
remoteElem.setAttribute("author",
tableValues.get("author"));
remoteElem.setAttribute("path",
tableValues.get("path"));
remoteElem.setAttribute("type",
tableValues.get("type"));
//Setting default alert configuration.
- this.setDefaultAlertConfig(reader.getDocument(),
remoteElem);
+
this.setDefaultAlertConfig(Settings.reader.getDocument(), remoteElem);
if(tableParams.size() > 0){ //then they have parameters.
- Element remoteParams =
reader.getDocument().createElement("Parameters");
+ Element remoteParams =
Settings.reader.getDocument().createElement("Parameters");
for(Hashtable<String, String> hash :
tableParams){
- Element parameter =
reader.getDocument().createElement("parameter");
+ Element parameter =
Settings.reader.getDocument().createElement("parameter");
parameter.setAttribute("name",
hash.get("name"));
parameter.setAttribute("value",
hash.get("value"));
//adding one parameter.
@@ -903,7 +901,7 @@
remoteElem.appendChild(remoteParams);
}
root.appendChild(remoteElem);
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
catch(Exception e)
{
@@ -921,7 +919,7 @@
Hashtable<String, String> tableValues = new
Hashtable<String, String>();
Vector<Hashtable<String, String>> tableParams = new
Vector<Hashtable<String, String>>();
- Object[][] datas = this.reader.getRemoteList();
+ Object[][] datas = Settings.reader.getRemoteList();
boolean have = false;
Object[] objet = null;
@@ -934,7 +932,7 @@
if(have){ //then copy values
tableValues.put("name", objet[0].toString() + "
(Favorites copy)");
//Checking if they already have a named "name"
item into remote list.
- for(Object[] remote :
this.reader.getRemoteList()){
+ for(Object[] remote :
Settings.reader.getRemoteList()){
while(remote[0].toString().equalsIgnoreCase(tableValues.get("name"))){
//An item is already named
"name" then, rename.
String nam =
tableValues.get("name");
@@ -947,24 +945,24 @@
tableValues.put("type", objet[1].toString());
if(objet[1].toString().equalsIgnoreCase("gadget")){
- if(this.reader.haveConfigRemoted(name)){
-
this.reader.getConfigRemoted(name);
- tableParams =
this.reader.getConfigRemoted(name);
+
if(Settings.reader.haveConfigRemoted(name)){
+
Settings.reader.getConfigRemoted(name);
+ tableParams =
Settings.reader.getConfigRemoted(name);
}
}
//Registering new "alert" entry.
- Node root =
reader.getDocument().getElementsByTagName("RemoteList").item(0);
- Element remoteElem =
reader.getDocument().createElement("remoted");
+ Node root =
Settings.reader.getDocument().getElementsByTagName("RemoteList").item(0);
+ Element remoteElem =
Settings.reader.getDocument().createElement("remoted");
remoteElem.setAttribute("name",
tableValues.get("name"));
remoteElem.setAttribute("author",
tableValues.get("author"));
remoteElem.setAttribute("path",
tableValues.get("path"));
remoteElem.setAttribute("type",
tableValues.get("type"));
//Setting default alert configuration.
if(tableParams.size() > 0){ //then they have
parameters.
- Element remoteParams =
reader.getDocument().createElement("Parameters");
+ Element remoteParams =
Settings.reader.getDocument().createElement("Parameters");
for(Hashtable<String, String> hash :
tableParams){
- Element parameter =
reader.getDocument().createElement("parameter");
+ Element parameter =
Settings.reader.getDocument().createElement("parameter");
parameter.setAttribute("name",
hash.get("name"));
parameter.setAttribute("value",
hash.get("value"));
//adding one parameter.
@@ -974,7 +972,7 @@
remoteElem.appendChild(remoteParams);
}
root.appendChild(remoteElem);
- this.registerChanges(reader.getDocument());
+
this.registerChanges(Settings.reader.getDocument());
}
}
catch(Exception e)
@@ -990,15 +988,15 @@
try
{
int index = 0;
- Node settings =
reader.getDocument().getElementsByTagName("settings").item(index);
+ Node settings =
Settings.reader.getDocument().getElementsByTagName("settings").item(index);
//Deleting old gadget parameters.
Element oneObjectDatas = (Element)settings;
- Element registery =
reader.getDocument().createElement("RegisteryLang");
+ Element registery =
Settings.reader.getDocument().createElement("RegisteryLang");
registery.setTextContent(LangUtils.getInstallerLanguage());
oneObjectDatas.appendChild(registery);
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
catch(Exception e)
{
@@ -1015,14 +1013,14 @@
CcCommons.logger.append("Registering locutors", true);
List<String> locutor = CcCommons.tux.tts.getVoices();
int index = 0;
- Node settings =
reader.getDocument().getElementsByTagName("settings").item(index);
+ Node settings =
Settings.reader.getDocument().getElementsByTagName("settings").item(index);
//Deleting old gadget parameters.
Element oneObjectDatas = (Element)settings;
Element voices;
- if(!reader.isVoicesTagCreated())
- voices =
reader.getDocument().createElement("InstalledLocutors");
+ if(!Settings.reader.isVoicesTagCreated())
+ voices =
Settings.reader.getDocument().createElement("InstalledLocutors");
else
voices =
(Element)oneObjectDatas.getElementsByTagName("InstalledLocutors").item(0);
@@ -1030,7 +1028,7 @@
voices.setTextContent(locutor.toString());
oneObjectDatas.appendChild(voices);
- this.registerChanges(reader.getDocument());
+ this.registerChanges(Settings.reader.getDocument());
}
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
