From 47b44748d93a7dd7c8106d9d05ad8814c0699141 Mon Sep 17 00:00:00 2001
From: Michael Koch <mkoch@gcc.gnu.org>
Date: Wed, 20 Apr 2005 05:53:53 +0000
Subject: [PATCH] [multiple changes]

2005-04-20  Michael Koch  <konqueror@gmx.de>

	* gnu/java/beans/IntrospectionIncubator.java:
	Fixed HTML tags in javadocs.

2005-04-20  Jeroen Frijters  <jeroen@frijters.net>

	* gnu/java/beans/IntrospectionIncubator.java
	(addToPropertyHash, addToListenerHash): Don't confuse get(),
	set(), is(), add() and remove() with properties or events.

From-SVN: r98441
---
 libjava/ChangeLog                                  | 11 +++++++++++
 libjava/gnu/java/beans/IntrospectionIncubator.java |  8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8e75e5db027..eb0b5242920 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,14 @@
+2005-04-20  Michael Koch  <konqueror@gmx.de>
+
+	* gnu/java/beans/IntrospectionIncubator.java:
+	Fixed HTML tags in javadocs.
+
+2005-04-20  Jeroen Frijters  <jeroen@frijters.net>
+
+	* gnu/java/beans/IntrospectionIncubator.java
+	(addToPropertyHash, addToListenerHash): Don't confuse get(),
+	set(), is(), add() and remove() with properties or events.
+
 2005-04-20  Michael Koch  <konqueror@gmx.de>
 
 	* gnu/java/awt/image/XBMDecoder.java:
diff --git a/libjava/gnu/java/beans/IntrospectionIncubator.java b/libjava/gnu/java/beans/IntrospectionIncubator.java
index 21bf984d24c..9c2a652c3ed 100644
--- a/libjava/gnu/java/beans/IntrospectionIncubator.java
+++ b/libjava/gnu/java/beans/IntrospectionIncubator.java
@@ -82,14 +82,14 @@ public class IntrospectionIncubator {
 
 	/** Examines the given method and files it in a suitable collection.
 	 * It files the method as a property method if it finds:
-	 * <lu>
+	 * <ul>
 	 * <li>boolean "is" getter</li>
 	 * <li>"get" style getter</li>
 	 * <li>single argument setter</li>
 	 * <li>indiced setter and getter</li> 
 	 * </ul>
 	 * It files the method as a listener method if all of these rules apply:
-	 * <lu>
+	 * <ul>
 	 * <li>the method name starts with "add" or "remove"</li>
 	 * <li>there is only a single argument</li>
 	 * <li>the argument type is a subclass of <code>java.util.EventListener</code></li>
@@ -323,6 +323,8 @@ public class IntrospectionIncubator {
 				return;
 		}
 		newName = capitalize(newName);
+		if (newName.length() == 0)
+			return;
 
 		DoubleKey k = new DoubleKey(type,newName);
 		Method[] methods = (Method[])propertyMethods.get(k);
@@ -350,6 +352,8 @@ public class IntrospectionIncubator {
 				return;
 		}
 		newName = capitalize(newName);
+		if (newName.length() == 0)
+			return;
 
 		DoubleKey k = new DoubleKey(type,newName);
 		Method[] methods = (Method[])listenerMethods.get(k);
-- 
2.30.2