/hg/icedtea6: 6613904: javax.swing.GroupLayout.createParallelGro...

[ptisnovs at icedtea.classpath.org]

changeset 7f168fd8f368 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7f168fd8f368
author: ptisnovs
date: Fri Jul 15 14:05:59 2011 +0200

	6613904: javax.swing.GroupLayout.createParallelGroup(..) doesn't
	throw IllegalArgumentException for null arg


diffstat:

 Makefile.am                                                            |   3 +-
 NEWS                                                                   |   1 +
 patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch |  89 ++++++++++
 3 files changed, 92 insertions(+), 1 deletions(-)

diffs (119 lines):

diff -r 3d5ae12b32b7 -r 7f168fd8f368 Makefile.am
--- a/Makefile.am	Wed Jul 13 21:28:45 2011 +0100
+++ b/Makefile.am	Fri Jul 15 14:05:59 2011 +0200
@@ -363,7 +363,8 @@
 	patches/openjdk/6711682-JCheckBox_in_JTable_does_not_respond_to_click.patch \
 	patches/jtreg-7020373-add-ignore-tag.patch \
 	patches/openjdk/6758179-D3D_AlphaComposite_is_applied_incorrectly.patch \
-	patches/jtreg-ConstructDeflaterInput-fix.patch
+	patches/jtreg-ConstructDeflaterInput-fix.patch \
+	patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 3d5ae12b32b7 -r 7f168fd8f368 NEWS
--- a/NEWS	Wed Jul 13 21:28:45 2011 +0100
+++ b/NEWS	Fri Jul 15 14:05:59 2011 +0200
@@ -356,6 +356,7 @@
   - S7016856: fix dashing performance regression. Improve other rendering performance.
   - S6934977: MappedByteBuffer.load crashes with SIGBUS.
   - S6758179: D3D: AlphaComposite is applied incorrectly for uncached opaque BufferedImage
+  - S6613904: javax.swing.GroupLayout.createParallelGroup(..) doesn't throw IllegalArgumentException for null arg
 * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
 * CACAO
   - Threadlist & threadobject improvements.
diff -r 3d5ae12b32b7 -r 7f168fd8f368 patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch	Fri Jul 15 14:05:59 2011 +0200
@@ -0,0 +1,91 @@
+# HG changeset patch
+# User rupashka
+# Date 1289665358 -10800
+# Node ID d385b33c0db056aa722f93eed1970f70f0b8f119
+# Parent  286b14273037644c62e7f263d1d9249f4308783b
+6613904: javax.swing.GroupLayout.createParallelGroup(..) doesn't throw IllegalArgumentException for null arg
+Reviewed-by: peterz
+
+diff -r 286b14273037 -r d385b33c0db0 src/share/classes/javax/swing/GroupLayout.java
+--- openjdk.orig/jdk/src/share/classes/javax/swing/GroupLayout.java	Sat Nov 13 13:04:47 2010 +0300
++++ openjdk/jdk/src/share/classes/javax/swing/GroupLayout.java	Sat Nov 13 19:22:38 2010 +0300
+@@ -653,6 +653,10 @@
+      */
+     public ParallelGroup createParallelGroup(Alignment alignment,
+             boolean resizable){
++        if (alignment == null) {
++            throw new IllegalArgumentException("alignment must be non null");
++        }
++
+         if (alignment == Alignment.BASELINE) {
+             return new BaselineGroup(resizable);
+         }
+diff -r 286b14273037 -r d385b33c0db0 test/javax/swing/GroupLayout/6613904/bug6613904.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/javax/swing/GroupLayout/6613904/bug6613904.java	Sat Nov 13 19:22:38 2010 +0300
+@@ -0,0 +1,65 @@
++/*
++ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++/*
++ * @test
++ * @bug 6613904
++ * @summary javax.swing.GroupLayout.createParallelGroup(..) doesn't throw IllegalArgumentException for null arg
++ * @author Pavel Porvatov
++ */
++
++import javax.swing.*;
++
++public class bug6613904 {
++    public static void main(String[] args) {
++        SwingUtilities.invokeLater(new Runnable() {
++            public void run() {
++                GroupLayout groupLayout = new GroupLayout(new JPanel());
++
++                try {
++                    groupLayout.createParallelGroup(null);
++
++                    throw new RuntimeException("groupLayout.createParallelGroup(null) doesn't throw IAE");
++                } catch (IllegalArgumentException e) {
++                    // Ok
++                }
++
++                try {
++                    groupLayout.createParallelGroup(null, true);
++
++                    throw new RuntimeException("groupLayout.createParallelGroup(null, true) doesn't throw IAE");
++                } catch (IllegalArgumentException e) {
++                    // Ok
++                }
++
++                try {
++                    groupLayout.createParallelGroup(null, false);
++
++                    throw new RuntimeException("groupLayout.createParallelGroup(null, false) doesn't throw IAE");
++                } catch (IllegalArgumentException e) {
++                    // Ok
++                }
++            }
++        });
++    }
++}