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

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

Revision: 8365
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8365&view=rev
Author:   deniger
Date:     2013-03-29 00:21:50 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
Occupation m?\195?\169moire + vitesse

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	2013-03-29 00:21:19 UTC (rev 8364)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java	2013-03-29 00:21:50 UTC (rev 8365)
@@ -191,6 +191,9 @@
 
   public synchronized String formatMessage(final CtuluLogRecord record, ResourceBundle catalog) {
     String format = record.getMsg();
+    if (format == null) {
+      return format;
+    }
     if (catalog != null) {
       // // We cache catalog lookups. This is mostly to avoid the
       // // cost of exceptions for keys that are not in the catalog.

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	2013-03-29 00:21:19 UTC (rev 8364)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java	2013-03-29 00:21:50 UTC (rev 8365)
@@ -29,6 +29,15 @@
  */
 public class CtuluLog {
 
+  ResourceBundle defaultResourceBundle;
+  private String description = "Analyzing";
+  private String[] descriptionArgs = null;
+  protected final List<CtuluLogRecord> logs = new ArrayList<CtuluLogRecord>();
+  protected final List<CtuluLogRecord> logsExt = Collections.unmodifiableList(logs);
+  private String ressource;
+  private boolean containsSevereError;
+  private boolean containsError;
+
   /**
    * Constructeur par defaut
    */
@@ -36,6 +45,16 @@
     super();
   }
 
+  /**
+   * Constructeur precisant le resourceBundle a utiliser
+   *
+   * @param defaultResourceBundle
+   */
+  public CtuluLog(final ResourceBundle defaultResourceBundle) {
+    super();
+    this.defaultResourceBundle = defaultResourceBundle;
+  }
+
   public void updateLocalizedMessage(ResourceBundle resourceBundle) {
     if (logs != null) {
       for (CtuluLogRecord ctuluLogRecord : logs) {
@@ -60,22 +79,6 @@
   }
 
   /**
-   * Constructeur precisant le resourceBundle a utiliser
-   *
-   * @param defaultResourceBundle
-   */
-  public CtuluLog(final ResourceBundle defaultResourceBundle) {
-    super();
-    this.defaultResourceBundle = defaultResourceBundle;
-  }
-  ResourceBundle defaultResourceBundle;
-  private String description = "Analyzing";
-  private String[] descriptionArgs = null;
-  protected final List<CtuluLogRecord> logs = new ArrayList<CtuluLogRecord>();
-  protected final List<CtuluLogRecord> logsExt = Collections.unmodifiableList(logs);
-  private String ressource;
-
-  /**
    * @param msg le message
    */
   public void addError(final String msg) {
@@ -231,6 +234,7 @@
    */
   public CtuluLogRecord addRecord(final CtuluLogLevel level, final String msg, Object... data) {
     final CtuluLogRecord o = new CtuluLogRecord(level, msg);
+    updatePrivateFlags(level);
     o.setArgs(data);
     logs.add(o);
     return o;
@@ -238,6 +242,7 @@
 
   public void addRecord(CtuluLogRecord record) {
     if (record != null) {
+      updatePrivateFlags(record.getLevel());
       logs.add(record);
     }
   }
@@ -261,7 +266,6 @@
    * @param msg le message d'avertissement
    * @param args les arguments supplementaires
    */
-  // public void addWarn(final String msg, final Map<String, Object> args) {
   public CtuluLogRecord addWarn(final String msg, final Object... args) {
     return addRecord(CtuluLogLevel.WARNING, msg, args);
   }
@@ -287,6 +291,8 @@
    */
   public void clear() {
     logs.clear();
+    containsSevereError = false;
+    containsError = false;
   }
 
   public boolean containsErrorOrSevereError() {
@@ -297,14 +303,15 @@
    * @return true si contient au moins une erreur
    */
   public boolean containsErrors() {
-    return containsLevel(CtuluLogLevel.ERROR);
+    return containsError;
   }
 
   /**
    * @return true si contient une erreur fatale
    */
   public boolean containsSevereError() {
-    return containsLevel(CtuluLogLevel.SEVERE);
+    //otpimisation
+    return containsSevereError;
   }
 
   /**
@@ -330,7 +337,9 @@
    * @return true si au moins un message et de niveau l.
    */
   public boolean containsLevel(final CtuluLogLevel l) {
-    for (final CtuluLogRecord log : logs) {
+    int nb = logs.size();
+    for (int i = 0; i < nb; i++) {
+      final CtuluLogRecord log = logs.get(i);
       if (l.equals(log.getLevel())) {
         return true;
       }
@@ -497,6 +506,7 @@
     setDefaultResourceBundle(_analyze.getDefaultResourceBundle());
     setResource(_analyze.getResource());
     logs.addAll(_analyze.logs);
+    updatePrivateFlags(_analyze);
   }
 
   /**
@@ -506,6 +516,7 @@
   public void addAllLogRecord(final CtuluLog logToCopyFrom) {
     if (logToCopyFrom != null) {
       logs.addAll(logToCopyFrom.logs);
+      updatePrivateFlags(logToCopyFrom);
     }
   }
 
@@ -544,4 +555,21 @@
   public void setResource(final String _string) {
     ressource = _string;
   }
+
+  private void updatePrivateFlags(final CtuluLogLevel level) {
+    if (CtuluLogLevel.SEVERE.equals(level)) {
+      containsSevereError = true;
+    } else if (CtuluLogLevel.ERROR.equals(level)) {
+      containsError = true;
+    }
+  }
+
+  private void updatePrivateFlags(final CtuluLog _analyze) {
+    if (_analyze.containsError) {
+      containsError = true;
+    }
+    if (_analyze.containsSevereError) {
+      containsSevereError = true;
+    }
+  }
 }

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