Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 6427:1724fd827e84
7024118: possible hardcoded mnemonic for JFileChooser metal and motif l&f
Reviewed-by: rupashka
line wrap: on
line diff
--- a/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java Fri Nov 15 13:31:41 2013 +0400 +++ b/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/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java Fri Nov 15 13:31:41 2013 +0400 +++ b/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/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties Fri Sep 09 17:44:11 2011 +0400 @@ -26,11 +26,11 @@ FileChooser.openDialogTitle.textAndMnemonic=Open FileChooser.updateButton.textAndMnemonic=Update FileChooser.helpButton.textAndMnemonic=Help -FileChooser.pathLabel.textAndMnemonic=Enter path or folder name: -FileChooser.filterLabel.textAndMnemonic=Filter -FileChooser.foldersLabel.textAndMnemonic=Folders -FileChooser.filesLabel.textAndMnemonic=Files -FileChooser.enterFileNameLabel.textAndMnemonic=Enter file name: +FileChooser.pathLabel.textAndMnemonic=Enter &path or folder name: +FileChooser.filterLabel.textAndMnemonic=Filte&r +FileChooser.foldersLabel.textAndMnemonic=Fo&lders +FileChooser.filesLabel.textAndMnemonic=F&iles +FileChooser.enterFileNameLabel.textAndMnemonic=E&nter file name: FileChooser.enterFolderNameLabel.textAndMnemonic=Enter folder name: FileChooser.cancelButtonToolTip.textAndMnemonic=Abort file chooser dialog.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties Fri Sep 09 17:44:11 2011 +0400 @@ -26,11 +26,11 @@ FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen FileChooser.updateButton.textAndMnemonic=Aktualisieren FileChooser.helpButton.textAndMnemonic=Hilfe -FileChooser.pathLabel.textAndMnemonic=Pfad- oder Ordnernamen eingeben: -FileChooser.filterLabel.textAndMnemonic=Filter -FileChooser.foldersLabel.textAndMnemonic=Ordner -FileChooser.filesLabel.textAndMnemonic=Dateien -FileChooser.enterFileNameLabel.textAndMnemonic=Dateinamen eingeben: +FileChooser.pathLabel.textAndMnemonic=&Pfad- oder Ordnernamen eingeben: +FileChooser.filterLabel.textAndMnemonic=Filte&r +FileChooser.foldersLabel.textAndMnemonic=Ordner(&L) +FileChooser.filesLabel.textAndMnemonic=Date&ien +FileChooser.enterFileNameLabel.textAndMnemonic=Datei&namen eingeben: FileChooser.enterFolderNameLabel.textAndMnemonic=Ordnernamen eingeben: FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties Fri Sep 09 17:44:11 2011 +0400 @@ -26,11 +26,11 @@ FileChooser.openDialogTitle.textAndMnemonic=Abrir FileChooser.updateButton.textAndMnemonic=Actualizar FileChooser.helpButton.textAndMnemonic=Ayuda -FileChooser.pathLabel.textAndMnemonic=Introducir nombre de la ruta de acceso o carpeta: -FileChooser.filterLabel.textAndMnemonic=Filtro -FileChooser.foldersLabel.textAndMnemonic=Carpetas -FileChooser.filesLabel.textAndMnemonic=Archivos -FileChooser.enterFileNameLabel.textAndMnemonic=Introducir nombre de archivo: +FileChooser.pathLabel.textAndMnemonic=Introducir nombre de la ruta de acceso o car&peta: +FileChooser.filterLabel.textAndMnemonic=Filt&ro +FileChooser.foldersLabel.textAndMnemonic=Carpetas(&L) +FileChooser.filesLabel.textAndMnemonic=Arch&ivos +FileChooser.enterFileNameLabel.textAndMnemonic=I&ntroducir nombre de archivo: FileChooser.enterFolderNameLabel.textAndMnemonic=Introducir nombre de carpeta: FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar cuadro de di\u00E1logo del selector de archivos.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties Fri Sep 09 17:44:11 2011 +0400 @@ -26,11 +26,11 @@ FileChooser.openDialogTitle.textAndMnemonic=Ouvrir FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jour FileChooser.helpButton.textAndMnemonic=Aide -FileChooser.pathLabel.textAndMnemonic=Entrez le chemin ou le nom du dossier : -FileChooser.filterLabel.textAndMnemonic=Filtre -FileChooser.foldersLabel.textAndMnemonic=Dossiers -FileChooser.filesLabel.textAndMnemonic=Fichiers -FileChooser.enterFileNameLabel.textAndMnemonic=Entrez le nom du fichier : +FileChooser.pathLabel.textAndMnemonic=Entrez le chemin ou le nom du dossier (&P): +FileChooser.filterLabel.textAndMnemonic=Filt&re +FileChooser.foldersLabel.textAndMnemonic=Dossiers(&L) +FileChooser.filesLabel.textAndMnemonic=Fich&iers +FileChooser.enterFileNameLabel.textAndMnemonic=E&ntrez le nom du fichier : FileChooser.enterFolderNameLabel.textAndMnemonic=Entrez le nom du dossier : FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties Fri Sep 09 17:44:11 2011 +0400 @@ -26,11 +26,11 @@ FileChooser.openDialogTitle.textAndMnemonic=Apri FileChooser.updateButton.textAndMnemonic=Aggiorna FileChooser.helpButton.textAndMnemonic=? -FileChooser.pathLabel.textAndMnemonic=Percorso o nome cartella: -FileChooser.filterLabel.textAndMnemonic=Filtro -FileChooser.foldersLabel.textAndMnemonic=Cartelle -FileChooser.filesLabel.textAndMnemonic=File -FileChooser.enterFileNameLabel.textAndMnemonic=Nome file: +FileChooser.pathLabel.textAndMnemonic=&Percorso o nome cartella: +FileChooser.filterLabel.textAndMnemonic=Filt&ro +FileChooser.foldersLabel.textAndMnemonic=Carte&lle +FileChooser.filesLabel.textAndMnemonic=F&ile +FileChooser.enterFileNameLabel.textAndMnemonic=&Nome file: FileChooser.enterFolderNameLabel.textAndMnemonic=Nome cartella: FileChooser.cancelButtonToolTip.textAndMnemonic=Chiude la finestra di dialogo di selezione file.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties Fri Sep 09 17:44:11 2011 +0400 @@ -26,11 +26,11 @@ FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0 FileChooser.helpButton.textAndMnemonic=\u30D8\u30EB\u30D7 -FileChooser.pathLabel.textAndMnemonic=\u30D1\u30B9\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B: -FileChooser.filterLabel.textAndMnemonic=\u30D5\u30A3\u30EB\u30BF -FileChooser.foldersLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0 -FileChooser.filesLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB -FileChooser.enterFileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u5165\u529B: +FileChooser.pathLabel.textAndMnemonic=\u30D1\u30B9\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B(&P): +FileChooser.filterLabel.textAndMnemonic=\u30D5\u30A3\u30EB\u30BF(&R) +FileChooser.foldersLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0(&L) +FileChooser.filesLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB(&I) +FileChooser.enterFileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u5165\u529B(&N): FileChooser.enterFolderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B: FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties Fri Sep 09 17:44:11 2011 +0400 @@ -26,11 +26,11 @@ FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30 FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0 FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0 -FileChooser.pathLabel.textAndMnemonic=\uACBD\uB85C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uC785\uB825: -FileChooser.filterLabel.textAndMnemonic=\uD544\uD130 -FileChooser.foldersLabel.textAndMnemonic=\uD3F4\uB354 -FileChooser.filesLabel.textAndMnemonic=\uD30C\uC77C -FileChooser.enterFileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984 \uC785\uB825: +FileChooser.pathLabel.textAndMnemonic=\uACBD\uB85C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uC785\uB825(&P): +FileChooser.filterLabel.textAndMnemonic=\uD544\uD130(&R) +FileChooser.foldersLabel.textAndMnemonic=\uD3F4\uB354(&L) +FileChooser.filesLabel.textAndMnemonic=\uD30C\uC77C(&I) +FileChooser.enterFileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984 \uC785\uB825(&N): FileChooser.enterFolderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984 \uC785\uB825: FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties Fri Sep 09 17:44:11 2011 +0400 @@ -26,11 +26,11 @@ FileChooser.openDialogTitle.textAndMnemonic=Abrir FileChooser.updateButton.textAndMnemonic=Atualizar FileChooser.helpButton.textAndMnemonic=Ajuda -FileChooser.pathLabel.textAndMnemonic=Informar caminho ou nome da pasta: -FileChooser.filterLabel.textAndMnemonic=Filtro -FileChooser.foldersLabel.textAndMnemonic=Pastas -FileChooser.filesLabel.textAndMnemonic=Arquivos -FileChooser.enterFileNameLabel.textAndMnemonic=Informar nome do arquivo: +FileChooser.pathLabel.textAndMnemonic=Informar caminho ou nome da &pasta: +FileChooser.filterLabel.textAndMnemonic=Filt&ro +FileChooser.foldersLabel.textAndMnemonic=Pastas(&L) +FileChooser.filesLabel.textAndMnemonic=Arqu&ivos +FileChooser.enterFileNameLabel.textAndMnemonic=I&nformar nome do arquivo: FileChooser.enterFolderNameLabel.textAndMnemonic=Informar nome da pasta: FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties Fri Sep 09 17:44:11 2011 +0400 @@ -26,11 +26,11 @@ FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna FileChooser.updateButton.textAndMnemonic=Uppdatera FileChooser.helpButton.textAndMnemonic=Hj\u00E4lp -FileChooser.pathLabel.textAndMnemonic=Ange s\u00F6kv\u00E4g eller mappnamn: -FileChooser.filterLabel.textAndMnemonic=Filter -FileChooser.foldersLabel.textAndMnemonic=Mappar -FileChooser.filesLabel.textAndMnemonic=Filer -FileChooser.enterFileNameLabel.textAndMnemonic=Ange filnamn: +FileChooser.pathLabel.textAndMnemonic=Ange s\u00F6kv\u00E4g eller mappnamn(&P): +FileChooser.filterLabel.textAndMnemonic=Filte&r +FileChooser.foldersLabel.textAndMnemonic=Mappar(&L) +FileChooser.filesLabel.textAndMnemonic=F&iler +FileChooser.enterFileNameLabel.textAndMnemonic=A&nge filnamn: FileChooser.enterFolderNameLabel.textAndMnemonic=Ange ett mappnamn: FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan Filv\u00E4ljare.
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties Fri Sep 09 17:44:11 2011 +0400 @@ -26,11 +26,11 @@ FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00 FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0 FileChooser.helpButton.textAndMnemonic=\u5E2E\u52A9 -FileChooser.pathLabel.textAndMnemonic=\u952E\u5165\u8DEF\u5F84\u6216\u6587\u4EF6\u5939\u540D: -FileChooser.filterLabel.textAndMnemonic=\u7B5B\u9009\u5668 -FileChooser.foldersLabel.textAndMnemonic=\u6587\u4EF6\u5939 -FileChooser.filesLabel.textAndMnemonic=\u6587\u4EF6 -FileChooser.enterFileNameLabel.textAndMnemonic=\u952E\u5165\u6587\u4EF6\u540D: +FileChooser.pathLabel.textAndMnemonic=\u952E\u5165\u8DEF\u5F84\u6216\u6587\u4EF6\u5939\u540D: (&P) +FileChooser.filterLabel.textAndMnemonic=\u7B5B\u9009\u5668(&R) +FileChooser.foldersLabel.textAndMnemonic=\u6587\u4EF6\u5939(&L) +FileChooser.filesLabel.textAndMnemonic=\u6587\u4EF6(&I) +FileChooser.enterFileNameLabel.textAndMnemonic=\u952E\u5165\u6587\u4EF6\u540D: (&N) FileChooser.enterFolderNameLabel.textAndMnemonic=\u8F93\u5165\u6587\u4EF6\u5939\u540D: FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
--- a/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties Fri Sep 09 17:44:11 2011 +0400 @@ -26,11 +26,11 @@ FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0 FileChooser.helpButton.textAndMnemonic=\u8AAA\u660E -FileChooser.pathLabel.textAndMnemonic=\u8F38\u5165\u8DEF\u5F91\u6216\u8CC7\u6599\u593E\u540D\u7A31: -FileChooser.filterLabel.textAndMnemonic=\u7BE9\u9078 -FileChooser.foldersLabel.textAndMnemonic=\u8CC7\u6599\u593E -FileChooser.filesLabel.textAndMnemonic=\u6A94\u6848 -FileChooser.enterFileNameLabel.textAndMnemonic=\u8F38\u5165\u6A94\u6848\u540D\u7A31: +FileChooser.pathLabel.textAndMnemonic=\u8F38\u5165\u8DEF\u5F91\u6216\u8CC7\u6599\u593E\u540D\u7A31(&P): +FileChooser.filterLabel.textAndMnemonic=\u7BE9\u9078(&R) +FileChooser.foldersLabel.textAndMnemonic=\u8CC7\u6599\u593E(&L) +FileChooser.filesLabel.textAndMnemonic=\u6A94\u6848(&I) +FileChooser.enterFileNameLabel.textAndMnemonic=\u8F38\u5165\u6A94\u6848\u540D\u7A31(&N): FileChooser.enterFolderNameLabel.textAndMnemonic=\u8F38\u5165\u8CC7\u6599\u593E\u540D\u7A31: FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
--- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java Fri Nov 15 13:31:41 2013 +0400 +++ b/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/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Fri Sep 09 17:44:11 2011 +0400 @@ -773,9 +773,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/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Look in: +FileChooser.lookInLabel.textAndMnemonic=Look &in: FileChooser.saveInLabel.textAndMnemonic=Save in: -FileChooser.fileNameLabel.textAndMnemonic=File name: -FileChooser.folderNameLabel.textAndMnemonic=Folder name: -FileChooser.filesOfTypeLabel.textAndMnemonic=Files of type: +FileChooser.fileNameLabel.textAndMnemonic=File &name: +FileChooser.folderNameLabel.textAndMnemonic=Folder &name: +FileChooser.filesOfTypeLabel.textAndMnemonic=Files of &type: FileChooser.upFolderToolTip.textAndMnemonic=Up One Level FileChooser.upFolderAccessibleName=Up FileChooser.homeFolderToolTip.textAndMnemonic=Home
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Suchen in: +FileChooser.lookInLabel.textAndMnemonic=Suchen &in: FileChooser.saveInLabel.textAndMnemonic=Speichern in: -FileChooser.fileNameLabel.textAndMnemonic=Dateiname: -FileChooser.folderNameLabel.textAndMnemonic=Ordnername: -FileChooser.filesOfTypeLabel.textAndMnemonic=Dateityp: +FileChooser.fileNameLabel.textAndMnemonic=Datei&name: +FileChooser.folderNameLabel.textAndMnemonic=Ord&nername: +FileChooser.filesOfTypeLabel.textAndMnemonic=Da&teityp: FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her FileChooser.upFolderAccessibleName=Nach oben FileChooser.homeFolderToolTip.textAndMnemonic=Home
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Buscar en: +FileChooser.lookInLabel.textAndMnemonic=Buscar en(&I): FileChooser.saveInLabel.textAndMnemonic=Guardar en: -FileChooser.fileNameLabel.textAndMnemonic=Nombre de Archivo: -FileChooser.folderNameLabel.textAndMnemonic=Nombre de la Carpeta: -FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de Tipo: +FileChooser.fileNameLabel.textAndMnemonic=&Nombre de Archivo: +FileChooser.folderNameLabel.textAndMnemonic=&Nombre de la Carpeta: +FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &Tipo: FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel FileChooser.upFolderAccessibleName=Arriba FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Rechercher dans : +FileChooser.lookInLabel.textAndMnemonic=Rechercher dans (&I): FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans : -FileChooser.fileNameLabel.textAndMnemonic=Nom du fichier : -FileChooser.folderNameLabel.textAndMnemonic=Nom du dossier : -FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de type : +FileChooser.fileNameLabel.textAndMnemonic=&Nom du fichier : +FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier : +FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de &type : FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau. FileChooser.upFolderAccessibleName=Monter FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Cerca in: +FileChooser.lookInLabel.textAndMnemonic=Cerca &in: FileChooser.saveInLabel.textAndMnemonic=Salva in: -FileChooser.fileNameLabel.textAndMnemonic=Nome file: -FileChooser.folderNameLabel.textAndMnemonic=Nome della cartella: -FileChooser.filesOfTypeLabel.textAndMnemonic=Tipo file: +FileChooser.fileNameLabel.textAndMnemonic=&Nome file: +FileChooser.folderNameLabel.textAndMnemonic=&Nome della cartella: +FileChooser.filesOfTypeLabel.textAndMnemonic=&Tipo file: FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore FileChooser.upFolderAccessibleName=Superiore FileChooser.homeFolderToolTip.textAndMnemonic=Home
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167: +FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167(&I): FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: -FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D: -FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D: -FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7: +FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N): +FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7(&T): FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078 FileChooser.upFolderAccessibleName=\u4E0A\u3078 FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58: +FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58(&I): FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58: -FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984: -FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984: -FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615: +FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N): +FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615(&T): FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C FileChooser.upFolderAccessibleName=\uC704\uB85C FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Consultar em: +FileChooser.lookInLabel.textAndMnemonic=Consultar em(&I): FileChooser.saveInLabel.textAndMnemonic=Salvar em: -FileChooser.fileNameLabel.textAndMnemonic=Nome do arquivo: -FileChooser.folderNameLabel.textAndMnemonic=Nome da pasta: -FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do tipo: +FileChooser.fileNameLabel.textAndMnemonic=&Nome do arquivo: +FileChooser.folderNameLabel.textAndMnemonic=&Nome da pasta: +FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do &tipo: FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima FileChooser.upFolderAccessibleName=Acima FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Leta i: +FileChooser.lookInLabel.textAndMnemonic=Leta &i: FileChooser.saveInLabel.textAndMnemonic=Spara i: -FileChooser.fileNameLabel.textAndMnemonic=Filnamn: -FileChooser.folderNameLabel.textAndMnemonic=Mapp: -FileChooser.filesOfTypeLabel.textAndMnemonic=Filformat: +FileChooser.fileNameLabel.textAndMnemonic=Fil&namn: +FileChooser.folderNameLabel.textAndMnemonic=Mapp(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=Filforma&t: FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5 FileChooser.upFolderAccessibleName=Upp FileChooser.homeFolderToolTip.textAndMnemonic=Hem
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B: +FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B: (&I) FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: -FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D: -FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D: -FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B: +FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D: (&N) +FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D: (&N) +FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B: (&T) FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7 FileChooser.upFolderAccessibleName=\u5411\u4E0A FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
--- a/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62: +FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I): FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC: -FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31: -FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31: -FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B: +FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N): +FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T): FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64 FileChooser.upFolderAccessibleName=\u5F80\u4E0A FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Look In: +FileChooser.lookInLabel.textAndMnemonic=Look &In: FileChooser.saveInLabel.textAndMnemonic=Save In: -FileChooser.fileNameLabel.textAndMnemonic=File Name: -FileChooser.folderNameLabel.textAndMnemonic=Folder name: -FileChooser.filesOfTypeLabel.textAndMnemonic=Files of Type: +FileChooser.fileNameLabel.textAndMnemonic=File &Name: +FileChooser.folderNameLabel.textAndMnemonic=Folder &name: +FileChooser.filesOfTypeLabel.textAndMnemonic=Files of &Type: FileChooser.upFolderToolTip.textAndMnemonic=Up One Level FileChooser.upFolderAccessibleName=Up FileChooser.homeFolderToolTip.textAndMnemonic=Home
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Suchen in: +FileChooser.lookInLabel.textAndMnemonic=Suchen &in: FileChooser.saveInLabel.textAndMnemonic=Speichern in: -FileChooser.fileNameLabel.textAndMnemonic=Dateiname: -FileChooser.folderNameLabel.textAndMnemonic=Ordnername: -FileChooser.filesOfTypeLabel.textAndMnemonic=Dateityp: +FileChooser.fileNameLabel.textAndMnemonic=Datei&name: +FileChooser.folderNameLabel.textAndMnemonic=Ord&nername: +FileChooser.filesOfTypeLabel.textAndMnemonic=Da&teityp: FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her FileChooser.upFolderAccessibleName=Nach oben FileChooser.homeFolderToolTip.textAndMnemonic=Home
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Buscar en: +FileChooser.lookInLabel.textAndMnemonic=Buscar en(&I): FileChooser.saveInLabel.textAndMnemonic=Guardar en: -FileChooser.fileNameLabel.textAndMnemonic=Nombre de Archivo: -FileChooser.folderNameLabel.textAndMnemonic=Nombre de la Carpeta: -FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de Tipo: +FileChooser.fileNameLabel.textAndMnemonic=&Nombre de Archivo: +FileChooser.folderNameLabel.textAndMnemonic=&Nombre de la Carpeta: +FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &Tipo: FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel FileChooser.upFolderAccessibleName=Arriba FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Rechercher dans : +FileChooser.lookInLabel.textAndMnemonic=Rechercher dans (&I): FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans : -FileChooser.fileNameLabel.textAndMnemonic=Nom du fichier : -FileChooser.folderNameLabel.textAndMnemonic=Nom du dossier : -FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de type : +FileChooser.fileNameLabel.textAndMnemonic=&Nom du fichier : +FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier : +FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de &type : FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau. FileChooser.upFolderAccessibleName=Monter FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Cerca in: +FileChooser.lookInLabel.textAndMnemonic=Cerca &in: FileChooser.saveInLabel.textAndMnemonic=Salva in: -FileChooser.fileNameLabel.textAndMnemonic=Nome file: -FileChooser.folderNameLabel.textAndMnemonic=Nome della cartella: -FileChooser.filesOfTypeLabel.textAndMnemonic=Tipo file: +FileChooser.fileNameLabel.textAndMnemonic=&Nome file: +FileChooser.folderNameLabel.textAndMnemonic=&Nome della cartella: +FileChooser.filesOfTypeLabel.textAndMnemonic=&Tipo file: FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore FileChooser.upFolderAccessibleName=Superiore FileChooser.homeFolderToolTip.textAndMnemonic=Home
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167: +FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167(&I): FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: -FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D: -FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D: -FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7: +FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N): +FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7(&T): FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078 FileChooser.upFolderAccessibleName=\u4E0A\u3078 FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58: +FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58(&I): FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58: -FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984: -FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984: -FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615: +FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N): +FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615(&T): FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C FileChooser.upFolderAccessibleName=\uC704\uB85C FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Consultar Em: +FileChooser.lookInLabel.textAndMnemonic=Consultar Em(&I): FileChooser.saveInLabel.textAndMnemonic=Salvar Em: -FileChooser.fileNameLabel.textAndMnemonic=Nome do Arquivo: -FileChooser.folderNameLabel.textAndMnemonic=Nome da pasta: -FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do Tipo: +FileChooser.fileNameLabel.textAndMnemonic=&Nome do Arquivo: +FileChooser.folderNameLabel.textAndMnemonic=&Nome da pasta: +FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do &Tipo: FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima FileChooser.upFolderAccessibleName=Acima FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=Leta i: +FileChooser.lookInLabel.textAndMnemonic=Leta &i: FileChooser.saveInLabel.textAndMnemonic=Spara i: -FileChooser.fileNameLabel.textAndMnemonic=Filnamn: -FileChooser.folderNameLabel.textAndMnemonic=Mapp: -FileChooser.filesOfTypeLabel.textAndMnemonic=Filformat: +FileChooser.fileNameLabel.textAndMnemonic=Fil&namn: +FileChooser.folderNameLabel.textAndMnemonic=Mapp(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=Filforma&t: FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5 FileChooser.upFolderAccessibleName=Upp FileChooser.homeFolderToolTip.textAndMnemonic=Hem
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B: +FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B(&I): FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: -FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D: -FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D: -FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B: +FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N): +FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T): FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7 FileChooser.upFolderAccessibleName=\u5411\u4E0A FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
--- a/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties Fri Nov 15 13:31:41 2013 +0400 +++ b/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties Fri Sep 09 17:44:11 2011 +0400 @@ -18,11 +18,11 @@ ############ FILE CHOOSER STRINGS ############# -FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62: +FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I): FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC: -FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31: -FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31: -FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B: +FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N): +FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T): FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64 FileChooser.upFolderAccessibleName=\u5F80\u4E0A FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
--- a/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java Fri Nov 15 13:31:41 2013 +0400 +++ b/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/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Fri Nov 15 13:31:41 2013 +0400 +++ b/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[] {