From 121c20981904210eae85229d490d04015e984d39 Mon Sep 17 00:00:00 2001
From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Tue, 22 Sep 2015 00:51:19 +0000
Subject: [PATCH] ICU-11918 Reverted accidentally modified
 ICUTagletAdapter.java in the previous commit.

X-SVN-Rev: 37978
---
 .../icu/dev/tool/docs/ICUTagletAdapter.java   | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/ICUTagletAdapter.java b/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/ICUTagletAdapter.java
index 9e02ce738a6..f2d5bc1d9d0 100644
--- a/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/ICUTagletAdapter.java
+++ b/icu4j/tools/build/src/com/ibm/icu/dev/tool/docs/ICUTagletAdapter.java
@@ -8,40 +8,51 @@ package com.ibm.icu.dev.tool.docs;
 
 import com.sun.javadoc.Doc;
 import com.sun.javadoc.Tag;
+import com.sun.tools.doclets.formats.html.markup.RawHtml;
+import com.sun.tools.doclets.internal.toolkit.Content;
 import com.sun.tools.doclets.internal.toolkit.taglets.Taglet;
-import com.sun.tools.doclets.internal.toolkit.taglets.TagletOutput;
 import com.sun.tools.doclets.internal.toolkit.taglets.TagletWriter;
 
 /**
  * The ICUTagletAdapter class is the abstract base class that adapts the ICUTaglet class to different implementations of the JavaDoc API. 
  * The methods in this class are meant to minimize the dual maintenance nature of supporting multiple JavaDoc APIs.
  * 
- * This adapter supports the v7 and earlier JavaDoc API
+ * This adapter supports the v8 JavaDoc API
  */
 public abstract class ICUTagletAdapter implements Taglet {
-
+    
     public abstract String toString(Tag tag);
 
     public abstract String toString(Tag[] tags);
 
-    public TagletOutput getTagletOutput(Tag tag, TagletWriter writer)
-            throws IllegalArgumentException {
+    public Content getTagletOutput(Tag tag, TagletWriter writer)
+        throws IllegalArgumentException {
 
-            TagletOutput out = writer.getTagletOutputInstance();
-            out.setOutput(toString(tag));
-            return out;
+        // addContext doesn't except nulls so filter them out
+        String encodedText = toString(tag);
+        if(encodedText == null) return null;
+           
+        Content out = writer.getOutputInstance();
+        out.addContent(new RawHtml(encodedText));
+         
+        return out;
+    }
+
+    public Content getTagletOutput(Doc holder, TagletWriter writer)
+        throws IllegalArgumentException {
+
+        Content out = writer.getOutputInstance();
+        Tag[] tags = holder.tags(getName());
+        if (tags.length == 0) {
+            return null;
         }
 
-        public TagletOutput getTagletOutput(Doc holder, TagletWriter writer)
-            throws IllegalArgumentException {
+        // addContext doesn't except nulls so filter them out
+        String encodedText = toString(tags[0]);
+        if(encodedText == null) return null;
 
-            TagletOutput out = writer.getTagletOutputInstance();
-            Tag[] tags = holder.tags(getName());
-            if (tags.length == 0) {
-                return null;
-            }
-            out.setOutput(toString(tags[0]));
-            return out;
-        }
+        out.addContent(new RawHtml(encodedText));
+        return out;
+    }
 
 }