[Fudaa-svn-commit] SF.net SVN: fudaa:[6804] trunk/framework/ctulu-common/src/main/java/org/ fudaa/ctulu

[<de...@us...>]

Revision: 6804
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6804&view=rev
Author:   deniger
Date:     2011-12-06 21:19:03 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
modification mineure sur gestion des logs

Modified Paths:
--------------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java	2011-12-06 13:43:44 UTC (rev 6803)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java	2011-12-06 21:19:03 UTC (rev 6804)
@@ -3,7 +3,6 @@
 import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.ResourceBundle;
-import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
 import java.util.logging.SimpleFormatter;
 
@@ -99,6 +98,9 @@
   public synchronized String format(final LogRecord record) {
     final StringBuilder sb = new StringBuilder(256);
     if (printLevel) {
+      if(record.getLevel()==CtuluAnalyze.FATAL){
+        sb.append(CtuluResource.CTULU.getString("Erreur bloquante"));
+      }
       sb.append(record.getLevel().getLocalizedName());
       sb.append(": ");
     }

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java	2011-12-06 13:43:44 UTC (rev 6803)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java	2011-12-06 21:19:03 UTC (rev 6804)
@@ -47,7 +47,8 @@
     this.defaultResourceBundle = defaultResourceBundle;
   }
   ResourceBundle defaultResourceBundle;
-  private String desc = "Analyzing";
+  private String description = "Analyzing";
+  private String[] descriptionArgs = null;
   protected final List<CtuluLogRecord> logs = new ArrayList<CtuluLogRecord>();
   private String ressource;
 
@@ -334,7 +335,7 @@
    * @return la description de l'analyse en cours
    */
   public String getDesc() {
-    return desc;
+    return description;
   }
 
   /**
@@ -447,14 +448,18 @@
 
   public String getDesci18n() {
     if (defaultResourceBundle == null) {
-      return desc;
+      return description;
     }
     try {
-      return defaultResourceBundle.getString(desc);
+      final String i18n = defaultResourceBundle.getString(description);
+      if (descriptionArgs != null) {
+        return java.text.MessageFormat.format(i18n, descriptionArgs);
+      }
+      return i18n;
     } catch (MissingResourceException ex) {
       //do nothing...
     }
-    return desc;
+    return description;
   }
 
   /**
@@ -487,9 +492,17 @@
    * @param _string la nouvelle description de l'analyse
    */
   public void setDesc(final String _string) {
-    desc = _string;
+    description = _string;
   }
 
+  public String[] getDescriptionArgs() {
+    return descriptionArgs;
+  }
+
+  public void setDescriptionArgs(String[] descriptionArgs) {
+    this.descriptionArgs = descriptionArgs;
+  }
+
   /**
    * @param _string la nouvelle ressource de l'analyse
    */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.