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

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

Revision: 7800
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7800&view=rev
Author:   deniger
Date:     2012-10-24 22:13:52 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------


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

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	2012-10-24 16:06:08 UTC (rev 7799)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java	2012-10-24 22:13:52 UTC (rev 7800)
@@ -35,6 +35,14 @@
   public CtuluLog() {
     super();
   }
+  
+  public void updateLocalizedMessage(ResourceBundle resourceBundle) {
+    if (logs != null) {
+      for (CtuluLogRecord ctuluLogRecord : logs) {
+        CtuluLogRecord.updateLocalizedMessage(ctuluLogRecord, resourceBundle);
+      }
+    }
+  }
 
   /**
    * Constructeur precisant le resourceBundle a utiliser
@@ -212,7 +220,7 @@
     logs.add(o);
     return o;
   }
-
+  
   public void addRecord(CtuluLogRecord record) {
     if (record != null) {
       logs.add(record);
@@ -265,7 +273,7 @@
   public void clear() {
     logs.clear();
   }
-
+  
   public boolean containsErrorOrSevereError() {
     return containsErrors() || containsSevereError();
   }
@@ -290,7 +298,7 @@
   public boolean containsInfos() {
     return containsLevel(CtuluLogLevel.INFO);
   }
-
+  
   public int getNbOccurence(CtuluLogLevel level) {
     int count = 0;
     for (final CtuluLogRecord log : logs) {
@@ -299,7 +307,7 @@
       }
     }
     return count;
-
+    
   }
 
   /**
@@ -356,7 +364,7 @@
   public String getResume() {
     return getDesc() + "\n" + CtuluDefaultLogFormatter.formatLogs(logs, getDefaultResourceBundle());
   }
-
+  
   public String getSevereError() {
     CtuluLogRecord log = getFirstOfLevel(CtuluLogLevel.SEVERE);
     return log == null ? null : CtuluDefaultLogFormatter.DEFAULT.format(log, getDefaultResourceBundle());
@@ -381,7 +389,7 @@
   public boolean isEmpty() {
     return logs.isEmpty();
   }
-
+  
   public boolean isNotEmpty() {
     return !isEmpty();
   }
@@ -443,7 +451,7 @@
   public void manageExceptionFromFile(final Exception _e, final String msg, final int line) {
     addRecord(CtuluLogLevel.ERROR, msg, line).setThrown(_e);
   }
-
+  
   public String getDesci18n() {
     if (defaultResourceBundle == null) {
       return description;
@@ -506,11 +514,11 @@
   public void setDesc(final String _string) {
     description = _string;
   }
-
+  
   public String[] getDescriptionArgs() {
     return descriptionArgs;
   }
-
+  
   public void setDescriptionArgs(String... descriptionArgs) {
     this.descriptionArgs = descriptionArgs;
   }

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogRecord.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogRecord.java	2012-10-24 16:06:08 UTC (rev 7799)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogRecord.java	2012-10-24 22:13:52 UTC (rev 7800)
@@ -1,9 +1,37 @@
 package org.fudaa.ctulu;
 
+import java.text.MessageFormat;
 import java.util.Date;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 
 public class CtuluLogRecord {
 
+  public static void updateLocalizedMessage(CtuluLogRecord record, ResourceBundle resourceBundle) {
+    final Object[] args = record.getArgs();
+    String msg = null;
+    if (resourceBundle != null) {
+      try {
+        msg = resourceBundle.getString(record.getMsg());
+      } catch (MissingResourceException e) {
+        msg = record.getMsg();
+      }
+      if (!ArrayUtils.isEmpty(args)) {
+        msg = MessageFormat.format(msg, args);
+      }
+    }
+    if (msg == null) {
+      if (!ArrayUtils.isEmpty(args)) {
+        msg = record.getMsg() + " " + StringUtils.join(args);
+      } else {
+        msg = record.getMsg();
+      }
+    }
+    record.setLocalizedMessage(msg);
+  }
+
   private Object[] args;
   private CtuluLogLevel level;
   private String levelDetail;

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