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

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

Revision: 6565
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6565&view=rev
Author:   deniger
Date:     2011-10-23 20:51:15 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroup.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-10-23 20:12:53 UTC (rev 6564)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java	2011-10-23 20:51:15 UTC (rev 6565)
@@ -2,6 +2,7 @@
 
 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;
@@ -21,11 +22,25 @@
   }
 
   public CtuluDefaultLogFormatter() {
-  // EMPTY
+    // EMPTY
   }
-  
-  public String formatLogs(CtuluLogRecord log){
-    return "a faire";
+
+  public String formatLogs(CtuluLog log) {
+    if (log.isEmpty()) {
+      return CtuluLibString.EMPTY_STRING;
+    }
+    final StringBuilder res = new StringBuilder(40 + log.getRecords().size() * 40);
+    res.append(CtuluLibString.LINE_SEP);
+    if (log.getResource() != null) {
+      res.append(log.getResource());
+    }
+    for (final CtuluLogRecord logRecord : log.getRecords()) {
+      if (res.length() > 0) {
+        res.append(CtuluLibString.LINE_SEP);
+      }
+      res.append(DEFAULT.format(logRecord,log.getDefaultResourceBundle()));
+    }
+    return res.toString();
   }
 
   /**
@@ -33,7 +48,9 @@
    * @return la string contenant le tout
    */
   public static String format(final CtuluAnalyze logAnalyse) {
-    if (logAnalyse.logs == null) { return CtuluLibString.EMPTY_STRING; }
+    if (logAnalyse.logs == null) {
+      return CtuluLibString.EMPTY_STRING;
+    }
     final StringBuilder res = new StringBuilder(40 + logAnalyse.logs.size() * 40);
     res.append(CtuluLibString.LINE_SEP);
     if (logAnalyse.getResource() != null) {
@@ -53,22 +70,27 @@
    * @return la string contenant le tout
    */
   public static String format(final Collection<LogRecord> logs) {
-    if (logs == null) { return CtuluLibString.EMPTY_STRING; }
+    if (logs == null) {
+      return CtuluLibString.EMPTY_STRING;
+    }
     final StringBuilder res = new StringBuilder(10 + logs.size() * 40);
     for (final LogRecord logRecord : logs) {
       res.append('\n').append(DEFAULT.format(logRecord));
     }
     return res.toString();
   }
+
   /**
    * @param logs l'analyse a formater
    * @return la string contenant le tout
    */
-  public static String formatLogs(final Collection<CtuluLogRecord> logs) {
-    if (logs == null) { return CtuluLibString.EMPTY_STRING; }
+  public static String formatLogs(final Collection<CtuluLogRecord> logs,ResourceBundle resourceBundle) {
+    if (logs == null) {
+      return CtuluLibString.EMPTY_STRING;
+    }
     final StringBuilder res = new StringBuilder(10 + logs.size() * 40);
     for (final CtuluLogRecord logRecord : logs) {
-      res.append('\n').append(DEFAULT.formatLogs(logRecord));
+      res.append('\n').append(DEFAULT.format(logRecord,resourceBundle));
     }
     return res.toString();
   }
@@ -84,6 +106,16 @@
     return sb.toString();
   }
 
+  public synchronized String format(final CtuluLogRecord record, ResourceBundle resourceBundle) {
+    final StringBuilder sb = new StringBuilder(256);
+    if (printLevel) {
+      sb.append(record.getLevel());
+      sb.append(": ");
+    }
+    sb.append(formatMessage(record,resourceBundle));
+    return sb.toString();
+  }
+
   @Override
   public synchronized String formatMessage(final LogRecord record) {
     String format = record.getMessage();
@@ -120,4 +152,39 @@
     }
     return format;
   }
+
+  public synchronized String formatMessage(final CtuluLogRecord record, ResourceBundle catalog) {
+    String format = record.getMsg();
+    if (catalog != null) {
+      // // We cache catalog lookups. This is mostly to avoid the
+      // // cost of exceptions for keys that are not in the catalog.
+      // if (catalogCache == null) {
+      // catalogCache = new HashMap();
+      // }
+      // format = (String)catalogCache.get(record.essage);
+      // if (format == null) {
+      try {
+        format = catalog.getString(format);
+      } catch (final java.util.MissingResourceException ex) {
+        // Drop through. Use record message as format
+        format = record.getMsg();
+      }
+      // catalogCache.put(record.message, format);
+      // }
+    }
+    // Do the formatting.
+    try {
+      final Object parameters[] = record.getArgs();
+      if (parameters == null || parameters.length == 0) {
+        // No parameters. Just return format string.
+        return format;
+      }
+      format = MessageFormat.format(format, parameters);
+    } catch (final Exception ex) {
+      ex.printStackTrace();
+      // Formatting failed: use localized format string.
+
+    }
+    return format;
+  }
 }

Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroup.java
===================================================================
--- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroup.java	2011-10-23 20:12:53 UTC (rev 6564)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroup.java	2011-10-23 20:51:15 UTC (rev 6565)
@@ -40,6 +40,9 @@
   }
 
   public void addGroup(CtuluLogGroup logGroup) {
+    if(groups==null){
+      groups=new ArrayList<CtuluLogGroup>();
+    }
     groups.add(logGroup);
   }
 

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