Author: jerome
Date: 2008-12-17 11:12:34 +0100 (Wed, 17 Dec 2008)
New Revision: 3147
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_en_US.properties
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_fr_FR.properties
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_nl_NL.properties
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Messages.java
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Settings.java
Log:
* Fixed encoding problem.
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_en_US.properties
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_en_US.properties
2008-12-17 10:10:51 UTC (rev 3146)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_en_US.properties
2008-12-17 10:12:34 UTC (rev 3147)
@@ -11,3 +11,4 @@
unexcpectedFileFormat=Error: this file is not a gadget or attitune.
frmeworkNotifictionError= has reported an error.
softwareUpdate=Several gadgets, attitunes or tools have been updated.\nPlease
wait. The Control Center is implementing the new updates.
+corruptedSettings=Your settings.xml file is corrupted and cannot be
removed.\nPlease locate it at \n%s\nand delete the file manually
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
2008-12-17 10:10:51 UTC (rev 3146)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_es_ES.properties
2008-12-17 10:12:34 UTC (rev 3147)
@@ -11,3 +11,4 @@
unexcpectedFileFormat=Error: este fichero no es un gadget o un attitune.
frmeworkNotifictionError= a notificado un error.
softwareUpdate=Some gadget, attitunes or tools have been updated.\nPlease wait
until Control center get new softwares.
+corruptedSettings=Your settings.xml file is corrupted and cannot be
removed.\nPlease locate it at \n%s\nand delete the file manually
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_fr_FR.properties
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_fr_FR.properties
2008-12-17 10:10:51 UTC (rev 3146)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_fr_FR.properties
2008-12-17 10:12:34 UTC (rev 3147)
@@ -11,3 +11,4 @@
unexcpectedFileFormat=Erreur, ce fichier n'est ni un gadget, ni une attitune.
frmeworkNotifictionError= � report� une erreur
softwareUpdate=Quelques gadgets, attitunes ou tools ont �t� mis � jour.\n S'il
vous plait, attendez que le Centre de Controle les r�cup�re.
+corruptedSettings=Votre fichier settings.xml est corrompu et ne peut �tre
supprim�.\nS'il vous plait trouvez le � \n%s\net supprimez ce fichier
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_nl_NL.properties
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_nl_NL.properties
2008-12-17 10:10:51 UTC (rev 3146)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/LanguagesSet/messages_nl_NL.properties
2008-12-17 10:12:34 UTC (rev 3147)
@@ -11,3 +11,4 @@
unexcpectedFileFormat=Foutmelding: Dit bestand is geen gadget of attitune.
frmeworkNotifictionError= heeft een probleem gemeld.
softwareUpdate=Enkele gadgets, attitunes of tools werden geupdate.\n De
Control Center is deze nu aan het implementeren. Dit kan even duren...
+corruptedSettings=Je settings.xml bestand is corrupt en kan niet worden
verwijderd.\nGelieve het bestand op de volgende locatie handmatig te
verwijderen : \n%s
Modified:
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Messages.java
===================================================================
---
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Messages.java
2008-12-17 10:10:51 UTC (rev 3146)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Messages.java
2008-12-17 10:12:34 UTC (rev 3147)
@@ -119,5 +119,11 @@
public String getSoftwareUpdateMessage()
{
return this.get("softwareUpdate", "Update in progress.");
+ }
+
+
+ public String getCorruptedSettingsMessage()
+ {
+ return this.get("corruptedSettings", "Settings file was
corrupted");
}
}
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-17 10:10:51 UTC (rev 3146)
+++
software_suite_v2/software/control_center/branches/new_paths/control_center/sources/com/tuxdroid/cc/settings/Settings.java
2008-12-17 10:12:34 UTC (rev 3147)
@@ -33,6 +33,8 @@
import java.util.Locale;
import java.util.Vector;
+import javax.swing.JOptionPane;
+
import com.kysoh.tuxdroid.gadget.framework.container.GadgetInstance;
import com.kysoh.tuxdroid.gadget.framework.container.GadgetInstanceParameters;
import com.tuxdroid.cc.CcCommons;
@@ -245,11 +247,27 @@
}
catch(OutOfMemoryError tooBad)
{
+
+ if(CcCommons.language == null)
+ {
+ CcCommons.language = new Languages(Locale.getDefault());
+ }
+
+ String message =
String.format(CcCommons.language.messages.getCorruptedSettingsMessage(),
+
CcCommons.TuxDroidSettingsFile.getAbsolutePath()
+ );
+ JOptionPane.showMessageDialog( null, message,
+
CcCommons.language.getTitle(),
+
JOptionPane.ERROR_MESSAGE
+ );
pw.close();
br.close();
ops.close();
dest.delete();
- tooBad.printStackTrace();
+ CcCommons.logger.append("Settings file error: deleting faild",
true);
+ CcCommons.logger.appendError(tooBad.getStackTrace());
+
+ System.exit(-1);
return;
}
------------------------------------------------------------------------------
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
