Author: jerome
Date: 2008-12-12 14:50:05 +0100 (Fri, 12 Dec 2008)
New Revision: 3071
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/.classpath
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/cc_main.java
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Utils/Logger.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/swing/TuxLanguagesMenu.java
Log:
* Added log when playing attitune and an error occured.
* Added control center version to the log file.
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/.classpath
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/.classpath
2008-12-12 13:01:06 UTC (rev 3070)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/.classpath
2008-12-12 13:50:05 UTC (rev 3071)
@@ -1,16 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="sources"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/TuxAPI"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/karmalab-commons"/>
- <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/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"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/TuxAPI"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/karmalab-commons"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-framework"/>
+ <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_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="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/tuxdroid-java-api-0.1.jar"/>
+ <classpathentry kind="lib" path="C:/Program
Files/Kysoh/Tuxdroid/softwares/control_center/deps/jdic.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/cc_main.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/cc_main.java
2008-12-12 13:01:06 UTC (rev 3070)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/cc_main.java
2008-12-12 13:50:05 UTC (rev 3071)
@@ -249,6 +249,7 @@
}
CcCommons.language = new
Languages(CcCommons.settings.getLocale());
+
CcCommons.logger.append(CcCommons.language.getCcVersion(), true);
//Checking if new update detected.
IUUIDChecker uidChecker = new IUUIDChecker();
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
2008-12-12 13:01:06 UTC (rev 3070)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
2008-12-12 13:50:05 UTC (rev 3071)
@@ -276,6 +276,7 @@
}
if(!(attPath == null)){
+ CcCommons.logger.append("Trying to play
attitune", true);
CcCommons.isFrameworkBusy = true;
if (CcCommons.tux.server.getConnected())
{
@@ -299,11 +300,20 @@
}
attPath =
attPath.replace(" ", "%20");
-
CcCommons.tux.attitune.load(attPath);
+ boolean loaded =
CcCommons.tux.attitune.load(attPath);
- //Trying to play
attitune.
- test =
CcCommons.tux.attitune.play();
- if(!test){ //if error
playing
+ if(!loaded)
+ {
+
CcCommons.logger.append("Server cannot load: " + attPath, true);
+ test = false;
+ }
+ else
+ {
+ //Trying to
play attitune.
+ test =
CcCommons.tux.attitune.play();
+ }
+ if(!test){ //if error
playing
+
CcCommons.logger.append("Server cannot play this attitunes", true);
String message
= CcCommons.language.messages.getAttituneReadErrorMessage();
if(this.showErrorMessages)
JOptionPane.showMessageDialog(this.jTable, message,
@@ -320,7 +330,8 @@
thread.start();
}
}
- else{
+ else{
+
CcCommons.logger.append("Radio doesn't seem to be connected", true);
String message =
CcCommons.language.messages.getRadioErrorMessage();
if(this.showErrorMessages)
JOptionPane.showMessageDialog(this.jTable, message,
@@ -331,7 +342,8 @@
return -1;
}
}
- else{
+ else{
+ CcCommons.logger.append("The
fish doesn't seem to be connected", true);
String message =
CcCommons.language.messages.getDongleErrorMessage();
if(this.showErrorMessages)
JOptionPane.showMessageDialog(this.jTable, message,
@@ -342,7 +354,8 @@
return -1;
}
}
- else{
+ else{
+ CcCommons.logger.append("Cannot connect
to the TuxDroid server. Please, make sure it is started and try again", true);
String message =
CcCommons.language.messages.getServerErrorMessage();
if(this.showErrorMessages)
JOptionPane.showMessageDialog(this.jTable, message, paneTitle,
@@ -354,7 +367,8 @@
}
}
- else{
+ else{
+ CcCommons.logger.append("Cannot found attitune
at index", true);
String message =
CcCommons.language.messages.getIndexError();
if(this.showErrorMessages)
JOptionPane.showMessageDialog(this.jTable, message, paneTitle,
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
2008-12-12 13:01:06 UTC (rev 3070)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
2008-12-12 13:50:05 UTC (rev 3071)
@@ -247,6 +247,7 @@
}
if(!(path == null)){
+ CcCommons.logger.append("Trying to play attitune",
true);
if (CcCommons.tux.server.getConnected())
{
CcCommons.tux.dongle.waitConnected(2.0);
@@ -269,9 +270,20 @@
}
path = path.replace(" ", "%20");
-
CcCommons.tux.attitune.load(path);
-
if(!(CcCommons.tux.attitune.play())){
-
+ boolean loaded =
CcCommons.tux.attitune.load(path);
+ boolean test = false;
+ if(!loaded)
+ {
+
CcCommons.logger.append("Server cannot load: " + path, true);
+ test = false;
+ }
+ else
+ {
+ //Trying to play
attitune.
+ test =
CcCommons.tux.attitune.play();
+ }
+ if(!test){
+
CcCommons.logger.append("Server cannot play this attitunes", true);
String message =
CcCommons.language.messages.getAttituneReadErrorMessage();
JOptionPane.showMessageDialog(modele.jTable, message,
paneTitle, JOptionPane.ERROR_MESSAGE);
@@ -285,6 +297,7 @@
thread.start();
}
else{
+ CcCommons.logger.append("Radio
doesn't seem to be connected", true);
String message =
CcCommons.language.messages.getRadioErrorMessage();
JOptionPane.showMessageDialog(modele.jTable, message,
paneTitle,
JOptionPane.ERROR_MESSAGE);
@@ -292,6 +305,7 @@
}
}
else{
+ CcCommons.logger.append("The fish
doesn't seem to be connected", true);
String message =
CcCommons.language.messages.getDongleErrorMessage();
JOptionPane.showMessageDialog(modele.jTable, message,
paneTitle,
JOptionPane.ERROR_MESSAGE);
@@ -299,6 +313,7 @@
}
}
else{
+ CcCommons.logger.append("Cannot connect to the
TuxDroid server. Please, make sure it is started and try again", true);
String message =
CcCommons.language.messages.getServerErrorMessage();
JOptionPane.showMessageDialog(modele.jTable,
message, paneTitle,
JOptionPane.ERROR_MESSAGE);
@@ -307,6 +322,7 @@
}
else{
+ CcCommons.logger.append("Cannot found attitune at
index", true);
String message =
CcCommons.language.messages.getIndexError();
JOptionPane.showMessageDialog(modele.jTable, message,
paneTitle,
JOptionPane.ERROR_MESSAGE);
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Utils/Logger.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Utils/Logger.java
2008-12-12 13:01:06 UTC (rev 3070)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/Utils/Logger.java
2008-12-12 13:50:05 UTC (rev 3071)
@@ -51,7 +51,7 @@
log.createNewFile();
this.append("Control Center log file");
- this.append("\n-----------------------------");
+ this.append("\n--------------------------------------");
}
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-12 13:01:06 UTC (rev 3070)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
2008-12-12 13:50:05 UTC (rev 3071)
@@ -676,7 +676,6 @@
return retour;
}
catch(Exception excep){
- CcCommons.logger.appendError(excep.getStackTrace());
return null;
}
}
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/TuxLanguagesMenu.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/TuxLanguagesMenu.java
2008-12-12 13:01:06 UTC (rev 3070)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/swing/TuxLanguagesMenu.java
2008-12-12 13:50:05 UTC (rev 3071)
@@ -88,7 +88,7 @@
/** Gets languages **/
private void getAvailablesLang(){
- CcCommons.logger.append("Getting availables languages", true);
+ CcCommons.logger.append("Getting availables languages for
'Locutors' menu", true);
try
{
this.languages = new File[]{
------------------------------------------------------------------------------
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
