|
Lines 125-134
Link Here
|
| 125 |
new Object[] {fs.getDisplayName (), fs.getSystemName ()} |
125 |
new Object[] {fs.getDisplayName (), fs.getSystemName ()} |
| 126 |
); |
126 |
); |
| 127 |
setDisplayName (s); |
127 |
setDisplayName (s); |
| 128 |
if (fs instanceof JarFileSystem) { |
|
|
| 129 |
File root = ((JarFileSystem) fs).getJarFile (); |
| 130 |
setShortDescription(root.getAbsolutePath()); |
| 131 |
} |
| 132 |
} |
128 |
} |
| 133 |
|
129 |
|
| 134 |
// [pnejedly,PERF]: The icon is needed quite often for painting |
130 |
// [pnejedly,PERF]: The icon is needed quite often for painting |
|
Lines 174-187
Link Here
|
| 174 |
Class klass = fs.getClass(); |
170 |
Class klass = fs.getClass(); |
| 175 |
|
171 |
|
| 176 |
BeanInfo bi = getBeanInfoForClass(klass.getName()); |
172 |
BeanInfo bi = getBeanInfoForClass(klass.getName()); |
| 177 |
String shortDescription = null; |
|
|
| 178 |
|
173 |
|
| 179 |
// Try to find the bean info |
174 |
// Try to find the bean info |
| 180 |
try { |
175 |
if (bi == null) { |
| 181 |
bi = Utilities.getBeanInfo(fs.getClass()); |
176 |
try { |
| 182 |
} catch (IntrospectionException e) { |
177 |
bi = Utilities.getBeanInfo(fs.getClass()); |
| 183 |
ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e); |
178 |
} catch (IntrospectionException e) { |
| 184 |
return null; |
179 |
ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e); |
|
|
180 |
return null; |
| 181 |
} |
| 185 |
} |
182 |
} |
| 186 |
|
183 |
|
| 187 |
BeanDescriptor bd = bi.getBeanDescriptor(); |
184 |
BeanDescriptor bd = bi.getBeanDescriptor(); |
|
Lines 190-196
Link Here
|
| 190 |
return null; |
187 |
return null; |
| 191 |
} |
188 |
} |
| 192 |
else { |
189 |
else { |
| 193 |
return bd.getShortDescription(); |
190 |
String sd = bd.getShortDescription(); |
|
|
191 |
if (sd == null || sd.equals(bd.getName())) { |
| 192 |
// Not customized, don't show the unlocalized class name! |
| 193 |
// E.g. #24942. |
| 194 |
return null; |
| 195 |
} else { |
| 196 |
return sd; |
| 197 |
} |
| 194 |
} |
198 |
} |
| 195 |
|
199 |
|
| 196 |
} |
200 |
} |
|
Lines 329-336
Link Here
|
| 329 |
/** PROP_SYSTEM_NAME for back compatibility*/ |
333 |
/** PROP_SYSTEM_NAME for back compatibility*/ |
| 330 |
boolean isSystName = FileSystem.PROP_SYSTEM_NAME.equals (ev.getPropertyName ()); |
334 |
boolean isSystName = FileSystem.PROP_SYSTEM_NAME.equals (ev.getPropertyName ()); |
| 331 |
|
335 |
|
| 332 |
if (isSystName || isDispName) |
336 |
if (isSystName || isDispName) { |
| 333 |
initDisplayName (); |
337 |
initDisplayName (); |
|
|
338 |
fireShortDescriptionChange(null, null); |
| 339 |
} |
| 334 |
|
340 |
|
| 335 |
firePropertyChange(ev.getPropertyName(), ev.getOldValue(), ev.getNewValue()); |
341 |
firePropertyChange(ev.getPropertyName(), ev.getOldValue(), ev.getNewValue()); |
| 336 |
} |
342 |
} |