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

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

Revision: 7177
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7177&view=rev
Author:   deniger
Date:     2012-05-10 06:39:49 +0000 (Thu, 10 May 2012)
Log Message:
-----------
otfa batch

Modified Paths:
--------------
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java
    trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroup.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-05-10 06:17:09 UTC (rev 7176)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLog.java	2012-05-10 06:39:49 UTC (rev 7177)
@@ -15,7 +15,6 @@
 import java.io.IOException;
 import java.io.LineNumberReader;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.MissingResourceException;
@@ -449,6 +448,9 @@
     if (defaultResourceBundle == null) {
       return description;
     }
+    if (description == null) {
+      return CtuluLibString.EMPTY_STRING;
+    }
     try {
       final String i18n = defaultResourceBundle.getString(description);
       if (descriptionArgs != null) {
@@ -468,6 +470,7 @@
    */
   public void merge(final CtuluLog _analyze) {
     setDesc(_analyze.getDesc());
+    setDescriptionArgs(_analyze.getDescriptionArgs());
     setDefaultResourceBundle(_analyze.getDefaultResourceBundle());
     setResource(_analyze.getResource());
     logs.addAll(_analyze.logs);
@@ -519,4 +522,4 @@
   public void setResource(final String _string) {
     ressource = _string;
   }
-}
\ No newline at end of file
+}

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	2012-05-10 06:17:09 UTC (rev 7176)
+++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/CtuluLogGroup.java	2012-05-10 06:39:49 UTC (rev 7177)
@@ -70,6 +70,9 @@
     if (defaultResource == null) {
       return description;
     }
+    if(description==null){
+      return CtuluLibString.EMPTY_STRING;
+    }
     try {
       final String i18n = defaultResource.getString(description);
       if (descriptionArgs != null) {

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