Backporting S6642612 to icedtea6

[Dr Andrew John Hughes]

On 13:54 Mon 17 Jan     , Omair Majid wrote:
> Hi,
> 
> I would like to backport SS6642612 to icedtea6. The changeset makes the 
> OK and Cancel buttons in JFileChooser dialogs have the same size. The 
> patch is attached.
> 
> Ok to commit?
> 
> Cheers,
> Omair

Looks fine, though committing this will break the patch you posted previously.

> diff -r fd09f4a3b767 ChangeLog
> --- a/ChangeLog	Sun Jan 09 00:43:01 2011 +0000
> +++ b/ChangeLog	Mon Jan 17 13:30:24 2011 -0500
> @@ -1,3 +1,8 @@
> +2011-01-17  Omair Majid  <omajid at redhat.com>
> +
> +	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
> +	* patches/openjdk/6642612-filechooser_button_sizes.patch: New file.
> +
>  2011-01-07  Andrew John Hughes  <ahughes at redhat.com>
>  
>  	* patches/jtreg-TestXEmbedServer-fix.patch:
> diff -r fd09f4a3b767 Makefile.am
> --- a/Makefile.am	Sun Jan 09 00:43:01 2011 +0000
> +++ b/Makefile.am	Mon Jan 17 13:30:24 2011 -0500
> @@ -316,7 +316,8 @@
>  	patches/openjdk/6687968-pngimagereader_mem_leak.patch \
>  	patches/openjdk/6541476-png-iTXt-chunk.patch \
>  	patches/openjdk/6782079-png_metadata_oom.patch \
> -	patches/661505-jpeg.patch
> +	patches/661505-jpeg.patch \
> +	patches/openjdk/6642612-filechooser_button_sizes.patch
>  
>  if WITH_ALT_HSBUILD
>  ICEDTEA_PATCHES += \
> diff -r fd09f4a3b767 NEWS
> --- a/NEWS	Sun Jan 09 00:43:01 2011 +0000
> +++ b/NEWS	Mon Jan 17 13:30:24 2011 -0500
> @@ -55,7 +55,7 @@
>    - S6541476, RH665355: PNG imageio plugin incorrectly handles iTXt chunk
>    - S6782079: PNG: reading metadata may cause OOM on truncated images
>    - RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
> -
> +  - S6642612: JFileChooser approve buttons should use Open and Save text (GTK)
>  * Bug fixes
>    - S7003777, RH647674: JTextPane produces incorrect content after parsing the html text
>    - S7004655, PR590: Unable to activate (click) checkboxes in jtable
> diff -r fd09f4a3b767 patches/openjdk/6642612-filechooser_button_sizes.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/openjdk/6642612-filechooser_button_sizes.patch	Mon Jan 17 13:30:24 2011 -0500
> @@ -0,0 +1,67 @@
> +# HG changeset patch
> +# User rupashka
> +# Date 1209546061 -14400
> +# Node ID 9a322f3dccd8bf3ab5726ec18fbaa0131938f2c4
> +# Parent  eca2e5716b86c31a2f6421473bcee3fec30a500f
> +6642612: JFileChooser approve buttons should use Open and Save text (GTK)
> +Summary: In FileChooser under GTK LaF "Ok" and "Cancel" buttons were made with the same size
> +Reviewed-by: peterz
> +
> +diff -r eca2e5716b86 -r 9a322f3dccd8 src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java
> +--- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java	Wed Apr 30 12:32:05 2008 +0400
> ++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java	Wed Apr 30 13:01:01 2008 +0400
> +@@ -97,14 +97,11 @@
> +     private static final Dimension hstrut3 = new Dimension(3, 1);
> +     private static final Dimension vstrut10 = new Dimension(1, 10);
> + 
> +-    private static final Insets insets = new Insets(10, 10, 10, 10);
> +-
> +     private static Dimension prefListSize = new Dimension(75, 150);
> + 
> +     private static Dimension PREF_SIZE = new Dimension(435, 360);
> +     private static Dimension MIN_SIZE = new Dimension(200, 300);
> + 
> +-    private static Dimension PREF_ACC_SIZE = new Dimension(10, 10);
> +     private static Dimension ZERO_ACC_SIZE = new Dimension(1, 1);
> + 
> +     private static Dimension MAX_SIZE = new Dimension(Short.MAX_VALUE, Short.MAX_VALUE);
> +@@ -125,7 +122,6 @@
> +     private JPanel bottomButtonPanel;
> +     private GTKDirectoryModel model = null;
> +     private Action newFolderAction;
> +-    private JPanel interior;
> +     private boolean readOnly;
> +     private boolean showDirectoryIcons;
> +     private boolean showFileIcons;
> +@@ -710,15 +706,19 @@
> +         bottomButtonPanel.setName("GTKFileChooser.bottomButtonPanel");
> +         align(bottomButtonPanel);
> + 
> ++        JPanel pnButtons = new JPanel(new GridLayout(1, 2, 5, 0));
> ++
> +         JButton cancelButton = getCancelButton(fc);
> +         align(cancelButton);
> +         cancelButton.setMargin(buttonMargin);
> +-        bottomButtonPanel.add(cancelButton);
> ++        pnButtons.add(cancelButton);
> + 
> +-        JButton approveButton = getApproveButton(fc);;
> ++        JButton approveButton = getApproveButton(fc);
> +         align(approveButton);
> +         approveButton.setMargin(buttonMargin);
> +-        bottomButtonPanel.add(approveButton);
> ++        pnButtons.add(approveButton);
> ++
> ++        bottomButtonPanel.add(pnButtons);
> + 
> +         if (fc.getControlButtonsAreShown()) {
> +             fc.add(bottomButtonPanel, BorderLayout.SOUTH);
> +@@ -1108,7 +1108,7 @@
> +             // Get the canonical (full) path. This has the side
> +             // benefit of removing extraneous chars from the path,
> +             // for example /foo/bar/ becomes /foo/bar
> +-            File canonical = null;
> ++            File canonical;
> +             try {
> +                 canonical = fsv.createFileObject(ShellFolder.getNormalizedFile(directory).getPath());
> +             } catch (IOException e) {


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8