8254850: Update terminology in java.awt.GridBagLayout source code comments
Backport-of: 9ed0b7640338194365f7d8a53bc2df3b0c96e821
diff --git a/src/java.desktop/share/classes/java/awt/GridBagLayout.java b/src/java.desktop/share/classes/java/awt/GridBagLayout.java
index 9196ceb..adb8633 100644
--- a/src/java.desktop/share/classes/java/awt/GridBagLayout.java
+++ b/src/java.desktop/share/classes/java/awt/GridBagLayout.java
@@ -1122,7 +1122,7 @@
}
- /* Cache the current slave's size. */
+ /* Cache the current child's size. */
if (sizeflag == PREFERREDSIZE)
d = comp.getPreferredSize();
else
@@ -1263,7 +1263,7 @@
else if (constraints.gridwidth == 0 && curCol < 0)
curRow = curY + curHeight;
- /* Assign the new values to the gridbag slave */
+ /* Assign the new values to the gridbag child */
constraints.tempX = curX;
constraints.tempY = curY;
constraints.tempWidth = curWidth;
@@ -1382,7 +1382,7 @@
px = constraints.tempX + constraints.tempWidth; /* right column */
/*
- * Figure out if we should use this slave\'s weight. If the weight
+ * Figure out if we should use this child's weight. If the weight
* is less than the total weight spanned by the width of the cell,
* then discard the weight. Otherwise split the difference
* according to the existing weights.
@@ -1408,7 +1408,7 @@
/*
* Calculate the minWidth array values.
- * First, figure out how wide the current slave needs to be.
+ * First, figure out how wide the current child needs to be.
* Then, see if it will fit within the current minWidth values.
* If it will not fit, add the difference according to the
* weightX array.
@@ -1443,7 +1443,7 @@
py = constraints.tempY + constraints.tempHeight; /* bottom row */
/*
- * Figure out if we should use this slave's weight. If the weight
+ * Figure out if we should use this child's weight. If the weight
* is less than the total weight spanned by the height of the cell,
* then discard the weight. Otherwise split it the difference
* according to the existing weights.
@@ -1469,7 +1469,7 @@
/*
* Calculate the minHeight array values.
- * First, figure out how tall the current slave needs to be.
+ * First, figure out how tall the current child needs to be.
* Then, see if it will fit within the current minHeight values.
* If it will not fit, add the difference according to the
* weightY array.
@@ -1993,7 +1993,7 @@
/**
* Figures out the minimum size of the
- * master based on the information from {@code getLayoutInfo}.
+ * parent based on the information from {@code getLayoutInfo}.
* This method should only be used internally by
* {@code GridBagLayout}.
*
@@ -2073,7 +2073,7 @@
rightToLeft = !parent.getComponentOrientation().isLeftToRight();
/*
- * If the parent has no slaves anymore, then don't do anything
+ * If the parent has no children anymore, then don't do anything
* at all: just leave the parent's size as-is.
*/
if (components.length == 0 &&
@@ -2083,7 +2083,7 @@
}
/*
- * Pass #1: scan all the slaves to figure out the total amount
+ * Pass #1: scan all the children to figure out the total amount
* of space needed.
*/
@@ -2173,7 +2173,7 @@
*/
/*
- * Now do the actual layout of the slaves using the layout information
+ * Now do the actual layout of the children using the layout information
* that has been collected.
*/
