@@ -1104,7 +1104,7 @@ else if (curY < 0) {
1104
1104
}
1105
1105
1106
1106
1107
- /* Cache the current slave 's size. */
1107
+ /* Cache the current child 's size. */
1108
1108
if (sizeflag == PREFERREDSIZE )
1109
1109
d = comp .getPreferredSize ();
1110
1110
else
@@ -1245,7 +1245,7 @@ else if (curY < 0) {
1245
1245
else if (constraints .gridwidth == 0 && curCol < 0 )
1246
1246
curRow = curY + curHeight ;
1247
1247
1248
- /* Assign the new values to the gridbag slave */
1248
+ /* Assign the new values to the gridbag child */
1249
1249
constraints .tempX = curX ;
1250
1250
constraints .tempY = curY ;
1251
1251
constraints .tempWidth = curWidth ;
@@ -1364,7 +1364,7 @@ else if (constraints.gridwidth == 0 && curCol < 0)
1364
1364
px = constraints .tempX + constraints .tempWidth ; /* right column */
1365
1365
1366
1366
/*
1367
- * Figure out if we should use this slave\ 's weight. If the weight
1367
+ * Figure out if we should use this child 's weight. If the weight
1368
1368
* is less than the total weight spanned by the width of the cell,
1369
1369
* then discard the weight. Otherwise split the difference
1370
1370
* according to the existing weights.
@@ -1390,7 +1390,7 @@ else if (constraints.gridwidth == 0 && curCol < 0)
1390
1390
1391
1391
/*
1392
1392
* Calculate the minWidth array values.
1393
- * First, figure out how wide the current slave needs to be.
1393
+ * First, figure out how wide the current child needs to be.
1394
1394
* Then, see if it will fit within the current minWidth values.
1395
1395
* If it will not fit, add the difference according to the
1396
1396
* weightX array.
@@ -1425,7 +1425,7 @@ else if (constraints.tempWidth > i && constraints.tempWidth < nextSize)
1425
1425
py = constraints .tempY + constraints .tempHeight ; /* bottom row */
1426
1426
1427
1427
/*
1428
- * Figure out if we should use this slave 's weight. If the weight
1428
+ * Figure out if we should use this child 's weight. If the weight
1429
1429
* is less than the total weight spanned by the height of the cell,
1430
1430
* then discard the weight. Otherwise split it the difference
1431
1431
* according to the existing weights.
@@ -1451,7 +1451,7 @@ else if (constraints.tempWidth > i && constraints.tempWidth < nextSize)
1451
1451
1452
1452
/*
1453
1453
* Calculate the minHeight array values.
1454
- * First, figure out how tall the current slave needs to be.
1454
+ * First, figure out how tall the current child needs to be.
1455
1455
* Then, see if it will fit within the current minHeight values.
1456
1456
* If it will not fit, add the difference according to the
1457
1457
* weightY array.
@@ -1975,7 +1975,7 @@ private void centerVertically(GridBagConstraints cons, Rectangle r,
1975
1975
1976
1976
/**
1977
1977
* Figures out the minimum size of the
1978
- * master based on the information from {@code getLayoutInfo}.
1978
+ * parent based on the information from {@code getLayoutInfo}.
1979
1979
* This method should only be used internally by
1980
1980
* {@code GridBagLayout}.
1981
1981
*
@@ -2055,7 +2055,7 @@ protected void ArrangeGrid(Container parent) {
2055
2055
rightToLeft = !parent .getComponentOrientation ().isLeftToRight ();
2056
2056
2057
2057
/*
2058
- * If the parent has no slaves anymore, then don't do anything
2058
+ * If the parent has no children anymore, then don't do anything
2059
2059
* at all: just leave the parent's size as-is.
2060
2060
*/
2061
2061
if (components .length == 0 &&
@@ -2065,7 +2065,7 @@ protected void ArrangeGrid(Container parent) {
2065
2065
}
2066
2066
2067
2067
/*
2068
- * Pass #1: scan all the slaves to figure out the total amount
2068
+ * Pass #1: scan all the children to figure out the total amount
2069
2069
* of space needed.
2070
2070
*/
2071
2071
@@ -2155,7 +2155,7 @@ protected void ArrangeGrid(Container parent) {
2155
2155
*/
2156
2156
2157
2157
/*
2158
- * Now do the actual layout of the slaves using the layout information
2158
+ * Now do the actual layout of the children using the layout information
2159
2159
* that has been collected.
2160
2160
*/
2161
2161
0 commit comments