[kaffe] CVS kaffe (dalibor): Fix for Maven 1.0-rc1

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Thu Jan 22 07:09:02 2004


PatchSet 4358 
Date: 2004/01/22 14:58:43
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fix for Maven 1.0-rc1

2004-01-22  Mark Wielaard  <mark@klomp.org>

        Fix for Maven 1.0-rc1.

        * libraries/javalib/java/beans/BeanDescriptor.java
        (BeanDescriptor): Set the FeatureDescriptor programmatic name.

Members: 
	ChangeLog:1.1943->1.1944 
	libraries/javalib/java/beans/BeanDescriptor.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1943 kaffe/ChangeLog:1.1944
--- kaffe/ChangeLog:1.1943	Thu Jan 22 14:38:53 2004
+++ kaffe/ChangeLog	Thu Jan 22 14:58:43 2004
@@ -1,3 +1,10 @@
+2004-01-22  Mark Wielaard  <mark@klomp.org>
+
+	Fix for Maven 1.0-rc1.
+
+	* libraries/javalib/java/beans/BeanDescriptor.java
+	(BeanDescriptor): Set the FeatureDescriptor programmatic name.
+
 2004-01-21  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* Makefile.am (SUBDIRS): Add intl.
Index: kaffe/libraries/javalib/java/beans/BeanDescriptor.java
diff -u kaffe/libraries/javalib/java/beans/BeanDescriptor.java:1.5 kaffe/libraries/javalib/java/beans/BeanDescriptor.java:1.6
--- kaffe/libraries/javalib/java/beans/BeanDescriptor.java:1.5	Sat Jan  3 02:32:51 2004
+++ kaffe/libraries/javalib/java/beans/BeanDescriptor.java	Thu Jan 22 14:58:46 2004
@@ -1,5 +1,5 @@
 /* java.beans.BeanDescriptor
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -67,6 +67,14 @@
 	public BeanDescriptor(Class beanClass, Class customizerClass) {
 		this.beanClass = beanClass;
 		this.customizerClass = customizerClass;
+
+		// Set the FeatureDescriptor programmatic name.
+		String name = beanClass.getName();
+		int lastInd = name.lastIndexOf('.');
+		if (lastInd != -1)
+		  name = name.substring(lastInd + 1);
+
+		setName(name);
 	}
 
 	/** Get the Bean's class. **/