OpenJDK / amber / amber
changeset 10413:5bd4f81b6d45
7024118: possible hardcoded mnemonic for JFileChooser metal and motif l&f
Reviewed-by: alexp
Contributed-by: Charles Lee <littlee@linux.vnet.ibm.com>
line wrap: on
line diff
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java Fri Sep 09 17:44:11 2011 +0400 @@ -529,21 +529,25 @@ Locale l = fc.getLocale(); enterFolderNameLabelText = UIManager.getString("FileChooser.enterFolderNameLabelText",l); - enterFolderNameLabelMnemonic = UIManager.getInt("FileChooser.enterFolderNameLabelMnemonic"); + enterFolderNameLabelMnemonic = getMnemonic("FileChooser.enterFolderNameLabelMnemonic", l); enterFileNameLabelText = UIManager.getString("FileChooser.enterFileNameLabelText",l); - enterFileNameLabelMnemonic = UIManager.getInt("FileChooser.enterFileNameLabelMnemonic"); + enterFileNameLabelMnemonic = getMnemonic("FileChooser.enterFileNameLabelMnemonic", l); filesLabelText = UIManager.getString("FileChooser.filesLabelText",l); - filesLabelMnemonic = UIManager.getInt("FileChooser.filesLabelMnemonic"); + filesLabelMnemonic = getMnemonic("FileChooser.filesLabelMnemonic", l); foldersLabelText = UIManager.getString("FileChooser.foldersLabelText",l); - foldersLabelMnemonic = UIManager.getInt("FileChooser.foldersLabelMnemonic"); + foldersLabelMnemonic = getMnemonic("FileChooser.foldersLabelMnemonic", l); pathLabelText = UIManager.getString("FileChooser.pathLabelText",l); - pathLabelMnemonic = UIManager.getInt("FileChooser.pathLabelMnemonic"); + pathLabelMnemonic = getMnemonic("FileChooser.pathLabelMnemonic", l); filterLabelText = UIManager.getString("FileChooser.filterLabelText",l); - filterLabelMnemonic = UIManager.getInt("FileChooser.filterLabelMnemonic"); + filterLabelMnemonic = getMnemonic("FileChooser.filterLabelMnemonic", l); + } + + private Integer getMnemonic(String key, Locale l) { + return SwingUtilities2.getUIDefaultsInt(key, l); } protected void installIcons(JFileChooser fc) {
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java Fri Sep 09 17:44:11 2011 +0400 @@ -1215,11 +1215,6 @@ "EditorPane.focusInputMap", multilineInputMap, - "FileChooser.pathLabelMnemonic", new Integer(KeyEvent.VK_P), // 'p' - "FileChooser.filterLabelMnemonic", new Integer (KeyEvent.VK_R), // 'r' - "FileChooser.foldersLabelMnemonic", new Integer (KeyEvent.VK_L), // 'l' - "FileChooser.filesLabelMnemonic", new Integer (KeyEvent.VK_I), // 'i' - "FileChooser.enterFileNameLabelMnemonic", new Integer (KeyEvent.VK_N), // 'n' "FileChooser.ancestorInputMap", new UIDefaults.LazyInputMap(new Object[] { "ESCAPE", "cancelSelection"
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties Fri Sep 09 17:44:11 2011 +0400 @@ -27,10 +27,15 @@ FileChooser.updateButtonText=Update FileChooser.helpButtonText=Help FileChooser.pathLabelText=Enter path or folder name: +FileChooser.pathLabelMnemonic=80 FileChooser.filterLabelText=Filter +FileChooser.filterLabelMnemonic=82 FileChooser.foldersLabelText=Folders +FileChooser.foldersLabelMnemonic=76 FileChooser.filesLabelText=Files +FileChooser.filesLabelMnemonic=73 FileChooser.enterFileNameLabelText=Enter file name: +FileChooser.enterFileNameLabelMnemonic=78 FileChooser.enterFolderNameLabelText=Enter folder name: FileChooser.cancelButtonToolTipText=Abort file chooser dialog.
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties Fri Sep 09 17:44:11 2011 +0400 @@ -27,10 +27,15 @@ FileChooser.updateButtonText=Aktualisieren FileChooser.helpButtonText=Hilfe FileChooser.pathLabelText=Pfad- oder Ordnernamen eingeben: +FileChooser.pathLabelMnemonic=80 FileChooser.filterLabelText=Filter +FileChooser.filterLabelMnemonic=82 FileChooser.foldersLabelText=Ordner +FileChooser.foldersLabelMnemonic=76 FileChooser.filesLabelText=Dateien +FileChooser.filesLabelMnemonic=73 FileChooser.enterFileNameLabelText=Dateinamen eingeben: +FileChooser.enterFileNameLabelMnemonic=78 FileChooser.enterFolderNameLabelText=Ordnernamen eingeben: FileChooser.cancelButtonToolTipText=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties Fri Sep 09 17:44:11 2011 +0400 @@ -27,10 +27,15 @@ FileChooser.updateButtonText=Actualizar FileChooser.helpButtonText=Ayuda FileChooser.pathLabelText=Introducir nombre de la ruta de acceso o carpeta: +FileChooser.pathLabelMnemonic=80 FileChooser.filterLabelText=Filtro +FileChooser.filterLabelMnemonic=82 FileChooser.foldersLabelText=Carpetas +FileChooser.foldersLabelMnemonic=76 FileChooser.filesLabelText=Archivos +FileChooser.filesLabelMnemonic=73 FileChooser.enterFileNameLabelText=Introducir nombre de archivo: +FileChooser.enterFileNameLabelMnemonic=78 FileChooser.enterFolderNameLabelText=Introducir nombre de carpeta: FileChooser.cancelButtonToolTipText=Abortar cuadro de di\u00E1logo del selector de archivos.
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties Fri Sep 09 17:44:11 2011 +0400 @@ -27,10 +27,15 @@ FileChooser.updateButtonText=Mettre \u00E0 jour FileChooser.helpButtonText=Aide FileChooser.pathLabelText=Entrez le chemin ou le nom du dossier : +FileChooser.pathLabelMnemonic=80 FileChooser.filterLabelText=Filtre +FileChooser.filterLabelMnemonic=82 FileChooser.foldersLabelText=Dossiers +FileChooser.foldersLabelMnemonic=76 FileChooser.filesLabelText=Fichiers +FileChooser.filesLabelMnemonic=73 FileChooser.enterFileNameLabelText=Entrez le nom du fichier : +FileChooser.enterFileNameLabelMnemonic=78 FileChooser.enterFolderNameLabelText=Entrez le nom du dossier : FileChooser.cancelButtonToolTipText=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers.
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties Fri Sep 09 17:44:11 2011 +0400 @@ -27,10 +27,15 @@ FileChooser.updateButtonText=Aggiorna FileChooser.helpButtonText=? FileChooser.pathLabelText=Percorso o nome cartella: +FileChooser.pathLabelMnemonic=80 FileChooser.filterLabelText=Filtro +FileChooser.filterLabelMnemonic=82 FileChooser.foldersLabelText=Cartelle +FileChooser.foldersLabelMnemonic=76 FileChooser.filesLabelText=File +FileChooser.filesLabelMnemonic=73 FileChooser.enterFileNameLabelText=Nome file: +FileChooser.enterFileNameLabelMnemonic=78 FileChooser.enterFolderNameLabelText=Nome cartella: FileChooser.cancelButtonToolTipText=Chiude la finestra di dialogo di selezione file.
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties Fri Sep 09 17:44:11 2011 +0400 @@ -27,10 +27,15 @@ FileChooser.updateButtonText=\u66F4\u65B0 FileChooser.helpButtonText=\u30D8\u30EB\u30D7 FileChooser.pathLabelText=\u30D1\u30B9\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B: +FileChooser.pathLabelMnemonic=80 FileChooser.filterLabelText=\u30D5\u30A3\u30EB\u30BF +FileChooser.filterLabelMnemonic=82 FileChooser.foldersLabelText=\u30D5\u30A9\u30EB\u30C0 +FileChooser.foldersLabelMnemonic=76 FileChooser.filesLabelText=\u30D5\u30A1\u30A4\u30EB +FileChooser.filesLabelMnemonic=73 FileChooser.enterFileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u5165\u529B: +FileChooser.enterFileNameLabelMnemonic=78 FileChooser.enterFolderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B: FileChooser.cancelButtonToolTipText=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties Fri Sep 09 17:44:11 2011 +0400 @@ -27,10 +27,15 @@ FileChooser.updateButtonText=\uAC31\uC2E0 FileChooser.helpButtonText=\uB3C4\uC6C0\uB9D0 FileChooser.pathLabelText=\uACBD\uB85C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uC785\uB825: +FileChooser.pathLabelMnemonic=80 FileChooser.filterLabelText=\uD544\uD130 +FileChooser.filterLabelMnemonic=82 FileChooser.foldersLabelText=\uD3F4\uB354 +FileChooser.foldersLabelMnemonic=76 FileChooser.filesLabelText=\uD30C\uC77C +FileChooser.filesLabelMnemonic=73 FileChooser.enterFileNameLabelText=\uD30C\uC77C \uC774\uB984 \uC785\uB825: +FileChooser.enterFileNameLabelMnemonic=78 FileChooser.enterFolderNameLabelText=\uD3F4\uB354 \uC774\uB984 \uC785\uB825: FileChooser.cancelButtonToolTipText=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties Fri Sep 09 17:44:11 2011 +0400 @@ -27,10 +27,15 @@ FileChooser.updateButtonText=Atualizar FileChooser.helpButtonText=Ajuda FileChooser.pathLabelText=Informar caminho ou nome da pasta: +FileChooser.pathLabelMnemonic=80 FileChooser.filterLabelText=Filtro +FileChooser.filterLabelMnemonic=82 FileChooser.foldersLabelText=Pastas +FileChooser.foldersLabelMnemonic=76 FileChooser.filesLabelText=Arquivos +FileChooser.filesLabelMnemonic=73 FileChooser.enterFileNameLabelText=Informar nome do arquivo: +FileChooser.enterFileNameLabelMnemonic=78 FileChooser.enterFolderNameLabelText=Informar nome da pasta: FileChooser.cancelButtonToolTipText=Abortar caixa de di\u00E1logo do seletor de arquivos.
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties Fri Sep 09 17:44:11 2011 +0400 @@ -27,10 +27,15 @@ FileChooser.updateButtonText=Uppdatera FileChooser.helpButtonText=Hj\u00E4lp FileChooser.pathLabelText=Ange s\u00F6kv\u00E4g eller mappnamn: +FileChooser.pathLabelMnemonic=80 FileChooser.filterLabelText=Filter +FileChooser.filterLabelMnemonic=82 FileChooser.foldersLabelText=Mappar +FileChooser.foldersLabelMnemonic=76 FileChooser.filesLabelText=Filer +FileChooser.filesLabelMnemonic=73 FileChooser.enterFileNameLabelText=Ange filnamn: +FileChooser.enterFileNameLabelMnemonic=78 FileChooser.enterFolderNameLabelText=Ange ett mappnamn: FileChooser.cancelButtonToolTipText=Avbryt dialogrutan Filv\u00E4ljare.
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties Fri Sep 09 17:44:11 2011 +0400 @@ -27,10 +27,15 @@ FileChooser.updateButtonText=\u66F4\u65B0 FileChooser.helpButtonText=\u5E2E\u52A9 FileChooser.pathLabelText=\u952E\u5165\u8DEF\u5F84\u6216\u6587\u4EF6\u5939\u540D: +FileChooser.pathLabelMnemonic=80 FileChooser.filterLabelText=\u7B5B\u9009\u5668 +FileChooser.filterLabelMnemonic=82 FileChooser.foldersLabelText=\u6587\u4EF6\u5939 +FileChooser.foldersLabelMnemonic=76 FileChooser.filesLabelText=\u6587\u4EF6 +FileChooser.filesLabelMnemonic=73 FileChooser.enterFileNameLabelText=\u952E\u5165\u6587\u4EF6\u540D: +FileChooser.enterFileNameLabelMnemonic=78 FileChooser.enterFolderNameLabelText=\u8F93\u5165\u6587\u4EF6\u5939\u540D: FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties Fri Sep 09 17:44:11 2011 +0400 @@ -27,10 +27,15 @@ FileChooser.updateButtonText=\u66F4\u65B0 FileChooser.helpButtonText=\u8AAA\u660E FileChooser.pathLabelText=\u8F38\u5165\u8DEF\u5F91\u6216\u8CC7\u6599\u593E\u540D\u7A31: +FileChooser.pathLabelMnemonic=80 FileChooser.filterLabelText=\u7BE9\u9078 +FileChooser.filterLabelMnemonic=82 FileChooser.foldersLabelText=\u8CC7\u6599\u593E +FileChooser.foldersLabelMnemonic=76 FileChooser.filesLabelText=\u6A94\u6848 +FileChooser.filesLabelMnemonic=73 FileChooser.enterFileNameLabelText=\u8F38\u5165\u6A94\u6848\u540D\u7A31: +FileChooser.enterFileNameLabelMnemonic=78 FileChooser.enterFolderNameLabelText=\u8F38\u5165\u8CC7\u6599\u593E\u540D\u7A31: FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java Fri Sep 09 17:44:11 2011 +0400 @@ -528,16 +528,16 @@ Locale l = fc.getLocale(); - lookInLabelMnemonic = UIManager.getInt("FileChooser.lookInLabelMnemonic"); + lookInLabelMnemonic = getMnemonic("FileChooser.lookInLabelMnemonic", l); lookInLabelText = UIManager.getString("FileChooser.lookInLabelText",l); saveInLabelText = UIManager.getString("FileChooser.saveInLabelText",l); - fileNameLabelMnemonic = UIManager.getInt("FileChooser.fileNameLabelMnemonic"); + fileNameLabelMnemonic = getMnemonic("FileChooser.fileNameLabelMnemonic", l); fileNameLabelText = UIManager.getString("FileChooser.fileNameLabelText",l); - folderNameLabelMnemonic = UIManager.getInt("FileChooser.folderNameLabelMnemonic"); + folderNameLabelMnemonic = getMnemonic("FileChooser.folderNameLabelMnemonic", l); folderNameLabelText = UIManager.getString("FileChooser.folderNameLabelText",l); - filesOfTypeLabelMnemonic = UIManager.getInt("FileChooser.filesOfTypeLabelMnemonic"); + filesOfTypeLabelMnemonic = getMnemonic("FileChooser.filesOfTypeLabelMnemonic", l); filesOfTypeLabelText = UIManager.getString("FileChooser.filesOfTypeLabelText",l); upFolderToolTipText = UIManager.getString("FileChooser.upFolderToolTipText",l); @@ -550,6 +550,10 @@ viewMenuButtonAccessibleName = UIManager.getString("FileChooser.viewMenuButtonAccessibleName",l); } + private Integer getMnemonic(String key, Locale l) { + return SwingUtilities2.getUIDefaultsInt(key, l); + } + protected void installListeners(JFileChooser fc) { super.installListeners(fc); ActionMap actionMap = getActionMap();
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Fri Sep 09 17:44:11 2011 +0400 @@ -770,9 +770,6 @@ "icons/NewFolder.gif"), "FileChooser.useSystemExtensionHiding", Boolean.TRUE, - "FileChooser.lookInLabelMnemonic", Integer.valueOf(KeyEvent.VK_I), - "FileChooser.fileNameLabelMnemonic", Integer.valueOf(KeyEvent.VK_N), - "FileChooser.filesOfTypeLabelMnemonic", Integer.valueOf(KeyEvent.VK_T), "FileChooser.usesSingleFilePane", Boolean.TRUE, "FileChooser.noPlacesBar", new DesktopProperty("win.comdlg.noPlacesBar", Boolean.FALSE),
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Look in: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Save in: FileChooser.fileNameLabelText=File name: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Folder name: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Files of type: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Up One Level FileChooser.upFolderAccessibleName=Up FileChooser.homeFolderToolTipText=Home
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Suchen in: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Speichern in: FileChooser.fileNameLabelText=Dateiname: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Ordnername: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Dateityp: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Eine Ebene h\u00F6her FileChooser.upFolderAccessibleName=Nach oben FileChooser.homeFolderToolTipText=Home
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Buscar en: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Guardar en: FileChooser.fileNameLabelText=Nombre de Archivo: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Nombre de la Carpeta: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Archivos de Tipo: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Subir un Nivel FileChooser.upFolderAccessibleName=Arriba FileChooser.homeFolderToolTipText=Inicio
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Rechercher dans : +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Enregistrer dans : FileChooser.fileNameLabelText=Nom du fichier : +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Nom du dossier : +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Fichiers de type : +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Remonte d'un niveau. FileChooser.upFolderAccessibleName=Monter FileChooser.homeFolderToolTipText=R\u00E9pertoire d'origine
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Cerca in: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Salva in: FileChooser.fileNameLabelText=Nome file: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Nome della cartella: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Tipo file: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Cartella superiore FileChooser.upFolderAccessibleName=Superiore FileChooser.homeFolderToolTipText=Home
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=\u53C2\u7167: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=\u4FDD\u5B58: FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=1\u30EC\u30D9\u30EB\u4E0A\u3078 FileChooser.upFolderAccessibleName=\u4E0A\u3078 FileChooser.homeFolderToolTipText=\u30DB\u30FC\u30E0
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=\uAC80\uC0C9 \uC704\uCE58: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=\uC800\uC7A5 \uC704\uCE58: FileChooser.fileNameLabelText=\uD30C\uC77C \uC774\uB984: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=\uD3F4\uB354 \uC774\uB984: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uC720\uD615: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=\uD55C \uB808\uBCA8 \uC704\uB85C FileChooser.upFolderAccessibleName=\uC704\uB85C FileChooser.homeFolderToolTipText=\uD648
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Consultar em: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Salvar em: FileChooser.fileNameLabelText=Nome do arquivo: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Nome da pasta: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Arquivos do tipo: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Um N\u00EDvel Acima FileChooser.upFolderAccessibleName=Acima FileChooser.homeFolderToolTipText=In\u00EDcio
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Leta i: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Spara i: FileChooser.fileNameLabelText=Filnamn: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Mapp: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Filformat: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Upp en niv\u00E5 FileChooser.upFolderAccessibleName=Upp FileChooser.homeFolderToolTipText=Hem
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=\u67E5\u770B: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=\u4FDD\u5B58: FileChooser.fileNameLabelText=\u6587\u4EF6\u540D: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=\u6587\u4EF6\u5939\u540D: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=\u6587\u4EF6\u7C7B\u578B: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=\u5411\u4E0A\u4E00\u7EA7 FileChooser.upFolderAccessibleName=\u5411\u4E0A FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u5F55
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=\u67E5\u8A62: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=\u5132\u5B58\u65BC: FileChooser.fileNameLabelText=\u6A94\u6848\u540D\u7A31: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=\u8CC7\u6599\u593E\u540D\u7A31: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=\u6A94\u6848\u985E\u578B: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=\u5F80\u4E0A\u4E00\u5C64 FileChooser.upFolderAccessibleName=\u5F80\u4E0A FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u9304
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Look In: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Save In: FileChooser.fileNameLabelText=File Name: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Folder name: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Files of Type: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Up One Level FileChooser.upFolderAccessibleName=Up FileChooser.homeFolderToolTipText=Home
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Suchen in: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Speichern in: FileChooser.fileNameLabelText=Dateiname: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Ordnername: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Dateityp: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Eine Ebene h\u00F6her FileChooser.upFolderAccessibleName=Nach oben FileChooser.homeFolderToolTipText=Home
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Buscar en: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Guardar en: FileChooser.fileNameLabelText=Nombre de Archivo: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Nombre de la Carpeta: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Archivos de Tipo: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Subir un Nivel FileChooser.upFolderAccessibleName=Arriba FileChooser.homeFolderToolTipText=Inicio
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Rechercher dans : +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Enregistrer dans : FileChooser.fileNameLabelText=Nom du fichier : +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Nom du dossier : +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Fichiers de type : +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Remonte d'un niveau. FileChooser.upFolderAccessibleName=Monter FileChooser.homeFolderToolTipText=R\u00E9pertoire d'origine
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Cerca in: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Salva in: FileChooser.fileNameLabelText=Nome file: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Nome della cartella: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Tipo file: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Cartella superiore FileChooser.upFolderAccessibleName=Superiore FileChooser.homeFolderToolTipText=Home
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=\u53C2\u7167: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=\u4FDD\u5B58: FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=1\u30EC\u30D9\u30EB\u4E0A\u3078 FileChooser.upFolderAccessibleName=\u4E0A\u3078 FileChooser.homeFolderToolTipText=\u30DB\u30FC\u30E0
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=\uAC80\uC0C9 \uC704\uCE58: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=\uC800\uC7A5 \uC704\uCE58: FileChooser.fileNameLabelText=\uD30C\uC77C \uC774\uB984: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=\uD3F4\uB354 \uC774\uB984: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uC720\uD615: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=\uD55C \uB808\uBCA8 \uC704\uB85C FileChooser.upFolderAccessibleName=\uC704\uB85C FileChooser.homeFolderToolTipText=\uD648
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Consultar Em: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Salvar Em: FileChooser.fileNameLabelText=Nome do Arquivo: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Nome da pasta: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Arquivos do Tipo: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Um N\u00EDvel Acima FileChooser.upFolderAccessibleName=Acima FileChooser.homeFolderToolTipText=In\u00EDcio
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=Leta i: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=Spara i: FileChooser.fileNameLabelText=Filnamn: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=Mapp: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=Filformat: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=Upp en niv\u00E5 FileChooser.upFolderAccessibleName=Upp FileChooser.homeFolderToolTipText=Hem
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=\u67E5\u770B: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=\u4FDD\u5B58: FileChooser.fileNameLabelText=\u6587\u4EF6\u540D: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=\u6587\u4EF6\u5939\u540D: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=\u6587\u4EF6\u7C7B\u578B: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=\u5411\u4E0A\u4E00\u7EA7 FileChooser.upFolderAccessibleName=\u5411\u4E0A FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u5F55
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties Fri Sep 09 17:44:11 2011 +0400 @@ -19,10 +19,14 @@ ############ FILE CHOOSER STRINGS ############# FileChooser.lookInLabelText=\u67E5\u8A62: +FileChooser.lookInLabelMnemonic=73 FileChooser.saveInLabelText=\u5132\u5B58\u65BC: FileChooser.fileNameLabelText=\u6A94\u6848\u540D\u7A31: +FileChooser.fileNameLabelMnemonic=78 FileChooser.folderNameLabelText=\u8CC7\u6599\u593E\u540D\u7A31: +FileChooser.folderNameLabelMnemonic=78 FileChooser.filesOfTypeLabelText=\u6A94\u6848\u985E\u578B: +FileChooser.filesOfTypeLabelMnemonic=84 FileChooser.upFolderToolTipText=\u5F80\u4E0A\u4E00\u5C64 FileChooser.upFolderAccessibleName=\u5F80\u4E0A FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u9304
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java Fri Sep 09 17:44:11 2011 +0400 @@ -461,16 +461,16 @@ Locale l = fc.getLocale(); - lookInLabelMnemonic = UIManager.getInt("FileChooser.lookInLabelMnemonic"); + lookInLabelMnemonic = getMnemonic("FileChooser.lookInLabelMnemonic", l); lookInLabelText = UIManager.getString("FileChooser.lookInLabelText",l); saveInLabelText = UIManager.getString("FileChooser.saveInLabelText",l); - fileNameLabelMnemonic = UIManager.getInt("FileChooser.fileNameLabelMnemonic"); + fileNameLabelMnemonic = getMnemonic("FileChooser.fileNameLabelMnemonic", l); fileNameLabelText = UIManager.getString("FileChooser.fileNameLabelText",l); - folderNameLabelMnemonic = UIManager.getInt("FileChooser.folderNameLabelMnemonic"); + folderNameLabelMnemonic = getMnemonic("FileChooser.folderNameLabelMnemonic", l); folderNameLabelText = UIManager.getString("FileChooser.folderNameLabelText",l); - filesOfTypeLabelMnemonic = UIManager.getInt("FileChooser.filesOfTypeLabelMnemonic"); + filesOfTypeLabelMnemonic = getMnemonic("FileChooser.filesOfTypeLabelMnemonic", l); filesOfTypeLabelText = UIManager.getString("FileChooser.filesOfTypeLabelText",l); upFolderToolTipText = UIManager.getString("FileChooser.upFolderToolTipText",l); @@ -489,6 +489,10 @@ detailsViewButtonAccessibleName = UIManager.getString("FileChooser.detailsViewButtonAccessibleName",l); } + private Integer getMnemonic(String key, Locale l) { + return SwingUtilities2.getUIDefaultsInt(key, l); + } + protected void installListeners(JFileChooser fc) { super.installListeners(fc); ActionMap actionMap = getActionMap();
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Wed Sep 07 03:17:21 2011 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Fri Sep 09 17:44:11 2011 +0400 @@ -844,9 +844,6 @@ "FileChooser.newFolderIcon", new SwingLazyValue("javax.swing.plaf.metal.MetalIconFactory", "getFileChooserNewFolderIcon"), "FileChooser.upFolderIcon", new SwingLazyValue("javax.swing.plaf.metal.MetalIconFactory", "getFileChooserUpFolderIcon"), - "FileChooser.lookInLabelMnemonic", new Integer(KeyEvent.VK_I), - "FileChooser.fileNameLabelMnemonic", new Integer(KeyEvent.VK_N), - "FileChooser.filesOfTypeLabelMnemonic", new Integer(KeyEvent.VK_T), "FileChooser.usesSingleFilePane", Boolean.TRUE, "FileChooser.ancestorInputMap", new UIDefaults.LazyInputMap(new Object[] {