Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8254850: Update terminology in java.awt.GridBagLayout source code comments #1784

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1104,7 +1104,7 @@ else if (curY < 0) {
}


/* Cache the current slave's size. */
/* Cache the current child's size. */
if (sizeflag == PREFERREDSIZE)
d = comp.getPreferredSize();
else
@@ -1245,7 +1245,7 @@ else if (curY < 0) {
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;
@@ -1364,7 +1364,7 @@ else if (constraints.gridwidth == 0 && curCol < 0)
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.
@@ -1390,7 +1390,7 @@ else if (constraints.gridwidth == 0 && curCol < 0)

/*
* 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.
@@ -1425,7 +1425,7 @@ else if (constraints.tempWidth > i && constraints.tempWidth < nextSize)
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.
@@ -1451,7 +1451,7 @@ else if (constraints.tempWidth > i && constraints.tempWidth < nextSize)

/*
* 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.
@@ -1975,7 +1975,7 @@ private void centerVertically(GridBagConstraints cons, Rectangle r,

/**
* 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}.
*
@@ -2055,7 +2055,7 @@ protected void ArrangeGrid(Container parent) {
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 &&
@@ -2065,7 +2065,7 @@ protected void ArrangeGrid(Container parent) {
}

/*
* 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.
*/

@@ -2155,7 +2155,7 @@ protected void ArrangeGrid(Container parent) {
*/

/*
* 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.
*/