Author: jerome
Date: 2008-12-14 13:06:06 +0100 (Sun, 14 Dec 2008)
New Revision: 3109
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
Log:
* Removed unneeded xml objects.
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:52:08 UTC (rev 3108)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLWriter.java
2008-12-14 12:06:06 UTC (rev 3109)
@@ -193,12 +193,11 @@
*/
public void writeLocale(String lang, String country){
CcCommons.logger.append("Writing locale", true);
- Document document = reader.getDocument();
- Node langn = document.getElementsByTagName("lang").item(0);
+ Node langn =
reader.getDocument().getElementsByTagName("lang").item(0);
langn.getChildNodes().item(0).setNodeValue(lang);
- Node countryn =
document.getElementsByTagName("country").item(0);
+ Node countryn =
reader.getDocument().getElementsByTagName("country").item(0);
countryn.getChildNodes().item(0).setNodeValue(country);
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
@@ -208,10 +207,9 @@
*/
public void writeSpeaker(String speaker){
CcCommons.logger.append("Writing speaker", true);
- Document document = reader.getDocument();
- Node speak = document.getElementsByTagName("speaker").item(0);
+ Node speak =
reader.getDocument().getElementsByTagName("speaker").item(0);
speak.getChildNodes().item(0).setNodeValue(speaker);
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
@@ -220,10 +218,9 @@
*/
public void writePitch(int pitchValue){
CcCommons.logger.append("Writing pitch", true);
- Document document = reader.getDocument();
- Node pitch = document.getElementsByTagName("pitch").item(0);
+ Node pitch =
reader.getDocument().getElementsByTagName("pitch").item(0);
pitch.getChildNodes().item(0).setNodeValue(String.valueOf(pitchValue));
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
@@ -233,11 +230,10 @@
*/
public void writeIP(String ip){
CcCommons.logger.append("Writing ip", true);
- Document document = reader.getDocument();
- Node ipadress = document.getElementsByTagName("ip").item(0);
+ Node ipadress =
reader.getDocument().getElementsByTagName("ip").item(0);
if(ip != ""){
ipadress.getChildNodes().item(0).setNodeValue(ip);
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
}
@@ -250,10 +246,9 @@
private synchronized void saveToPlaylist(Object[] datas, String
TagName, String newTagName, Object[] config){
CcCommons.logger.append("Saving to playlist: " + TagName, true);
locked = true;
- Document document = reader.getDocument();
- Node attElem = document.getElementsByTagName(TagName).item(0);
+ Node attElem =
reader.getDocument().getElementsByTagName(TagName).item(0);
//Create base element.
- Element newElem = document.createElement(newTagName);
+ Element newElem =
reader.getDocument().createElement(newTagName);
//Adding attitunes attributes.
newElem.setAttribute("name", datas[0].toString());
newElem.setAttribute("type", datas[1].toString());
@@ -269,10 +264,10 @@
if(newTagName.equals("alert")){
if (config == null){
- this.setDefaultAlertConfig(document, newElem);
+
this.setDefaultAlertConfig(reader.getDocument(), newElem);
}
}
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
locked = false;
}
@@ -305,8 +300,7 @@
*/
private void removeFromList(String TagName, Object[] datas){
CcCommons.logger.append("Removing " + datas[0].toString() + "
from playlist " + TagName, true);
- Document document = reader.getDocument();
- NodeList node = document.getElementsByTagName(TagName);
+ NodeList node =
reader.getDocument().getElementsByTagName(TagName);
for(int i=0; i < node.getLength() ; i++){
Node oneObjectDatas = node.item(i);
@@ -316,21 +310,19 @@
node.item(i).getParentNode().removeChild(oneObjectDatas);
}
}
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
public boolean haveItems(String itemName){
- Document document = reader.getDocument();
- NodeList node = document.getElementsByTagName(itemName);
+ NodeList node =
reader.getDocument().getElementsByTagName(itemName);
return !(node.getLength() <= 0);
}
private void setUnInitializedPlaylist(String playlist){
- Document document = reader.getDocument();
- Node node = document.getElementsByTagName(playlist).item(0);
+ Node node =
reader.getDocument().getElementsByTagName(playlist).item(0);
node.getAttributes().getNamedItem("initialized").setTextContent("false");
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
public void removeFromRemoteList(Object[] datas){
@@ -351,10 +343,9 @@
public void writeAlertConfiguration(int index, Object[] config){
CcCommons.logger.append("Writing basic alert configuration",
true);
- Document document = reader.getDocument();
- Node attElem =
document.getElementsByTagName("alert").item(index);
+ Node attElem =
reader.getDocument().getElementsByTagName("alert").item(index);
//Create new configuration.
- Element attConf = document.createElement("configuration");
+ Element attConf =
reader.getDocument().createElement("configuration");
attConf.setAttribute("type", config[0].toString());
attConf.setAttribute("hours", config[1].toString());
attConf.setAttribute("minutes", config[2].toString());
@@ -372,23 +363,22 @@
attElem.appendChild(attConf);
//write changes.
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
public void registerGadgetParameters(String uid,
GadgetInstanceParameters parameters,
GadgetObject gadget){
CcCommons.logger.append("Registering alert gadget parameters ("
+ gadget.getName() + ")", true);
- Document document = reader.getDocument();
int index = this.reader.getIndexByUUID(uid);
- Node attElem =
document.getElementsByTagName("alert").item(index);
+ Node attElem =
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 = document.createElement("Parameters");
+ Element parametersElem =
reader.getDocument().createElement("Parameters");
attElem.appendChild(parametersElem);
for(GadgetParameter param : gadget.getGadget().getParameters()){
@@ -397,14 +387,14 @@
String value = parameters.get(param);
//Create new configuration.
- Element Conf =
document.createElement("parameter");
+ Element Conf =
reader.getDocument().createElement("parameter");
Conf.setAttribute("name", name);
Conf.setAttribute("value", value);
parametersElem.appendChild(Conf);
//write changes.
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
}
}
@@ -412,8 +402,7 @@
public void setRemoteName(String oldName, String newName){
CcCommons.logger.append("Changing favorite name of " + oldName
+ " for : " + newName, true);
- Document document = reader.getDocument();
- NodeList node = document.getElementsByTagName("remoted");
+ NodeList node =
reader.getDocument().getElementsByTagName("remoted");
for(int i=0; i < node.getLength() ; i++){
Node oneObjectDatas = node.item(i);
@@ -422,13 +411,12 @@
oneObjectDatas.getAttributes().getNamedItem("name").setTextContent(newName);
}
}
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
public void setAlertName(String oldName, String newName){
CcCommons.logger.append("Changing alert name of " + oldName + "
for : " + newName, true);
- Document document = reader.getDocument();
- NodeList node = document.getElementsByTagName("alert");
+ NodeList node =
reader.getDocument().getElementsByTagName("alert");
for(int i=0; i < node.getLength() ; i++){
Node oneObjectDatas = node.item(i);
@@ -437,15 +425,14 @@
oneObjectDatas.getAttributes().getNamedItem("name").setTextContent(newName);
}
}
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
public void registerRemotedGadgetParameters(String name,
GadgetInstanceParameters parameters,
GadgetObject gadget){
CcCommons.logger.append("Registering favorites gadget
parameters (" + gadget.getName() + ")", true);
- Document document = reader.getDocument();
- NodeList attElem = document.getElementsByTagName("remoted");
+ NodeList attElem =
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();
@@ -461,7 +448,7 @@
}
//Adding news parameters.
- Element parametersElem =
document.createElement("Parameters");
+ Element parametersElem =
reader.getDocument().createElement("Parameters");
att.appendChild(parametersElem);
for(GadgetParameter param :
gadget.getGadget().getParameters()){
@@ -469,14 +456,14 @@
String value = parameters.get(param);
//Create new configuration.
- Element Conf =
document.createElement("parameter");
+ Element Conf =
reader.getDocument().createElement("parameter");
Conf.setAttribute("name", pname);
Conf.setAttribute("value", value);
parametersElem.appendChild(Conf);
}
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
}
}
@@ -532,18 +519,17 @@
}
}
//Registering new "alert" entry.
- Document doc = this.reader.getDocument();
- Node root = doc.getElementsByTagName("RemoteList").item(0);
- Element remoteElem = doc.createElement("remoted");
+ Node root =
reader.getDocument().getElementsByTagName("RemoteList").item(0);
+ Element remoteElem =
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 = doc.createElement("Parameters");
+ Element remoteParams =
reader.getDocument().createElement("Parameters");
for(Hashtable<String, String> hash :
tableAlertParameters){
- Element parameter =
doc.createElement("parameter");
+ Element parameter =
reader.getDocument().createElement("parameter");
parameter.setAttribute("name",
hash.get("name"));
parameter.setAttribute("value",
hash.get("value"));
//adding one parameter.
@@ -553,7 +539,7 @@
remoteElem.appendChild(remoteParams);
}
root.appendChild(remoteElem);
- this.registerChanges(doc);
+ this.registerChanges(reader.getDocument());
}
@@ -595,19 +581,18 @@
}
//Registering new "alert" entry.
- Document doc = this.reader.getDocument();
- Node root =
doc.getElementsByTagName("AlertList").item(0);
- Element remoteElem = doc.createElement("alert");
+ Node root =
reader.getDocument().getElementsByTagName("AlertList").item(0);
+ Element remoteElem =
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(doc, remoteElem);
+ this.setDefaultAlertConfig(reader.getDocument(),
remoteElem);
if(tableRemoteParams.size() > 0){ //then they have
parameters.
- Element remoteParams =
doc.createElement("Parameters");
+ Element remoteParams =
reader.getDocument().createElement("Parameters");
for(Hashtable<String, String> hash :
tableRemoteParams){
- Element parameter =
doc.createElement("parameter");
+ Element parameter =
reader.getDocument().createElement("parameter");
parameter.setAttribute("name",
hash.get("name"));
parameter.setAttribute("value",
hash.get("value"));
//adding one parameter.
@@ -617,7 +602,7 @@
remoteElem.appendChild(remoteParams);
}
root.appendChild(remoteElem);
- this.registerChanges(doc);
+ this.registerChanges(reader.getDocument());
}
}
@@ -670,19 +655,18 @@
except.printStackTrace();
}
- Document doc = this.reader.getDocument();
- Node root = doc.getElementsByTagName("AlertList").item(0);
- Element remoteElem = doc.createElement("alert");
+ Node root =
reader.getDocument().getElementsByTagName("AlertList").item(0);
+ Element remoteElem =
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(doc, remoteElem);
+ this.setDefaultAlertConfig(reader.getDocument(), remoteElem);
if(tableParams.size() > 0){ //then they have parameters.
- Element remoteParams = doc.createElement("Parameters");
+ Element remoteParams =
reader.getDocument().createElement("Parameters");
for(Hashtable<String, String> hash : tableParams){
- Element parameter =
doc.createElement("parameter");
+ Element parameter =
reader.getDocument().createElement("parameter");
parameter.setAttribute("name",
hash.get("name"));
parameter.setAttribute("value",
hash.get("value"));
//adding one parameter.
@@ -692,7 +676,7 @@
remoteElem.appendChild(remoteParams);
}
root.appendChild(remoteElem);
- this.registerChanges(doc);
+ this.registerChanges(reader.getDocument());
}
@@ -734,18 +718,17 @@
}
//Registering new "alert" entry.
- Document doc = this.reader.getDocument();
- Node root =
doc.getElementsByTagName("RemoteList").item(0);
- Element remoteElem = doc.createElement("remoted");
+ Node root =
reader.getDocument().getElementsByTagName("RemoteList").item(0);
+ Element remoteElem =
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 =
doc.createElement("Parameters");
+ Element remoteParams =
reader.getDocument().createElement("Parameters");
for(Hashtable<String, String> hash :
tableParams){
- Element parameter =
doc.createElement("parameter");
+ Element parameter =
reader.getDocument().createElement("parameter");
parameter.setAttribute("name",
hash.get("name"));
parameter.setAttribute("value",
hash.get("value"));
//adding one parameter.
@@ -755,39 +738,37 @@
remoteElem.appendChild(remoteParams);
}
root.appendChild(remoteElem);
- this.registerChanges(doc);
+ this.registerChanges(reader.getDocument());
}
}
public void createRegisteryEntry(){
- Document document = reader.getDocument();
int index = 0;
- Node settings =
document.getElementsByTagName("settings").item(index);
+ Node settings =
reader.getDocument().getElementsByTagName("settings").item(index);
//Deleting old gadget parameters.
Element oneObjectDatas = (Element)settings;
- Element registery = document.createElement("RegisteryLang");
+ Element registery =
reader.getDocument().createElement("RegisteryLang");
registery.setTextContent(LangUtils.getInstallerLanguage());
oneObjectDatas.appendChild(registery);
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
public void registerLocutors(){
CcCommons.logger.append("Registering locutors", true);
List<String> locutor = CcCommons.tux.tts.getVoices();
- Document document = reader.getDocument();
int index = 0;
- Node settings =
document.getElementsByTagName("settings").item(index);
+ Node settings =
reader.getDocument().getElementsByTagName("settings").item(index);
//Deleting old gadget parameters.
Element oneObjectDatas = (Element)settings;
Element voices;
if(!reader.isVoicesTagCreated())
- voices = document.createElement("InstalledLocutors");
+ voices =
reader.getDocument().createElement("InstalledLocutors");
else
voices =
(Element)oneObjectDatas.getElementsByTagName("InstalledLocutors").item(0);
@@ -795,6 +776,6 @@
voices.setTextContent(locutor.toString());
oneObjectDatas.appendChild(voices);
- this.registerChanges(document);
+ this.registerChanges(reader.getDocument());
}
}
------------------------------------------------------------------------------
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
