Author: jerome
Date: 2008-08-17 16:03:38 +0200 (Sun, 17 Aug 2008)
New Revision: 1540
Added:
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/META-INF/
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/META-INF/MANIFEST.MF
Modified:
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/ConfInterface.java
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/IniFile.java
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/IniWriter.java
Log:
* ChatterTux modification are now also available.
* Reset Chatter Tux server to let changes immediately take effect.
Added:
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/META-INF/MANIFEST.MF
===================================================================
---
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/META-INF/MANIFEST.MF
(rev 0)
+++
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/META-INF/MANIFEST.MF
2008-08-17 14:03:38 UTC (rev 1540)
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Class-Path: ./looks-2.1.4.jar
+Main-Class: ct_main
+
Modified:
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/ConfInterface.java
===================================================================
---
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/ConfInterface.java
2008-08-17 13:29:31 UTC (rev 1539)
+++
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/ConfInterface.java
2008-08-17 14:03:38 UTC (rev 1540)
@@ -524,6 +524,13 @@
//TODO store modifications.
public void storeModificationsToIni(String key){
String action = this.actionType.getSelectedItem().toString();
+ if(action.equals("Tux TTS")){
+ action = "tts";
+ }
+ else if(action.equals("Tux movement")){
+ action = "api";
+ }
+
String command = "";
if(this.ttsSet.isVisible()){ //then tts parameter.
command = this.ttsSet.getText();
@@ -534,8 +541,8 @@
command = this.revertParsedCommand(command);
}
Vector<String> values = new Vector<String>();
- values.add(action);
- values.add(command);
+ values.add("action = " + action);
+ values.add("cmd = " + command);
this.writer.modify(key, values);
this.properties.updateHashTable(this.ini.getHashtable());
this.updateValues();
Modified:
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/IniFile.java
===================================================================
---
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/IniFile.java
2008-08-17 13:29:31 UTC (rev 1539)
+++
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/IniFile.java
2008-08-17 14:03:38 UTC (rev 1540)
@@ -93,6 +93,7 @@
* @return
*/
public Vector<String> getKeyPropertiesAtIndex(int index){
+ System.out.println("Indexes size: " + this.indexes.size());
String key = this.indexes.get(index).toString();
return (Vector<String>)this.keys.get(key);
}
@@ -135,6 +136,7 @@
public void add(String key, Vector<String> values){
this.keys.put(key, values);
+ System.out.println("Given index: " +
Integer.valueOf(this.keys.size()));
this.indexes.put(Integer.valueOf(this.keys.size()), key);
}
Modified:
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/IniWriter.java
===================================================================
---
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/IniWriter.java
2008-08-17 13:29:31 UTC (rev 1539)
+++
software_suite_v2/software/tools/chatterTux/trunk/Chatter_tux/src/IniWriter.java
2008-08-17 14:03:38 UTC (rev 1540)
@@ -51,20 +51,24 @@
public void delete(String key) throws Exception{
ini.remove(key);
this.write();
+ ChatterTuxServer.reset();
}
public void modify(String key, Vector<String> datas){
try {
- this.delete(key);
- this.add(key, datas);
+ this.ini.getHashtable().put(key, datas);
+ this.write();
} catch (Exception e) {
e.printStackTrace();
}
+ ChatterTuxServer.reset();
}
public void add(String keyName, Vector<String> datas){
- this.ini.add(keyName, datas);
+ System.out.println("Adding \n -------------------------");
+ //this.ini(keyName, datas);
this.write();
+ ChatterTuxServer.reset();
}
@@ -82,12 +86,11 @@
System.out.println("File error"); //TODO displaying
errorBox instead.
return false;
}
-
- for(int i=0; i < this.ini.getLength(); i++){
+ for(int i=0; i < this.ini.getHashtable().size(); i++){
try {
+ System.out.println("hashtable size: " +
this.ini.getHashtable().size());
this.writer.write("[" +
this.ini.getKeyAtIndex(i) + "]\n");
- Vector<String> dat =
this.ini.getKeyPropertiesAtKey(this.ini.getKeyAtIndex(i));
- System.out.println(dat);
+ Vector<String> dat =
this.ini.getKeyPropertiesAtIndex(i);
this.writer.write(dat.firstElement() + "\n");
this.writer.write(dat.lastElement() + "\n");
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn