@@ -1122,7 +1122,7 @@ else if (curY < 0) {
1122
1122
}
1123
1123
1124
1124
1125
- /* Cache the current slave 's size. */
1125
+ /* Cache the current child 's size. */
1126
1126
if (sizeflag == PREFERREDSIZE )
1127
1127
d = comp .getPreferredSize ();
1128
1128
else
@@ -1263,7 +1263,7 @@ else if (curY < 0) {
1263
1263
else if (constraints .gridwidth == 0 && curCol < 0 )
1264
1264
curRow = curY + curHeight ;
1265
1265
1266
- /* Assign the new values to the gridbag slave */
1266
+ /* Assign the new values to the gridbag child */
1267
1267
constraints .tempX = curX ;
1268
1268
constraints .tempY = curY ;
1269
1269
constraints .tempWidth = curWidth ;
@@ -1382,7 +1382,7 @@ else if (constraints.gridwidth == 0 && curCol < 0)
1382
1382
px = constraints .tempX + constraints .tempWidth ; /* right column */
1383
1383
1384
1384
/*
1385
- * Figure out if we should use this slave\ 's weight. If the weight
1385
+ * Figure out if we should use this child 's weight. If the weight
1386
1386
* is less than the total weight spanned by the width of the cell,
1387
1387
* then discard the weight. Otherwise split the difference
1388
1388
* according to the existing weights.
@@ -1408,7 +1408,7 @@ else if (constraints.gridwidth == 0 && curCol < 0)
1408
1408
1409
1409
/*
1410
1410
* Calculate the minWidth array values.
1411
- * First, figure out how wide the current slave needs to be.
1411
+ * First, figure out how wide the current child needs to be.
1412
1412
* Then, see if it will fit within the current minWidth values.
1413
1413
* If it will not fit, add the difference according to the
1414
1414
* weightX array.
@@ -1443,7 +1443,7 @@ else if (constraints.tempWidth > i && constraints.tempWidth < nextSize)
1443
1443
py = constraints .tempY + constraints .tempHeight ; /* bottom row */
1444
1444
1445
1445
/*
1446
- * Figure out if we should use this slave 's weight. If the weight
1446
+ * Figure out if we should use this child 's weight. If the weight
1447
1447
* is less than the total weight spanned by the height of the cell,
1448
1448
* then discard the weight. Otherwise split it the difference
1449
1449
* according to the existing weights.
@@ -1469,7 +1469,7 @@ else if (constraints.tempWidth > i && constraints.tempWidth < nextSize)
1469
1469
1470
1470
/*
1471
1471
* Calculate the minHeight array values.
1472
- * First, figure out how tall the current slave needs to be.
1472
+ * First, figure out how tall the current child needs to be.
1473
1473
* Then, see if it will fit within the current minHeight values.
1474
1474
* If it will not fit, add the difference according to the
1475
1475
* weightY array.
@@ -1993,7 +1993,7 @@ private void centerVertically(GridBagConstraints cons, Rectangle r,
1993
1993
1994
1994
/**
1995
1995
* Figures out the minimum size of the
1996
- * master based on the information from {@code getLayoutInfo}.
1996
+ * parent based on the information from {@code getLayoutInfo}.
1997
1997
* This method should only be used internally by
1998
1998
* {@code GridBagLayout}.
1999
1999
*
@@ -2073,7 +2073,7 @@ protected void ArrangeGrid(Container parent) {
2073
2073
rightToLeft = !parent .getComponentOrientation ().isLeftToRight ();
2074
2074
2075
2075
/*
2076
- * If the parent has no slaves anymore, then don't do anything
2076
+ * If the parent has no children anymore, then don't do anything
2077
2077
* at all: just leave the parent's size as-is.
2078
2078
*/
2079
2079
if (components .length == 0 &&
@@ -2083,7 +2083,7 @@ protected void ArrangeGrid(Container parent) {
2083
2083
}
2084
2084
2085
2085
/*
2086
- * Pass #1: scan all the slaves to figure out the total amount
2086
+ * Pass #1: scan all the children to figure out the total amount
2087
2087
* of space needed.
2088
2088
*/
2089
2089
@@ -2173,7 +2173,7 @@ protected void ArrangeGrid(Container parent) {
2173
2173
*/
2174
2174
2175
2175
/*
2176
- * Now do the actual layout of the slaves using the layout information
2176
+ * Now do the actual layout of the children using the layout information
2177
2177
* that has been collected.
2178
2178
*/
2179
2179
0 commit comments