From 74791acbc4de818ed0bcf02126d4b22e63df5dd0 Mon Sep 17 00:00:00 2001
From: Atsushi Eno <atsushieno@veritas-vos-liberabit.com>
Date: Wed, 6 Mar 2013 23:45:50 +0900
Subject: [PATCH] Revert "avoid "java.lang.Void" output."

This reverts commit 963c647878fdb81b90babb9d9f3dc351f76a89f4.

Conflicts:
	JavaClass.java
---
 JavaClass.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/JavaClass.java b/JavaClass.java
index 87f1fdd..c0cb153 100644
--- a/JavaClass.java
+++ b/JavaClass.java
@@ -535,7 +535,7 @@ static String getClassName (Class jclass, boolean isFullname)
 
 		String qualname = jclass.getName ();
 		String basename = isFullname ? qualname : qualname.substring (jclass.getPackage ().getName ().length () + 1, qualname.length ());
-		return basename.replace ("$", ".").replace ("java.lang.Void", "void");
+		return basename.replace ("$", ".");
 	}
 
 	public void appendToDocument (Document doc, Element parent)
@@ -764,13 +764,13 @@ else if (name.equals ("S"))
 				else if (name.equals ("Z"))
 					return "boolean" + suffix;
 				else if (name.charAt (0) == 'L')
-					return name.substring (1, name.length () - 1).replace ('$', '.').replace ("java.lang.Void", "void") + suffix;
+					return name.substring (1, name.length () - 1).replace ('$', '.') + suffix;
 				else {
 					System.err.println ("warning J2XA008: unexpected array type name '" + name + "'");
 					return "";
 				}
 			}
-			return name.replace ('$', '.').replace ("java.lang.Void", "void");
+			return name.replace ('$', '.');
 		} else if (type instanceof ParameterizedType) {
 			// toString() does not work fine for ParameterizedType, so do it by ourselves.
 			ParameterizedType ptype = (ParameterizedType) type;
@@ -788,10 +788,10 @@ else if (name.charAt (0) == 'L')
 			}
 			if (occured)
 				sb.append ('>');
-			return sb.toString ().replace ("java.lang.Void", "void");
+			return sb.toString ();
 		} else {
 			try {
-				return type.toString ().replace ('$', '.').replace ("java.lang.Void", "void");
+				return type.toString ().replace ('$', '.');
 			} catch (Exception e) {
 				// Oracle has buggy Type.toString() implementation that throws this error at this late.
 				// Also bug #10744 reports NullPointerException in getGenericTypeName().