Author: jerome
Date: 2009-02-12 10:41:48 +0100 (Thu, 12 Feb 2009)
New Revision: 3616
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/AttitunesFunctions.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/FileUtils.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/Logger.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/MoveWindowThread.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/OnlineViewer.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/functions.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/image.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LangUtils.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Settings.java
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/swing/JBrowser.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/TuxLanguagesMenu.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/tools/ToolTipSubMenu.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/tools/TuxAutoUpdater.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxisalive/attitunes/format/ATTFormatCompressor.java
Log:
* Added comments for packages "Utils".
* Updated Typo.
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcCommons.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -145,6 +145,5 @@
Locutors.add("celia");
Locutors.add("erik");
Locutors.add("emma");
- logger.appendDone();
}
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/AttitunesFunctions.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/AttitunesFunctions.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/AttitunesFunctions.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -41,6 +41,7 @@
public class AttitunesFunctions {
+ //Hashtable containing all availables attitunes.
public static Hashtable<String, Hashtable<String, Object>> attitunes =
new Hashtable<String, Hashtable<String, Object>>();
protected static boolean log = true;
@@ -51,12 +52,12 @@
* @param ExtractPath : Extract path target.
* @return The attitune xml description as File.
*/
- public static File unzipAttitune(File file, String directory_name){
+ public static File unzipAttitune(File file, String directory_name)
+ {
try
{
ZIP new_zip_file = new ZIP(file,
CcCommons.AttTempDirectory);
- new_zip_file.uncompress();
- CcCommons.logger.appendDone();
+ new_zip_file.uncompress();
return new
File(CcCommons.AttTempDirectory.getAbsolutePath() + File.separator
+ directory_name +
File.separator +"scene.xml");
}
@@ -70,15 +71,19 @@
/**
* This function return the xml description of an attitune.
* @param location : attitune location as File.
- * @return Attitunes datas as String array. (String[]).
+ * @return Attitunes datas as Hashtable<String, Object.
*/
- public static Hashtable<String, Object> getAttitunesXmlDetail(File
location){
+ public static Hashtable<String, Object> getAttitunesXmlDetail(File
location)
+ {
Hashtable<String, Object> attitune = new Hashtable<String,
Object>();
- try{
+ try
+ {
if(log)
- CcCommons.logger.append("Getting " +
location.getName() + " attitune informations", true);
+ {
+ CcCommons.logger.append("Getting " +
location.getName() + " attitune informations", true);
+ }
DocumentBuilderFactory fact =
DocumentBuilderFactory.newInstance();
DocumentBuilder builder = fact.newDocumentBuilder();
Document doc = builder.parse(location);
@@ -117,19 +122,22 @@
NodeList nodeList = timeLine.getChildNodes();
Vector<String> speakers = new Vector<String>();
String speaker = "";
- for(int i=0; i < nodeList.getLength(); i++){
+ for(int i=0; i < nodeList.getLength(); i++)
+ {
NodeList node = nodeList.item(i).getChildNodes();
if(node.item(0).getNodeName().equals("speaker"))
+ {
speaker = node.item(0).getTextContent();
+ }
- if(speaker != ""){
+ if(speaker != "")
+ {
speakers.add(speaker);
speaker = "";
}
}
- attitune.put("speakers", speakers);
- CcCommons.logger.appendDone();
+ attitune.put("speakers", speakers);
return attitune;
}
catch(ParserConfigurationException pce){}
@@ -145,19 +153,25 @@
* @param ExtractPath extract path ( target directory )
* @return Informations as Object [] that can be used in a table.
*/
- private static Hashtable<String, Object> getAttituneInfo(File
newAttitune){
+ private static Hashtable<String, Object> getAttituneInfo(File
newAttitune)
+ {
if(log)
+ {
CcCommons.logger.append("Asking for attitune info ",
true);
+ }
Hashtable<String, Object> attitune = new Hashtable<String,
Object>();
- if (newAttitune.isFile()) {
+ if (newAttitune.isFile())
+ {
//getting uncompresed values.
String name = newAttitune.getName().substring(0,
newAttitune.getName().length() - 4);
File uncompressed_location =
AttitunesFunctions.unzipAttitune(newAttitune, name);
- if (uncompressed_location.getName() !=
CcCommons.AttTempDirectory.getName()){
+ if (uncompressed_location.getName() !=
CcCommons.AttTempDirectory.getName())
+ {
//registering values.
- try{
-
- if(uncompressed_location.exists()){
+ try
+ {
+ if(uncompressed_location.exists())
+ {
//Get attitune informations.
attitune =
AttitunesFunctions.getAttitunesXmlDetail(uncompressed_location);
@@ -165,26 +179,31 @@
//Registering static reference.
if(!AttitunesFunctions.attitunes.containsKey(attitune.get("name")))
+ {
if(AttitunesFunctions.isValidAttitune(attitune))
+ {
AttitunesFunctions.attitunes.put(attitune.get("name").toString(), attitune);
+ }
+ }
}
- }
+ }
catch(Exception except){}
}
- }
- CcCommons.logger.appendDone();
+ }
return attitune;
}
- /**
+ /**
+ * Return specified attitune informations.
* @param newAttitune
* @param AttituneDirectory
* @param ExtractPath
- * @return
+ * @return attitune information as Hashtable<String, Object>.
*/
- public static Hashtable<String, Object> getSpecificAttituneInfo(File
newAttitune){
+ public static Hashtable<String, Object> getSpecificAttituneInfo(File
newAttitune)
+ {
File newFile = new
File(CcCommons.MyTuxAttitunesDirectory.getAbsolutePath()
+
File.separator + newAttitune.getName());
return AttitunesFunctions.getAttituneInfo(newFile);
@@ -198,9 +217,11 @@
* @param ExtractPath
* @return
*/
- public static Hashtable<String, Hashtable<String, Object>>
getAttitunesInfos(Vector<String> attitunes){
+ public static Hashtable<String, Hashtable<String, Object>>
getAttitunesInfos(Vector<String> attitunes)
+ {
- for (String str : attitunes){
+ for (String str : attitunes)
+ {
//Get infos by attitune.
File temp = new
File(CcCommons.MyTuxAttitunesDirectory.getAbsolutePath() + File.separator + str
+ ".att");
AttitunesFunctions.getAttituneInfo(temp);
@@ -212,9 +233,12 @@
@SuppressWarnings("unchecked")
- public static boolean isValidAttitune(Hashtable<String, Object>
attitune){
+ public static boolean isValidAttitune(Hashtable<String, Object>
attitune)
+ {
if(log)
+ {
CcCommons.logger.append("Check attitune validity ",
true);
+ }
Vector<String> speakers;
Vector<String> availablesLocutors = new Vector<String>();
Vector<Boolean> values = new Vector<Boolean>();
@@ -223,58 +247,76 @@
speakers = (Vector<String>)attitune.get("speakers");
if(speakers.size() <= 0)
+ {
return true; //then it's an attitune that has no
languages set.
-
+ }
if(flatLocutors == null)
+ {
return true;
-
+ }
//Replacing ok occurencies.
for(String str : flatLocutors)
+ {
availablesLocutors.add(str.replace("8k",
"").toLowerCase());
-
+ }
//Checking languages.
- for(String str : speakers){
+ for(String str : speakers)
+ {
String registeredSpeaker =
CcCommons.Locutors.get(Integer.valueOf(str).intValue() - 1);
- for(String string : availablesLocutors){
+ for(String string : availablesLocutors)
+ {
if(string.equalsIgnoreCase(registeredSpeaker))
+ {
values.add(Boolean.TRUE);
+ }
else
+ {
values.add(Boolean.FALSE);
+ }
}
}
-
- CcCommons.logger.appendDone();
for(Boolean value : values)
+ {
if(value.equals(Boolean.TRUE))
+ {
return true;
-
+ }
+ }
return false;
}
/**
* Getting attitunes in specified directory.
- * @param repertoire
- * @return
+ * @return a vector containing all attitunes paths into attitunes
directory.
*/
- public static Vector<String> getAttitunesDirectory(){
+ public static Vector<String> getAttitunesDirectory()
+ {
if(log)
+ {
CcCommons.logger.append("Listing attitunes directory ",
true);
+ }
AttitunesFunctions.attitunes = new Hashtable<String,
Hashtable<String, Object>>();
Vector<String> attitunes = new Vector<String>();
String [] listeFichiers =
CcCommons.MyTuxAttitunesDirectory.list();
- for(String str : listeFichiers){
- if(str.endsWith(".att")){
+ for(String str : listeFichiers)
+ {
+ if(str.endsWith(".att"))
+ {
attitunes.add(str.substring(0, str.length() -
4));
}
- }
- CcCommons.logger.appendDone();
+ }
return attitunes;
}
- public synchronized static boolean checkForUpdate(){
+ /**
+ * Check if they have an added/removed attitunes into directory.
+ * @return true if something new.
+ */
+ public synchronized static boolean checkForUpdate()
+ {
//Register attitunes size.
int attitunesLen = AttitunesFunctions.attitunes.size();
//Getting new infos.
@@ -283,18 +325,20 @@
AttitunesFunctions.getAttitunesInfos(dat);
log = true;
- try {
+ try
+ {
Thread.sleep((long)1.0);
- } catch (InterruptedException e) {
+ }
+ catch (InterruptedException e)
+ {
CcCommons.logger.appendError(e.getStackTrace());
e.printStackTrace();
}
- CcCommons.logger.appendDone();
-
if(attitunesLen != AttitunesFunctions.attitunes.size())
+ {
return true;
-
+ }
return false;
}
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/FileUtils.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/FileUtils.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/FileUtils.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -5,48 +5,84 @@
import com.tuxdroid.cc.CcCommons;
public class FileUtils {
- public static void copy(final InputStream inStream, final OutputStream
outStream, final int bufferSize) throws IOException {
+ /**
+ * Copy a stream from specified input to specified output.
+ * @param inStream : input stream.
+ * @param outStream : output stream.
+ * @param bufferSize : buffer size.
+ * @throws IOException
+ */
+ public static void copy(final InputStream inStream, final OutputStream
outStream, final int bufferSize) throws IOException
+ {
final byte[] buffer = new byte[bufferSize];
int nbRead;
- while ((nbRead = inStream.read(buffer)) != -1) {
+ while ((nbRead = inStream.read(buffer)) != -1)
+ {
outStream.write(buffer, 0, nbRead);
}
}
- public static void copyDirectory(final File from, final File to) throws
IOException {
+ /**
+ * Copy a complete directory.
+ * @param from : source directory.
+ * @param to : destination directory.
+ * @throws IOException
+ */
+ public static void copyDirectory(final File from, final File to) throws
IOException
+ {
CcCommons.logger.append("Copying directory " +
from.getAbsolutePath(), true);
- if (! to.exists()) {
+ if (! to.exists())
+ {
to.mkdir();
}
final File[] inDir = from.listFiles();
- for (int i = 0; i < inDir.length; i++) {
+ for (int i = 0; i < inDir.length; i++)
+ {
final File file = inDir[i];
copy(file, new File(to, file.getName()));
}
- CcCommons.logger.appendDone();
}
- public static void copyFile(final File from, final File to) throws
IOException {
+ /**
+ * Copy a file to another file.
+ * @param from : source file.
+ * @param to : target file.
+ * @throws IOException
+ */
+ public static void copyFile(final File from, final File to) throws
IOException
+ {
CcCommons.logger.append("Copying file " +
from.getAbsolutePath(), true);
final InputStream inStream = new FileInputStream(from);
final OutputStream outStream = new FileOutputStream(to);
- if (from.length() > 0){
+ if (from.length() > 0)
+ {
copy(inStream, outStream, (int) Math.min(from.length(),
4*1024));
}
inStream.close();
outStream.close();
- CcCommons.logger.appendDone();
}
- public static void copy(final File from, final File to) throws
IOException {
- if (from.isFile()) {
+ /**
+ * Copy a file or a directory to the destination file.
+ * @param from : source file.
+ * @param to : destination/output file.
+ * @throws IOException
+ */
+ public static void copy(final File from, final File to) throws
IOException
+ {
+ if (from.isFile())
+ {
copyFile(from, to);
- } else if (from.isDirectory()){
+ }
+ else if (from.isDirectory())
+ {
copyDirectory(from, to);
- } else {
+ }
+ else
+ {
CcCommons.logger.append("Copying " +
from.getAbsolutePath(), true);
throw new FileNotFoundException(from.toString() + "
does not exist" );
}
@@ -54,7 +90,7 @@
/**
- * Delete a directory.
+ * Delete a directory, if they have files into, they will be deleted
too.
* @param target ==> remove target directory.
*/
public static void deleteDirectory(File target)
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/Logger.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/Logger.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/Logger.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -33,21 +33,26 @@
/** Log file **/
private File log = new
File(CcCommons.TuxDroidSettingsDirectory.getAbsolutePath() + File.separator +
"TuxDroidLog.txt");
-
private Object mutex = new Object();
+ /**
+ * Create a simple logger object that write his logs in a file.
+ */
public Logger()
{
+ //Create base directory is it doesn't exists.
if(!CcCommons.TuxDroidSettingsDirectory.exists())
{
CcCommons.TuxDroidSettingsDirectory.mkdirs();
}
+
//Deleting file if exists to be sure to have the latests logs.
if(log.exists())
{
log.delete();
}
+ //Create a new log file and write header.
try
{
log.createNewFile();
@@ -60,7 +65,7 @@
/**
- * Append log file.
+ * Append a text in the log file.
* @param text : text to log.
* @param goToNextLine : go to the line.
*/
@@ -75,32 +80,26 @@
}
-
/**
- * Append " --->> DONE " to the log file.
- */
- public void appendDone()
- {
- return; //Not for now.
- }
-
-
- /**
* Append " -->> ERROR " to the log file.
+ * @param errorMsg : Stack trace element or null.
*/
public void appendError(StackTraceElement[] errorMsg)
{
- append(" -->> ERROR -> ");
- for(StackTraceElement errorElement : errorMsg)
+ append(" -->> ERROR ");
+ if(errorMsg != null)
{
- append("\n" + errorElement.toString());
+ for(StackTraceElement errorElement : errorMsg)
+ {
+ append("\n" + errorElement.toString());
+ }
}
}
/**
* Return the log time.
- * @return
+ * @return a string representing the current formated time
*/
private String getTime()
{
@@ -111,7 +110,7 @@
/**
- * Add some string to the log file.
+ * Add a string to the log file.
* @param text
*/
private void append(String text)
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/MoveWindowThread.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/MoveWindowThread.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/MoveWindowThread.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -41,7 +41,7 @@
/***
* This Runnable Thread allow to move on a frame.
- * @param e : Triggered event.
+ * @param mouseEvent : Triggered event.
*/
public MoveWindowThread(MouseEvent mouseEvent)
{
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/OnlineViewer.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/OnlineViewer.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/OnlineViewer.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -36,7 +36,6 @@
public void display(){
CcCommons.logger.append("Starting native web browser ", true);
BareBonesBrowserLaunch.openURL(url);
- CcCommons.logger.appendDone();
}
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/functions.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/functions.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/functions.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -31,7 +31,8 @@
* This procedure sets a normal cursor.
* @param component : target component.
*/
- public static void setNormalCursor(JComponent component){
+ public static void setNormalCursor(JComponent component)
+ {
component.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}
@@ -39,7 +40,8 @@
* This procedure sets a "hand" cursor.
* @param component: target component.
*/
- public static void setHandCursor(JComponent component){
+ public static void setHandCursor(JComponent component)
+ {
component.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
}
@@ -47,7 +49,8 @@
* This procedure sets a "width resize" cursor.
* @param component : target component.
*/
- public static void setWidthResizeCursor(JComponent component){
+ public static void setWidthResizeCursor(JComponent component)
+ {
component.setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR));
}
@@ -55,7 +58,8 @@
* This procedure sets a "height resize" cursor.
* @param component : target component.
*/
- public static void setHeightResizeCursor(JComponent component){
+ public static void setHeightResizeCursor(JComponent component)
+ {
component.setCursor(Cursor.getPredefinedCursor(Cursor.S_RESIZE_CURSOR));
}
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/image.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/image.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/image.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -32,12 +32,13 @@
* This function resize an Image passed in parameter ( new height and
with
* will be given in parameter.
*
- * @param source
- * @param width
- * @param height
+ * @param source : source image.
+ * @param width : max width.
+ * @param height : max height.
* @return a buffered resized image.
*/
- public static Image ImgResize(Image source, int width, int height) {
+ public static Image ImgResize(Image source, int width, int height)
+ {
BufferedImage buf = new BufferedImage(width, height,
BufferedImage.TYPE_INT_ARGB);
Graphics2D g = buf.createGraphics();
g.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
RenderingHints.VALUE_INTERPOLATION_BILINEAR);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/IUUIDChecker.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -113,7 +113,6 @@
BufferedWriter out = new BufferedWriter(new
FileWriter(IUUIDFile));
out.write(String.format("IUUID=%s", IUUID));
out.close();
- CcCommons.logger.appendDone();
}
catch (IOException e)
{
@@ -155,7 +154,6 @@
try
{
FileUtils.copyDirectory(from, to);
- CcCommons.logger.appendDone();
}
catch (IOException e)
{
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LangUtils.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LangUtils.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/LangUtils.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -40,7 +40,6 @@
CcCommons.logger.append("Getting installed language", true);
if(SystemInformation.isUnix()){
String language = Locale.getDefault().getLanguage();
- CcCommons.logger.appendDone();
return language;
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Settings.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Settings.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/Settings.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -58,7 +58,6 @@
{
CcCommons.logger.append("Creating settings directory",
true);
CcCommons.TuxDroidSettingsDirectory.mkdirs();
- CcCommons.logger.appendDone();
}
//Create file if doesn't exists.
@@ -68,8 +67,7 @@
CcCommons.logger.append("Creating setting.xml
file", true);
CcCommons.TuxDroidSettingsDirectory.mkdirs();
CcCommons.TuxDroidSettingsFile.createNewFile();
- this.newXmlFile = true;
- CcCommons.logger.appendDone();
+ this.newXmlFile = true;
}
catch (IOException e)
{
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-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/settings/XMLReader.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -94,7 +94,6 @@
DocumentBuilderFactory fact =
DocumentBuilderFactory.newInstance();
DocumentBuilder builder = fact.newDocumentBuilder();
- CcCommons.logger.appendDone();
Document doc = null;
try
{
@@ -157,7 +156,6 @@
CcCommons.logger.append("Getting language from settings
file", true);
Node node =
this.getDocument().getElementsByTagName("lang").item(0);
lang = node.getChildNodes().item(0).getNodeValue();
- CcCommons.logger.appendDone();
}
catch(Exception e)
{
@@ -177,7 +175,6 @@
CcCommons.logger.append("Getting pitch from settings
file", true);
Node node =
this.getDocument().getElementsByTagName("pitch").item(0);
pitch = node.getChildNodes().item(0).getNodeValue();
- CcCommons.logger.appendDone();
}
catch(Exception e)
{
@@ -205,7 +202,6 @@
CcCommons.logger.append("Getting country from settings
file", true);
Node node =
document.getElementsByTagName("country").item(0);
country = node.getChildNodes().item(0).getNodeValue();
- CcCommons.logger.appendDone();
}
catch(Exception e)
{
@@ -226,7 +222,6 @@
CcCommons.logger.append("Getting speaker from settings
file", true);
Node node =
document.getElementsByTagName("speaker").item(0);
speaker = node.getTextContent();
- CcCommons.logger.appendDone();
}
catch(Exception e)
{
@@ -247,7 +242,6 @@
CcCommons.logger.append("Gettin IP from settings file",
true);
Node node = document.getElementsByTagName("ip").item(0);
ipadress = node.getTextContent();
- CcCommons.logger.appendDone();
}
catch(Exception e)
{
@@ -284,7 +278,6 @@
datas[i] = liste;
}
- CcCommons.logger.appendDone();
return datas;
}
catch(Exception e)
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JBrowser.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -240,7 +240,6 @@
else{
winBrowser.GoTo(url);
}
- CcCommons.logger.appendDone();
}
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/JConsole.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -92,8 +92,7 @@
calendar.setTime(new Date());
int h = calendar.get(Calendar.HOUR_OF_DAY);
int m = calendar.get(Calendar.MINUTE);
- CcCommons.logger.append(" [" + h +":" + m + "] "+value + "\n",
true);
- CcCommons.logger.appendDone();
+ CcCommons.logger.append(" [" + h +":" + m + "] "+value + "\n",
true);
this.area.append(" [" + h +":" + m + "] "+value + "\n");
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/TuxLanguagesMenu.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/TuxLanguagesMenu.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/swing/TuxLanguagesMenu.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -60,7 +60,6 @@
this.getAvailablesLang();
this.getInterfaceMenu();
this.getLocutorsMenus();
- CcCommons.logger.appendDone();
}
public static void prepareLocutors(){
@@ -87,7 +86,6 @@
locutors.put("nl", nl);
locutors.put("es", sp);
//locutors.put("it", it);
- CcCommons.logger.appendDone();
}
/** Gets languages **/
@@ -107,7 +105,6 @@
for(File f : this.languages){
interfaceLanguages.add(f.getName());
}
- CcCommons.logger.appendDone();
}
catch(Exception except)
{
@@ -171,8 +168,6 @@
}
}
- CcCommons.logger.appendDone();
-
return true;
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/tools/ToolTipSubMenu.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/tools/ToolTipSubMenu.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/tools/ToolTipSubMenu.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -71,7 +71,6 @@
CcCommons.tux.attitune.stop();
CcCommons.differAlertsStartup = true;
this.run();
- CcCommons.logger.appendDone();
}
}
@@ -109,7 +108,6 @@
p.waitFor();
CcCommons.isFrameworkBusy = false;
CcCommons.differAlertsStartup = false;
- CcCommons.logger.appendDone();
}
catch (IOException e)
{
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/tools/TuxAutoUpdater.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/tools/TuxAutoUpdater.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/tools/TuxAutoUpdater.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -40,7 +40,6 @@
Process p = Runtime.getRuntime().exec(cmd);
InputStream stdOut = p.getInputStream();
new TuxUpdateWindow(stdOut);
- CcCommons.logger.appendDone();
}catch (IOException e)
{
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxisalive/attitunes/format/ATTFormatCompressor.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxisalive/attitunes/format/ATTFormatCompressor.java
2009-02-12 09:05:02 UTC (rev 3615)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxisalive/attitunes/format/ATTFormatCompressor.java
2009-02-12 09:41:48 UTC (rev 3616)
@@ -46,7 +46,6 @@
zos = new ZipOutputStream(new FileOutputStream(new
File(attFilePath)));
recurseFiles(file, sourcePath);
zos.close();
- CcCommons.logger.appendDone();
}
catch (Exception e)
{
@@ -105,7 +104,6 @@
}
}
zis.close();
- CcCommons.logger.appendDone();
}
catch (Exception e)
{
------------------------------------------------------------------------------
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
