From ea926b8f72818f514bf712f6d9c608ec895c6564 Mon Sep 17 00:00:00 2001
From: Doug Felt <dougfelt@gmail.com>
Date: Mon, 14 Nov 2005 22:01:36 +0000
Subject: [PATCH] ICU-4921 update codemangler tool

X-SVN-Rev: 18789
---
 .../ibm/icu/dev/tool/docs/CodeMangler.java    |  5 +----
 .../com/ibm/icu/dev/tool/docs/ICUTaglet.jpp   | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/icu4j/src/com/ibm/icu/dev/tool/docs/CodeMangler.java b/icu4j/src/com/ibm/icu/dev/tool/docs/CodeMangler.java
index f9ba95303f1..fa741541d67 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/docs/CodeMangler.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/docs/CodeMangler.java
@@ -41,10 +41,7 @@ public class CodeMangler {
     private boolean verbose; // true if we emit debug output
 
     public static void main(String[] args) {
-        int result = new CodeMangler(args).run();
-        if (result != 0) {
-            System.exit(result);
-        }
+        new CodeMangler(args).run();
     }
 
     private static final String usage = "Usage:\n" +
diff --git a/icu4j/src/com/ibm/icu/dev/tool/docs/ICUTaglet.jpp b/icu4j/src/com/ibm/icu/dev/tool/docs/ICUTaglet.jpp
index de4b9c306ed..40215b5bf22 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/docs/ICUTaglet.jpp
+++ b/icu4j/src/com/ibm/icu/dev/tool/docs/ICUTaglet.jpp
@@ -15,7 +15,7 @@ package com.ibm.icu.dev.tool.docs;
 
 import com.sun.javadoc.*;
 import com.sun.tools.doclets.*;
-#ifdef VERSION_1.5
+//#ifdef VERSION_1.5
 
 import com.sun.tools.doclets.internal.toolkit.taglets.*;
 import com.sun.tools.doclets.internal.toolkit.taglets.Taglet;
@@ -25,7 +25,7 @@ import com.sun.tools.doclets.internal.toolkit.taglets.Taglet;
 // Their registration code casts to the second, not the first, and the
 // second doesn't implement the first, so if you just implement the
 // first, you die.
-#endif
+//#endif
 
 import java.text.BreakIterator;
 import java.util.Locale;
@@ -50,9 +50,9 @@ public abstract class ICUTaglet implements Taglet {
         ICUInternalTaglet.register(taglets);
         ICUDraftTaglet.register(taglets);
         ICUStableTaglet.register(taglets);
- #ifndef VERSION_1.5
+//#ifndef VERSION_1.5
         ICUDeprecatedTaglet.register(taglets);
- #endif
+//#endif
         ICUObsoleteTaglet.register(taglets);
         ICUIgnoreTaglet.register(taglets);
     }
@@ -112,7 +112,7 @@ public abstract class ICUTaglet implements Taglet {
         }
         return null;
     }
-#ifdef VERSION_1.5
+//#ifdef VERSION_1.5
 
     public TagletOutput getTagletOutput(Tag tag, TagletWriter writer) throws IllegalArgumentException {
 	TagletOutput out = writer.getTagletOutputInstance();
@@ -129,7 +129,7 @@ public abstract class ICUTaglet implements Taglet {
  	out.setOutput(toString(tags[0]));
  	return out;
     }
-#endif
+//#endif
 
     protected static final String STATUS = "<dt><b>Status:</b></dt>";
 
@@ -189,7 +189,7 @@ public abstract class ICUTaglet implements Taglet {
             }
         }
     }
-#ifndef VERSION_1.5
+//#ifndef VERSION_1.5
 
     /*
      * sigh, in JDK 1.5 we can't override the standard deprecated taglet
@@ -221,7 +221,7 @@ public abstract class ICUTaglet implements Taglet {
             }
         }
     }
-#endif
+//#endif
 
     public static class ICUObsoleteTaglet extends ICUTaglet {
         private static final String NAME = "obsolete";
@@ -240,6 +240,9 @@ public abstract class ICUTaglet implements Taglet {
             bi.setText(text);
             int first = bi.first();
             int next = bi.next();
+            if (text.length() == 0) {
+                first = next = 0;
+            }
             return STATUS + "<dd><em>Obsolete.</em> <font color='red'>Will be removed in " + text.substring(first, next) + "</font>. " + text.substring(next) + "</dd>";
 
         }