svn commit: r1684188 - /tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaParsers.java

[nick]

Author: nick
Date: Mon Jun  8 14:06:36 2015
New Revision: 1684188

URL: http://svn.apache.org/r1684188
Log:
Include parser decoration details in the Tika Server parser listings as well

Modified:
    
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaParsers.java

Modified: 
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaParsers.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaParsers.java?rev=1684188&r1=1684187&r2=1684188&view=diff
==============================================================================
--- 
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaParsers.java
 (original)
+++ 
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaParsers.java
 Mon Jun  8 14:06:36 2015
@@ -89,7 +89,10 @@ public class TikaParsers {
         html.append(p.className);
         html.append("</p>");
         if (p.isDecorated) {
-            html.append("<p>Decorated Parser</p>");
+            html.append("<p>Decorated Parser");
+            if (p.decoratedBy != null)
+                html.append( " - ").append(p.decoratedBy);
+            html.append("</p>");
         }
         if (p.isComposite) {
             html.append("<p>Composite Parser</p>");
@@ -175,7 +178,11 @@ public class TikaParsers {
         text.append(indent);
         text.append(p.className);
         if (p.isDecorated) {
-            text.append(" (Decorated Parser)");
+            text.append(" (Decorated Parser");
+            if (p.decoratedBy != null) {
+                text.append(" ").append(p.decoratedBy);
+            }
+            text.append(")");
         }
         if (p.isComposite) {
             text.append(" (Composite Parser):\n");
@@ -201,13 +208,15 @@ public class TikaParsers {
         private String shortName;
         private boolean isComposite;
         private boolean isDecorated;
+        private String  decoratedBy;
         private Set<MediaType> supportedTypes;
         private List<Parser> childParsers;
 
         private ParserDetails(Parser p) {
             if (p instanceof ParserDecorator) {
                 isDecorated = true;
-                p = ((ParserDecorator) p).getWrappedParser();
+                decoratedBy = ((ParserDecorator)p).getDecorationName();
+                p = ((ParserDecorator)p).getWrappedParser();
             }
 
             className = p.getClass().getName();