Skip to content

Commit 5789894

Browse files
Bob Cottonbenjchristensen
authored andcommitted
Merge window operator commit to master
This is from commit http://github.com/RallySoftware/RxJava/commit/71335e4ed1531b1542c7b304a6d3337145e0b2df
1 parent e0da522 commit 5789894

File tree

8 files changed

+1715
-1001
lines changed

8 files changed

+1715
-1001
lines changed

rxjava-core/src/main/java/rx/Observable.java

Lines changed: 335 additions & 360 deletions
Large diffs are not rendered by default.

rxjava-core/src/main/java/rx/operators/ChunkedOperation.java

Lines changed: 587 additions & 0 deletions
Large diffs are not rendered by default.

rxjava-core/src/main/java/rx/operators/OperationBuffer.java

Lines changed: 123 additions & 631 deletions
Large diffs are not rendered by default.

rxjava-core/src/main/java/rx/operators/OperationWindow.java

Lines changed: 660 additions & 0 deletions
Large diffs are not rendered by default.

rxjava-core/src/main/java/rx/util/BufferClosing.java renamed to rxjava-core/src/main/java/rx/util/Closing.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
*/
1616
package rx.util;
1717

18-
public interface BufferClosing {
18+
public interface Closing {
1919
// Tagging interface for objects which can close buffers.
2020
}

rxjava-core/src/main/java/rx/util/BufferClosings.java renamed to rxjava-core/src/main/java/rx/util/Closings.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package rx.util;
1717

18-
public class BufferClosings {
18+
public class Closings {
1919

20-
public static BufferClosing create() {
21-
return new BufferClosing() {};
20+
public static Closing create() {
21+
return new Closing() {};
2222
}
2323

24-
private BufferClosings() {
24+
private Closings() {
2525
// Prevent instantation.
2626
}
2727
}

rxjava-core/src/main/java/rx/util/BufferOpening.java renamed to rxjava-core/src/main/java/rx/util/Opening.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
*/
1616
package rx.util;
1717

18-
public interface BufferOpening {
18+
public interface Opening {
1919
// Tagging interface for objects which can open buffers.
2020
}

rxjava-core/src/main/java/rx/util/BufferOpenings.java renamed to rxjava-core/src/main/java/rx/util/Openings.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package rx.util;
1717

18-
public class BufferOpenings {
18+
public class Openings {
1919

20-
public static BufferOpening create() {
21-
return new BufferOpening() {};
20+
public static Opening create() {
21+
return new Opening() {};
2222
}
2323

24-
private BufferOpenings() {
24+
private Openings() {
2525
// Prevent instantation.
2626
}
2727
}

0 commit comments

Comments
 (0)