Index: settings/src/org/netbeans/modules/settings/convertors/SerialDataNode.java =================================================================== RCS file: /cvs/core/settings/src/org/netbeans/modules/settings/convertors/SerialDataNode.java,v retrieving revision 1.11 diff -r1.11 SerialDataNode.java 269,273d268 < Class[] param = new Class [0]; < try { < nameGetter = clazz.getMethod ("getName", param); // NOI18N < if (nameGetter.getReturnType () != String.class) throw new NoSuchMethodException (); < } catch (NoSuchMethodException e) { 275c270,275 < nameGetter = clazz.getMethod ("getDisplayName", param); // NOI18N --- > //issue 34914, serialized bean names showing up in different > //locales - we must look first for SystemOption.displayName() - > //its getName() method *will* be serialized if any settings > //have been changed; if the user restarts in a different > //locale, the previous locale's of the name will be shown > nameGetter = clazz.getMethod("displayName", null); //NOI18N 277,279c277,288 < } catch (NoSuchMethodException ee) { < return null; < } --- > } catch (NoSuchMethodException nsme) { > try { > nameGetter = clazz.getMethod ("getDisplayName", null); // NOI18N > if (nameGetter.getReturnType () != String.class) throw new NoSuchMethodException (); > } catch (NoSuchMethodException e) { > try { > nameGetter = clazz.getMethod ("getName", null); // NOI18N > if (nameGetter.getReturnType () != String.class) throw new NoSuchMethodException (); > } catch (NoSuchMethodException ee) { > return null; > } > } Index: src/org/netbeans/core/projects/SerialDataNode.java =================================================================== RCS file: /cvs/core/src/org/netbeans/core/projects/SerialDataNode.java,v retrieving revision 1.13 diff -r1.13 SerialDataNode.java 249a250,251 > /** Try to get display name of the bean. > */ 260,264d261 < Class[] param = new Class [0]; < try { < nameGetter = clazz.getMethod ("getName", param); // NOI18N < if (nameGetter.getReturnType () != String.class) throw new NoSuchMethodException (); < } catch (NoSuchMethodException e) { 266c263,268 < nameGetter = clazz.getMethod ("getDisplayName", param); // NOI18N --- > //issue 34914, serialized bean names showing up in different > //locales - we must look first for SystemOption.displayName() - > //its getName() method *will* be serialized if any settings > //have been changed; if the user restarts in a different > //locale, the previous locale's of the name will be shown > nameGetter = clazz.getMethod("displayName", null); //NOI18N 268,270c270,281 < } catch (NoSuchMethodException ee) { < return null; < } --- > } catch (NoSuchMethodException nsme) { > try { > nameGetter = clazz.getMethod ("getDisplayName", null); // NOI18N > if (nameGetter.getReturnType () != String.class) throw new NoSuchMethodException (); > } catch (NoSuchMethodException e) { > try { > nameGetter = clazz.getMethod ("getName", null); // NOI18N > if (nameGetter.getReturnType () != String.class) throw new NoSuchMethodException (); > } catch (NoSuchMethodException ee) { > return null; > } > }