svn commit: r1597495 - in /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core: config/plugins/util/TypeConverters.java layout/HtmlLayout.java

[mattsicker]

Author: mattsicker
Date: Mon May 26 00:30:45 2014
New Revision: 1597495

URL: http://svn.apache.org/r1597495
Log:
Add FontSize enum to TypeConverters.

  - Made FontSize a public inner class as well.

Modified:
    
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java
    
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java?rev=1597495&r1=1597494&r2=1597495&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java
 Mon May 26 00:30:45 2014
@@ -25,6 +25,7 @@ import java.util.regex.Pattern;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.layout.HtmlLayout;
 import org.apache.logging.log4j.core.net.Facility;
 import org.apache.logging.log4j.core.net.Protocol;
 import org.apache.logging.log4j.core.util.Assert;
@@ -67,6 +68,7 @@ public final class TypeConverters {
         registry.put(Filter.Result.class, new 
EnumConverter<Filter.Result>(Filter.Result.class));
         registry.put(Facility.class, new 
EnumConverter<Facility>(Facility.class));
         registry.put(Protocol.class, new 
EnumConverter<Protocol>(Protocol.class));
+        registry.put(HtmlLayout.FontSize.class, new 
EnumConverter<HtmlLayout.FontSize>(HtmlLayout.FontSize.class));
     }
 
     /**

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java?rev=1597495&r1=1597494&r2=1597495&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
 Mon May 26 00:30:45 2014
@@ -69,7 +69,7 @@ public final class HtmlLayout extends Ab
     private final String contentType;
 
     /**Possible font sizes */
-    private enum FontSize {
+    public static enum FontSize {
         SMALLER("smaller"), XXSMALL("xx-small"), XSMALL("x-small"), 
SMALL("small"), MEDIUM("medium"), LARGE("large"),
         XLARGE("x-large"), XXLARGE("xx-large"),  LARGER("larger");