From 7789e4818a0fb0a2d944ab6eb2907a32d2393fb8 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 29 Apr 2005 06:11:27 +0000 Subject: 2005-04-29 Robert Schuster * java/beans/FeatureDescriptor.java: (getShortDescription): Implemented fallback mechanism and fixed documentation (fixes bug #12637). (getDisplayName): Dito. 2005-04-29 Robert Schuster * java/beans/Introspector.java: Fixed bug #12624, BeanDescriptors will now be set correctly. (flushCaches): Now flushes all cached intermediate data. From-SVN: r98975 --- libjava/java/beans/FeatureDescriptor.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'libjava/java/beans/FeatureDescriptor.java') diff --git a/libjava/java/beans/FeatureDescriptor.java b/libjava/java/beans/FeatureDescriptor.java index 68141cf2f44..0d20c5539ae 100644 --- a/libjava/java/beans/FeatureDescriptor.java +++ b/libjava/java/beans/FeatureDescriptor.java @@ -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 @@ import java.util.Hashtable; * * @author John Keiser * @since 1.1 - * @version 1.1.0, 31 May 1998 */ public class FeatureDescriptor @@ -99,10 +98,13 @@ public class FeatureDescriptor /** * 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 @@ public class FeatureDescriptor /** * Get the localized short description for this feature. + * + * @returns A short localized description of this feature or + * what getDisplayName returns in case, that no short description + * is available. */ public String getShortDescription() { - return shortDescription; + return (shortDescription == null) ? getDisplayName() : shortDescription; } /** -- cgit v1.2.3