[Fudaa-svn-commit] SF.net SVN: fudaa:[6914] trunk/framework

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

Revision: 6914
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6914&view=rev
Author:   deniger
Date:     2012-01-06 02:03:53 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java
    trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt
    trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluAnalyzeGUI.java
    trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesCommonEditorPanel.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	2012-01-06 02:01:49 UTC (rev 6913)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java	2012-01-06 02:03:53 UTC (rev 6914)
@@ -34,8 +34,8 @@
       res.append(log.getResource());
       res.append(CtuluLibString.LINE_SEP);
     }
-    String desc=log.getDesci18n();
-    if(desc!=null){
+    String desc = log.getDesci18n();
+    if (desc != null) {
       res.append(desc);
       res.append(CtuluLibString.LINE_SEP);
     }
@@ -43,10 +43,10 @@
       if (res.length() > 0) {
         res.append(CtuluLibString.LINE_SEP);
       }
-      if(log.getDefaultResourceBundle()==null){
-        res.append(DEFAULT.format(logRecord,log.getDefaultResourceBundle()));
+      if (log.getDefaultResourceBundle() == null) {
+        res.append(DEFAULT.format(logRecord, log.getDefaultResourceBundle()));
       }
-      res.append(DEFAULT.format(logRecord,log.getDefaultResourceBundle()));
+      res.append(DEFAULT.format(logRecord, log.getDefaultResourceBundle()));
     }
     return res.toString();
   }
@@ -92,13 +92,13 @@
    * @param logs l'analyse a formater
    * @return la string contenant le tout
    */
-  public static String formatLogs(final Collection<CtuluLogRecord> logs,ResourceBundle resourceBundle) {
+  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.format(logRecord,resourceBundle));
+      res.append('\n').append(DEFAULT.format(logRecord, resourceBundle));
     }
     return res.toString();
   }
@@ -107,10 +107,11 @@
   public synchronized String format(final LogRecord record) {
     final StringBuilder sb = new StringBuilder(256);
     if (printLevel) {
-      if(record.getLevel()==CtuluAnalyze.FATAL){
+      if (record.getLevel() == CtuluAnalyze.FATAL) {
         sb.append(CtuluResource.CTULU.getString("Erreur bloquante"));
+      } else {
+        sb.append(record.getLevel().getLocalizedName());
       }
-      sb.append(record.getLevel().getLocalizedName());
       sb.append(": ");
     }
     sb.append(formatMessage(record));
@@ -123,7 +124,7 @@
       sb.append(record.getLevel());
       sb.append(": ");
     }
-    sb.append(formatMessage(record,resourceBundle));
+    sb.append(formatMessage(record, resourceBundle));
     return sb.toString();
   }
 
@@ -131,7 +132,7 @@
   public synchronized String formatMessage(final LogRecord record) {
     String format = record.getMessage();
     final java.util.ResourceBundle catalog = record.getResourceBundle();
-    if(catalog==null){
+    if (catalog == null) {
       return format;
     }
     if (catalog != null) {

Modified: trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt
===================================================================
--- trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt	2012-01-06 02:01:49 UTC (rev 6913)
+++ trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt	2012-01-06 02:03:53 UTC (rev 6914)
@@ -75,6 +75,7 @@
 Erreur lors de la lecture du fichier= Error while reading the file
 Erreur \xE0 l'ex\xE9cution=Execution error
 Erreur=Error
+Information=Information
 Erreurs rencontr\xE9es=Errors occurred
 Erreurs=Errors
 Etape {0}=Step {0}

Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluAnalyzeGUI.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluAnalyzeGUI.java	2012-01-06 02:01:49 UTC (rev 6913)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluAnalyzeGUI.java	2012-01-06 02:03:53 UTC (rev 6914)
@@ -30,6 +30,7 @@
 import org.fudaa.ctulu.CtuluAnalyze;
 import org.fudaa.ctulu.CtuluAnalyzeGroup;
 import org.fudaa.ctulu.CtuluDefaultLogFormatter;
+import org.fudaa.ctulu.CtuluLib;
 import org.fudaa.ctulu.CtuluLibImage;
 import org.fudaa.ctulu.CtuluLibString;
 import org.fudaa.ctulu.CtuluResource;
@@ -282,12 +283,12 @@
         return replacer;
       }
       if (level == Level.SEVERE) {
-        return "Erreur";
+        return CtuluLib.getS("Erreur");
       }
       if (level == Level.WARNING) {
-        return "Avertissement";
+        return CtuluLib.getS("Avertissement");
       }
-      return "Info";
+      return CtuluLib.getS("Information");
     }
 
     @Override

Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesCommonEditorPanel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesCommonEditorPanel.java	2012-01-06 02:01:49 UTC (rev 6913)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluValuesCommonEditorPanel.java	2012-01-06 02:03:53 UTC (rev 6914)
@@ -163,7 +163,7 @@
       pnAttrs.add(lbs_[i]);
       pnAttrs.add(comps_[i]);
     }
-    setLayout(new BorderLayout());
+    setLayout(new BorderLayout(5,5));
     add(pnAttrs);
   }
   

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