Index: RootFolderNode.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/RootFolderNode.java,v
retrieving revision 1.44
diff -u -r1.44 RootFolderNode.java
--- RootFolderNode.java	17 Jun 2002 10:59:26 -0000	1.44
+++ RootFolderNode.java	19 Jun 2002 18:44:22 -0000
@@ -125,10 +125,6 @@
                        new Object[] {fs.getDisplayName (), fs.getSystemName ()}
                    );
         setDisplayName (s);
-        if (fs instanceof JarFileSystem) {
-	    File root = ((JarFileSystem) fs).getJarFile ();
-            setShortDescription(root.getAbsolutePath());
-        }
     }
 
     // [pnejedly,PERF]: The icon is needed quite often for painting
@@ -174,14 +170,15 @@
         Class klass = fs.getClass();
         
         BeanInfo bi = getBeanInfoForClass(klass.getName());
-        String shortDescription = null;
         
         // Try to find the bean info
-        try {
-            bi = Utilities.getBeanInfo(fs.getClass());
-        } catch (IntrospectionException e) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
-            return null;
+        if (bi == null) {
+            try {
+                bi = Utilities.getBeanInfo(fs.getClass());
+            } catch (IntrospectionException e) {
+                ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                return null;
+            }
         }
         
         BeanDescriptor bd = bi.getBeanDescriptor();
@@ -190,7 +187,14 @@
             return null;
         }
         else {
-            return bd.getShortDescription();
+            String sd = bd.getShortDescription();
+            if (sd == null || sd.equals(bd.getName())) {
+                // Not customized, don't show the unlocalized class name!
+                // E.g. #24942.
+                return null;
+            } else {
+                return sd;
+            }
         }
         
     }
@@ -329,8 +333,10 @@
       /** PROP_SYSTEM_NAME for back compatibility*/
       boolean isSystName = FileSystem.PROP_SYSTEM_NAME.equals (ev.getPropertyName ());
       
-      if (isSystName || isDispName) 
+      if (isSystName || isDispName) {
         initDisplayName ();
+        fireShortDescriptionChange(null, null);
+      }
       
       firePropertyChange(ev.getPropertyName(), ev.getOldValue(), ev.getNewValue());
     }