(original) (raw)

diff --git a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties --- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties @@ -45,3 +45,8 @@ FileChooser.fileTypeHeaderText=Type FileChooser.fileDateHeaderText=Modified FileChooser.fileAttrHeaderText=Attributes +FileChooser.lookInLabelMnemonic=I +FileChooser.fileNameLabelMnemonic=N +FileChooser.folderNameLabelMnemonic=F +FileChooser.filesOfTypeLabelMnemonic=T +FileChooser.filesOfTypeMnemonic=T diff --git a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties --- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties @@ -43,6 +43,11 @@ FileChooser.fileTypeHeaderText=Type FileChooser.fileDateHeaderText=Modified FileChooser.fileAttrHeaderText=Attributes +FileChooser.lookInLabelMnemonic=I +FileChooser.fileNameLabelMnemonic=N +FileChooser.folderNameLabelMnemonic=F +FileChooser.filesOfTypeLabelMnemonic=T +FileChooser.filesOfTypeMnemonic=T ############ Used by MetalTitlePane if rendering window decorations############ # All mnemonics are KeyEvent.VK_XXX as integers diff --git a/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties b/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties --- a/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties +++ b/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties @@ -43,3 +43,8 @@ FileChooser.fileTypeHeaderText=Type FileChooser.fileDateHeaderText=Modified FileChooser.fileAttrHeaderText=Attributes +FileChooser.lookInLabelMnemonic=I +FileChooser.fileNameLabelMnemonic=N +FileChooser.folderNameLabelMnemonic=F +FileChooser.filesOfTypeLabelMnemonic=T +FileChooser.filesOfTypeMnemonic=T diff --git a/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java b/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java --- a/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java +++ b/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java @@ -473,16 +473,16 @@ Locale l = fc.getLocale(); - lookInLabelMnemonic = getMnemonic("FileChooser.lookInLabelMnemonic", l); + lookInLabelMnemonic = (int)(UIManager.getString("FileChooser.lookInLabelMnemonic", l).toCharArray()[0]); lookInLabelText = UIManager.getString("FileChooser.lookInLabelText", l); saveInLabelText = UIManager.getString("FileChooser.saveInLabelText", l); - fileNameLabelMnemonic = getMnemonic("FileChooser.fileNameLabelMnemonic", l); + fileNameLabelMnemonic = (int)(UIManager.getString("FileChooser.fileNameLabelMnemonic", l).toCharArray()[0]); fileNameLabelText = UIManager.getString("FileChooser.fileNameLabelText", l); - folderNameLabelMnemonic = getMnemonic("FileChooser.folderNameLabelMnemonic", l); + folderNameLabelMnemonic = (int)(UIManager.getString("FileChooser.folderNameLabelMnemonic", l).toCharArray()[0]); folderNameLabelText = UIManager.getString("FileChooser.folderNameLabelText", l); - filesOfTypeLabelMnemonic = getMnemonic("FileChooser.filesOfTypeLabelMnemonic", l); + filesOfTypeLabelMnemonic = (int)(UIManager.getString("FileChooser.filesOfTypeMnemonic", l).toCharArray()[0]); filesOfTypeLabelText = UIManager.getString("FileChooser.filesOfTypeLabelText", l); upFolderToolTipText = UIManager.getString("FileChooser.upFolderToolTipText",l); @@ -501,11 +501,6 @@ detailsViewButtonAccessibleName = UIManager.getString("FileChooser.detailsViewButtonAccessibleName",l); } - private int getMnemonic(String key, Locale l) { - return SwingUtilities2.getUIDefaultsInt(key, l); - } - - public String getFileName() { if (fileNameTextField != null) { return fileNameTextField.getText();