From: Tom Fitzsimmons Date: Fri, 14 Nov 2003 22:44:29 +0000 (+0000) Subject: GridBagLayout.java (getLayoutDimensions): Return array of two zero-length int arrays... X-Git-Tag: releases/gcc-3.4.0~2289 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c859e1034742b0d98e732b9691add29dfb70376;p=thirdparty%2Fgcc.git GridBagLayout.java (getLayoutDimensions): Return array of two zero-length int arrays when layoutInfo is null. 2003-11-14 Tom Fitzsimmons * java/awt/GridBagLayout.java (getLayoutDimensions): Return array of two zero-length int arrays when layoutInfo is null. (getLayoutWeights): Return array of two zero-length double arrays when layoutInfo is null. From-SVN: r73622 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 03cc2fa2a162..96510a5c4307 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-11-14 Tom Fitzsimmons + + * java/awt/GridBagLayout.java (getLayoutDimensions): Return array of two + zero-length int arrays when layoutInfo is null. + (getLayoutWeights): Return array of two zero-length double arrays when + layoutInfo is null. + 2003-11-13 Tom Tromey * jni.cc (_Jv_JNI_GetStringUTFChars): Pass length of string to diff --git a/libjava/java/awt/GridBagLayout.java b/libjava/java/awt/GridBagLayout.java index dd49a1cf905d..7572c1d1d565 100644 --- a/libjava/java/awt/GridBagLayout.java +++ b/libjava/java/awt/GridBagLayout.java @@ -229,10 +229,15 @@ public class GridBagLayout */ public int[][] getLayoutDimensions () { + int[][] result = new int [2][]; if (layoutInfo == null) - return new int [2][]; + { + result[0] = new int[0]; + result[1] = new int[0]; + + return result; + } - int[][] result = new int [2][]; result [0] = new int [layoutInfo.cols]; System.arraycopy (layoutInfo.colWidths, 0, result [0], 0, layoutInfo.cols); result [1] = new int [layoutInfo.rows]; @@ -242,10 +247,15 @@ public class GridBagLayout public double[][] getLayoutWeights () { - if (layoutInfo == null) - return new double [2][]; - double[][] result = new double [2][]; + if (layoutInfo == null) + { + result[0] = new double[0]; + result[1] = new double[0]; + + return result; + } + result [0] = new double [layoutInfo.cols]; System.arraycopy (layoutInfo.colWeights, 0, result [0], 0, layoutInfo.cols); result [1] = new double [layoutInfo.rows];