svn commit: r1453914 - in /felix/trunk/inventory/src: main/java/org/apache/felix/inventory/PrinterMode.java test/java/org/apache/felix/inventory/PrinterModeTest.java

[fmeschbe]

Author: fmeschbe
Date: Thu Mar  7 15:21:57 2013
New Revision: 1453914

URL: http://svn.apache.org/r1453914
Log:
FELIX-3959 Make PrinterMode.valueOf(String) case insensitive

Modified:
    
felix/trunk/inventory/src/main/java/org/apache/felix/inventory/PrinterMode.java
    
felix/trunk/inventory/src/test/java/org/apache/felix/inventory/PrinterModeTest.java

Modified: 
felix/trunk/inventory/src/main/java/org/apache/felix/inventory/PrinterMode.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/inventory/src/main/java/org/apache/felix/inventory/PrinterMode.java?rev=1453914&r1=1453913&r2=1453914&view=diff
==============================================================================
--- 
felix/trunk/inventory/src/main/java/org/apache/felix/inventory/PrinterMode.java 
(original)
+++ 
felix/trunk/inventory/src/main/java/org/apache/felix/inventory/PrinterMode.java 
Thu Mar  7 15:21:57 2013
@@ -42,15 +42,15 @@ public final class PrinterMode
 
     public static PrinterMode valueOf(final String m)
     {
-        if (TEXT.name().equals(m))
+        if (TEXT.name().equalsIgnoreCase(m))
         {
             return TEXT;
         }
-        else if (HTML_FRAGMENT.name().equals(m))
+        else if (HTML_FRAGMENT.name().equalsIgnoreCase(m))
         {
             return HTML_FRAGMENT;
         }
-        else if (JSON.name().equals(m))
+        else if (JSON.name().equalsIgnoreCase(m))
         {
             return JSON;
         }

Modified: 
felix/trunk/inventory/src/test/java/org/apache/felix/inventory/PrinterModeTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/inventory/src/test/java/org/apache/felix/inventory/PrinterModeTest.java?rev=1453914&r1=1453913&r2=1453914&view=diff
==============================================================================
--- 
felix/trunk/inventory/src/test/java/org/apache/felix/inventory/PrinterModeTest.java
 (original)
+++ 
felix/trunk/inventory/src/test/java/org/apache/felix/inventory/PrinterModeTest.java
 Thu Mar  7 15:21:57 2013
@@ -29,6 +29,14 @@ public class PrinterModeTest extends Tes
         TestCase.assertSame(PrinterMode.JSON, PrinterMode.valueOf("JSON"));
         TestCase.assertSame(PrinterMode.HTML_FRAGMENT, 
PrinterMode.valueOf("HTML_FRAGMENT"));
 
+        TestCase.assertSame(PrinterMode.TEXT, PrinterMode.valueOf("text"));
+        TestCase.assertSame(PrinterMode.JSON, PrinterMode.valueOf("json"));
+        TestCase.assertSame(PrinterMode.HTML_FRAGMENT, 
PrinterMode.valueOf("html_fragment"));
+
+        TestCase.assertSame(PrinterMode.TEXT, PrinterMode.valueOf("Text"));
+        TestCase.assertSame(PrinterMode.JSON, PrinterMode.valueOf("Json"));
+        TestCase.assertSame(PrinterMode.HTML_FRAGMENT, 
PrinterMode.valueOf("HTML_Fragment"));
+
         TestCase.assertNull(PrinterMode.valueOf("unsupported_name"));
     }