[kaffe] CVS kaffe (robilad): resynced with gnu classpath: beans fix

[Kaffe CVS]

PatchSet 6491 
Date: 2005/05/15 12:17:50
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: beans fix

2005-05-15  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-04-28  Robert Schuster  <thebohemian at gmx.net>

        * java/beans/FeatureDescriptor.java:
        (getShortDescription): Implemented fallback mechanism and fixed
        documentation (fixes bug #12637).
        (getDisplayName): Dito.

Members: 
	ChangeLog:1.4016->1.4017 
	libraries/javalib/java/beans/FeatureDescriptor.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4016 kaffe/ChangeLog:1.4017
--- kaffe/ChangeLog:1.4016	Sun May 15 12:12:28 2005
+++ kaffe/ChangeLog	Sun May 15 12:17:50 2005
@@ -4,6 +4,17 @@
 
 	2005-04-28  Robert Schuster  <thebohemian at gmx.net>
 
+        * java/beans/FeatureDescriptor.java:
+        (getShortDescription): Implemented fallback mechanism and fixed
+        documentation (fixes bug #12637).
+        (getDisplayName): Dito.
+
+2005-05-15  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2005-04-28  Robert Schuster  <thebohemian at gmx.net>
+
         * java/beans/Introspector.java: Fixed bug #12624, BeanDescriptors
         will now be set correctly.
         (flushCaches): Now flushes all cached intermediate data.
Index: kaffe/libraries/javalib/java/beans/FeatureDescriptor.java
diff -u kaffe/libraries/javalib/java/beans/FeatureDescriptor.java:1.6 kaffe/libraries/javalib/java/beans/FeatureDescriptor.java:1.7
--- kaffe/libraries/javalib/java/beans/FeatureDescriptor.java:1.6	Sat Jan  3 02:32:51 2004
+++ kaffe/libraries/javalib/java/beans/FeatureDescriptor.java	Sun May 15 12:17:56 2005
@@ -1,5 +1,5 @@
 /* java.beans.FeatureDescriptor
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -57,7 +57,6 @@
  *
  * @author John Keiser
  * @since 1.1
- * @version 1.1.0, 31 May 1998
  */
 
 public class FeatureDescriptor
@@ -99,10 +98,13 @@
 
   /**
    * Get the localized (display) name of this feature.
+   *
+   * @returns The localized display name of this feature or falls
+   * back to the programmatic name.
    */
   public String getDisplayName()
   {
-    return displayName;
+    return (displayName == null) ? name : displayName;
   }
 
   /**
@@ -117,10 +119,14 @@
 
   /**
    * Get the localized short description for this feature.
+   *
+   * @returns A short localized description of this feature or
+   * what <code>getDisplayName</code> returns in case, that no short description
+   * is available.
    */
   public String getShortDescription()
   {
-    return shortDescription;
+    return (shortDescription == null) ? getDisplayName() : shortDescription;
   }
 
   /**