Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinrushforth committed Jul 31, 2020
2 parents 5d34d72 + 487854c commit af000b2
Show file tree
Hide file tree
Showing 27 changed files with 152 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public abstract class BooleanBinding extends BooleanExpression implements
Binding<Boolean> {

/**
* Sole constructor
* Creates a default {@code BooleanBinding}.
*/
public BooleanBinding() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
public abstract class BooleanExpression implements ObservableBooleanValue {

/**
* Sole constructor
* Creates a default {@code BooleanExpression}.
*/
public BooleanExpression() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ public abstract class DoubleBinding extends DoubleExpression implements
private BindingHelperObserver observer;
private ExpressionHelper<Number> helper = null;

/**
* Creates a default {@code DoubleBinding}.
*/
public DoubleBinding() {
}

@Override
public void addListener(InvalidationListener listener) {
helper = ExpressionHelper.addListener(helper, this, listener);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
public abstract class DoubleExpression extends NumberExpressionBase implements
ObservableDoubleValue {

/**
* Creates a default {@code DoubleExpression}.
*/
public DoubleExpression() {
}

@Override
public int intValue() {
return (int) get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ public abstract class FloatBinding extends FloatExpression implements
private BindingHelperObserver observer;
private ExpressionHelper<Number> helper = null;

/**
* Creates a default {@code FloatBinding}.
*/
public FloatBinding() {
}

@Override
public void addListener(InvalidationListener listener) {
helper = ExpressionHelper.addListener(helper, this, listener);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@
public abstract class FloatExpression extends NumberExpressionBase implements
ObservableFloatValue {

/**
* Creates a default {@code FloatExpression}.
*/
public FloatExpression() {
}

@Override
public int intValue() {
return (int) get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ public abstract class IntegerBinding extends IntegerExpression implements
private BindingHelperObserver observer;
private ExpressionHelper<Number> helper = null;

/**
* Creates a default {@code IntegerBinding}.
*/
public IntegerBinding() {
}

@Override
public void addListener(InvalidationListener listener) {
helper = ExpressionHelper.addListener(helper, this, listener);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@
public abstract class IntegerExpression extends NumberExpressionBase implements
ObservableIntegerValue {

/**
* Creates a default {@code IntegerExpression}.
*/
public IntegerExpression() {
}

@Override
public int intValue() {
return get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@
*/
public abstract class ListBinding<E> extends ListExpression<E> implements Binding<ObservableList<E>> {

/**
* Creates a default {@code ListBinding}.
*/
public ListBinding() {
}

private final ListChangeListener<E> listChangeListener = new ListChangeListener<E>() {
@Override
public void onChanged(Change<? extends E> change) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ public abstract class ListExpression<E> implements ObservableListValue<E> {

private static final ObservableList EMPTY_LIST = FXCollections.emptyObservableList();

/**
* Creates a default {@code ListExpression}.
*/
public ListExpression() {
}

@Override
public ObservableList<E> getValue() {
return get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ public abstract class LongBinding extends LongExpression implements
private BindingHelperObserver observer;
private ExpressionHelper<Number> helper = null;

/**
* Creates a default {@code LongBinding}.
*/
public LongBinding() {
}

@Override
public void addListener(InvalidationListener listener) {
helper = ExpressionHelper.addListener(helper, this, listener);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@
public abstract class LongExpression extends NumberExpressionBase implements
ObservableLongValue {

/**
* Creates a default {@code LongExpression}.
*/
public LongExpression() {
}

@Override
public int intValue() {
return (int) get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ public void onChanged(Change<? extends K, ? extends V> change) {
private SizeProperty size0;
private EmptyProperty empty0;

/**
* Creates a default {@code MapBinding}.
*/
public MapBinding() {
}

@Override
public ReadOnlyIntegerProperty sizeProperty() {
if (size0 == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ public ObservableMap<K, V> getValue() {
return get();
}

/**
* Creates a default {@code MapExpression}.
*/
public MapExpression() {
}

/**
* Returns a {@code MapExpression} that wraps a
* {@link javafx.beans.value.ObservableMapValue}. If the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@
*/
public abstract class NumberExpressionBase implements NumberExpression {

/**
* Creates a default {@code NumberExpressionBase}.
*/
public NumberExpressionBase() {
}

/**
* Returns an {@code NumberExpressionBase} that wraps a
* {@link javafx.beans.value.ObservableNumberValue}. If the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ public abstract class ObjectBinding<T> extends ObjectExpression<T> implements
private BindingHelperObserver observer;
private ExpressionHelper<T> helper = null;

/**
* Creates a default {@code ObjectBinding}.
*/
public ObjectBinding() {
}

@Override
public void addListener(InvalidationListener listener) {
helper = ExpressionHelper.addListener(helper, this, listener);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ public T getValue() {
return get();
}

/**
* Creates a default {@code ObjectExpression}.
*/
public ObjectExpression() {
}

/**
* Returns an {@code ObjectExpression} that wraps an
* {@link javafx.beans.value.ObservableObjectValue}. If the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@
*/
public abstract class SetBinding<E> extends SetExpression<E> implements Binding<ObservableSet<E>> {

/**
* Creates a default {@code SetBinding}.
*/
public SetBinding() {
}

private final SetChangeListener<E> setChangeListener = new SetChangeListener<E>() {
@Override
public void onChanged(Change<? extends E> change) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
*/
public abstract class SetExpression<E> implements ObservableSetValue<E> {

/**
* Creates a default {@code SetExpression}.
*/
public SetExpression() {
}

private static final ObservableSet EMPTY_SET = new EmptyObservableSet();

private static class EmptyObservableSet<E> extends AbstractSet<E> implements ObservableSet<E> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ public abstract class StringBinding extends StringExpression implements
private BindingHelperObserver observer;
private ExpressionHelper<String> helper = null;

/**
* Creates a default {@code StringBinding}.
*/
public StringBinding() {
}

@Override
public void addListener(InvalidationListener listener) {
helper = ExpressionHelper.addListener(helper, this, listener);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
*/
public abstract class StringExpression implements ObservableStringValue {

/**
* Creates a default {@code StringExpression}.
*/
public StringExpression() {
}

@Override
public String getValue() {
return get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,7 @@ public final BooleanProperty editableProperty() {
**************************************************************************/

/**
* Starts an edit to the value of the cell.
* Call this function to transition from a non-editing state into an editing
* state, if the cell is editable. If this cell is already in an editing
* state, it will stay in it.
Expand All @@ -586,6 +587,7 @@ public void startEdit() {
}

/**
* Cancels an edit to the value of the cell.
* Call this function to transition from an editing state into a non-editing
* state, without saving any user input.
*/
Expand All @@ -596,11 +598,12 @@ public void cancelEdit() {
}

/**
* Commits an edit to the value of the cell.
* Call this function when appropriate (based on the user interaction requirements
* of your cell editing user interface) to do two things:
*
* <ol>
* <li>Fire the appropriate events back to the backing UI control (e.g.
* <li>Fire the appropriate events back to the backing UI control (e.g.,
* {@link ListView}). This will begin the process of pushing this edit
* back to the relevant data source / property (although it does not
* guarantee that this will be successful - that is dependent upon the
Expand All @@ -611,12 +614,12 @@ public void cancelEdit() {
*
* <p>In general there is no need to override this method in custom cell
* implementations - it should be sufficient to simply call this method
* when appropriate (e.g. when the user pressed the Enter key, you may do something
* when appropriate (e.g., when the user pressed the Enter key, you may do something
* like {@code cell.commitEdit(converter.fromString(textField.getText()));}</p>
*
* @param newValue The value as input by the end user, which should be
* @param newValue the value as input by the end user, which should be
* persisted in the relevant way given the data source underpinning the
* user interface and the install edit commit handler of the UI control.
* user interface and the install edit commit handler of the UI control
*/
public void commitEdit(T newValue) {
if (isEditing()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ <h4><a id="collections_and_property_handlers">Special handlers for collections a
<p> Collections and object properties cannot be listen to using <span class="code">setOn<span class="variable">Event</span>()</span> methods.
For these reason, special handler methods need to be used.
<span class="code">ObservableList</span>, <span class="code">ObservableMap</span> or <span class="code">ObservableSet</span>
uses a special <span class="code">onChange</span> attribute that points to a handler method with a <span class="code">ListChangeListner.Change</span>, <span class="code">MapChangeListener.Change</span> or <span class="code">SetChangeListener.Change</span> parameter respectively.
uses a special <span class="code">onChange</span> attribute that points to a handler method with a <span class="code">ListChangeListener.Change</span>, <span class="code">MapChangeListener.Change</span> or <span class="code">SetChangeListener.Change</span> parameter, respectively.
</p>
<pre class="code">
&lt;VBox fx:controller="com.foo.MyController"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* the implementation of a method {@link #interpolate(double)} which is the
* called in each frame, while the {@code Transition} is running.
* <p>
* In addition an extending class needs to set the duration of a single cycle
* In addition, an extending class needs to set the duration of a single cycle
* with {@link Animation#setCycleDuration(javafx.util.Duration)}. This duration
* is usually set by the user via a duration property (as in
* {@link FadeTransition#durationProperty() duration}) for example. But it can also be calculated
Expand Down
23 changes: 11 additions & 12 deletions modules/javafx.graphics/src/main/java/javafx/scene/layout/HBox.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
import javafx.geometry.HPos;
import javafx.util.Callback;



/**
* HBox lays out its children in a single horizontal row.
* If the hbox has a border and/or padding set, then the contents will be laid
Expand Down Expand Up @@ -168,13 +166,14 @@ public class HBox extends Pane {

/**
* Sets the horizontal grow priority for the child when contained by an hbox.
* If set, the hbox will use the priority to allocate additional space if the
* hbox is resized larger than it's preferred width.
* If set, the hbox will use the priority value to allocate additional space if the
* hbox is resized larger than its preferred width.
* If multiple hbox children have the same horizontal grow priority, then the
* extra space will be split evenly between them.
* If no horizontal grow priority is set on a child, the hbox will never
* allocate it additional horizontal space if available.
* Setting the value to null will remove the constraint.
* allocate any additional horizontal space for that child.
* <p>
* Setting the value to {@code null} will remove the constraint.
* @param child the child of an hbox
* @param value the horizontal grow priority for the child
*/
Expand Down Expand Up @@ -227,14 +226,14 @@ public static void clearConstraints(Node child) {
********************************************************************/

/**
* Creates an HBox layout with spacing = 0.
* Creates an {@code HBox} layout with {@code spacing = 0}.
*/
public HBox() {
super();
}

/**
* Creates an HBox layout with the specified spacing between children.
* Creates an {@code HBox} layout with the specified spacing between children.
* @param spacing the amount of horizontal space between each child
*/
public HBox(double spacing) {
Expand All @@ -243,8 +242,8 @@ public HBox(double spacing) {
}

/**
* Creates an HBox layout with spacing = 0.
* @param children The initial set of children for this pane.
* Creates an {@code HBox} layout with {@code spacing = 0}.
* @param children the initial set of children for this pane
* @since JavaFX 8.0
*/
public HBox(Node... children) {
Expand All @@ -253,9 +252,9 @@ public HBox(Node... children) {
}

/**
* Creates an HBox layout with the specified spacing between children.
* Creates an {@code HBox} layout with the specified spacing between children.
* @param spacing the amount of horizontal space between each child
* @param children The initial set of children for this pane.
* @param children the initial set of children for this pane
* @since JavaFX 8.0
*/
public HBox(double spacing, Node... children) {
Expand Down
Loading

0 comments on commit af000b2

Please sign in to comment.