Skip to content

Commit

Permalink
8312528: Move Subscription interface from javafx.beans to javafx.util
Browse files Browse the repository at this point in the history
Reviewed-by: nlisker, kcr
  • Loading branch information
hjohn committed Jul 26, 2023
1 parent 600cee7 commit cc57fb5
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

import java.util.Objects;

import javafx.beans.Subscription;
import javafx.beans.value.ObservableValue;
import javafx.util.Subscription;

public class ConditionalBinding<T> extends LazyObjectBinding<T> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import java.util.Objects;
import java.util.function.Function;

import javafx.beans.Subscription;
import javafx.beans.value.ObservableValue;
import javafx.util.Subscription;

/**
* A binding holding the value of an indirect source. The indirect source results from
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
package com.sun.javafx.binding;

import javafx.beans.InvalidationListener;
import javafx.beans.Subscription;
import javafx.beans.binding.ObjectBinding;
import javafx.beans.value.ChangeListener;
import javafx.util.Subscription;

/**
* Extends {@link ObjectBinding} with the ability to lazily register and eagerly unregister listeners on its
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import java.util.Objects;
import java.util.function.Function;

import javafx.beans.Subscription;
import javafx.beans.value.ObservableValue;
import javafx.util.Subscription;

public class MappedBinding<S, T> extends LazyObjectBinding<T> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

import java.util.Objects;

import javafx.beans.Subscription;
import javafx.beans.value.ObservableValue;
import javafx.util.Subscription;

public class OrElseBinding<T> extends LazyObjectBinding<T> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@

import java.util.Objects;

import javafx.util.Subscription;

/**
* An {@code Observable} is an entity that wraps content and allows to
* observe the content for invalidations.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

import javafx.beans.InvalidationListener;
import javafx.beans.Observable;
import javafx.beans.Subscription;
import javafx.util.Subscription;

/**
* An {@code ObservableValue} is an entity that wraps a value and allows to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

package javafx.beans;
package javafx.util;

import java.util.List;
import java.util.Objects;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

package com.sun.javafx.binding;

import javafx.beans.Subscription;
import javafx.util.Subscription;

/**
* Stub to allow testing of package private LazyObjectBinding.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@

import org.junit.jupiter.api.Test;

import javafx.beans.Subscription;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.util.Subscription;

public class ObservableSubscriptionsTest {
private final StringProperty value = new SimpleStringProperty("Initial");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

import org.junit.jupiter.api.Test;

import javafx.beans.Subscription;
import javafx.util.Subscription;

public class SubscriptionTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@

import org.junit.jupiter.api.Test;

import javafx.beans.Subscription;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.util.Subscription;

public class ObservableValueSubscriptionsTest {
private final StringProperty value = new SimpleStringProperty("Initial");
Expand Down

3 comments on commit cc57fb5

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kevinrushforth
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/tag 22+2

@openjdk
Copy link

@openjdk openjdk bot commented on cc57fb5 Jul 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kevinrushforth The tag 22+2 was successfully created.

Please sign in to comment.