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

CRLF fixes #580

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 49 additions & 49 deletions rxjava-core/src/main/java/rx/joins/ActivePlan1.java
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
/**
* Copyright 2013 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package rx.joins;
import rx.Notification;
import rx.util.functions.Action0;
import rx.util.functions.Action1;
/**
* Represents an active plan.
*/
public class ActivePlan1<T1> extends ActivePlan0 {
private final Action1<T1> onNext;
private final Action0 onCompleted;
private final JoinObserver1<T1> first;
public ActivePlan1(JoinObserver1<T1> first, Action1<T1> onNext, Action0 onCompleted) {
this.onNext = onNext;
this.onCompleted = onCompleted;
this.first = first;
addJoinObserver(first);
}
@Override
public void match() {
if (!first.queue().isEmpty()) {
Notification<T1> n1 = first.queue().peek();
if (n1.isOnCompleted()) {
onCompleted.call();
} else {
dequeue();
onNext.call(n1.getValue());
}
}
}
}
/**
* Copyright 2013 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package rx.joins;

import rx.Notification;
import rx.util.functions.Action0;
import rx.util.functions.Action1;

/**
* Represents an active plan.
*/
public class ActivePlan1<T1> extends ActivePlan0 {
private final Action1<T1> onNext;
private final Action0 onCompleted;
private final JoinObserver1<T1> first;
public ActivePlan1(JoinObserver1<T1> first, Action1<T1> onNext, Action0 onCompleted) {
this.onNext = onNext;
this.onCompleted = onCompleted;
this.first = first;
addJoinObserver(first);
}

@Override
public void match() {
if (!first.queue().isEmpty()) {
Notification<T1> n1 = first.queue().peek();
if (n1.isOnCompleted()) {
onCompleted.call();
} else {
dequeue();
onNext.call(n1.getValue());
}
}
}

}
108 changes: 54 additions & 54 deletions rxjava-core/src/main/java/rx/joins/ActivePlan2.java
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
/**
* Copyright 2013 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package rx.joins;
import rx.Notification;
import rx.util.functions.Action0;
import rx.util.functions.Action2;
/**
* Represents an active plan.
*/
public class ActivePlan2<T1, T2> extends ActivePlan0 {
private final Action2<T1, T2> onNext;
private final Action0 onCompleted;
private final JoinObserver1<T1> first;
private final JoinObserver1<T2> second;
public ActivePlan2(JoinObserver1<T1> first, JoinObserver1<T2> second, Action2<T1, T2> onNext, Action0 onCompleted) {
this.onNext = onNext;
this.onCompleted = onCompleted;
this.first = first;
this.second = second;
addJoinObserver(first);
addJoinObserver(second);
}
@Override
public void match() {
if (!first.queue().isEmpty() && !second.queue().isEmpty()) {
Notification<T1> n1 = first.queue().peek();
Notification<T2> n2 = second.queue().peek();
if (n1.isOnCompleted() || n2.isOnCompleted()) {
onCompleted.call();
} else {
dequeue();
onNext.call(n1.getValue(), n2.getValue());
}
}
}
}
/**
* Copyright 2013 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package rx.joins;

import rx.Notification;
import rx.util.functions.Action0;
import rx.util.functions.Action2;

/**
* Represents an active plan.
*/
public class ActivePlan2<T1, T2> extends ActivePlan0 {
private final Action2<T1, T2> onNext;
private final Action0 onCompleted;
private final JoinObserver1<T1> first;
private final JoinObserver1<T2> second;
public ActivePlan2(JoinObserver1<T1> first, JoinObserver1<T2> second, Action2<T1, T2> onNext, Action0 onCompleted) {
this.onNext = onNext;
this.onCompleted = onCompleted;
this.first = first;
this.second = second;
addJoinObserver(first);
addJoinObserver(second);
}

@Override
public void match() {
if (!first.queue().isEmpty() && !second.queue().isEmpty()) {
Notification<T1> n1 = first.queue().peek();
Notification<T2> n2 = second.queue().peek();

if (n1.isOnCompleted() || n2.isOnCompleted()) {
onCompleted.call();
} else {
dequeue();
onNext.call(n1.getValue(), n2.getValue());
}
}
}

}
128 changes: 64 additions & 64 deletions rxjava-core/src/main/java/rx/joins/ActivePlan3.java
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
/**
* Copyright 2013 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package rx.joins;
import rx.Notification;
import rx.util.functions.Action0;
import rx.util.functions.Action3;
/**
* Represents an active plan.
*/
public class ActivePlan3<T1, T2, T3> extends ActivePlan0 {
private final Action3<T1, T2, T3> onNext;
private final Action0 onCompleted;
private final JoinObserver1<T1> first;
private final JoinObserver1<T2> second;
private final JoinObserver1<T3> third;
public ActivePlan3(JoinObserver1<T1> first,
JoinObserver1<T2> second,
JoinObserver1<T3> third,
Action3<T1, T2, T3> onNext,
Action0 onCompleted) {
this.onNext = onNext;
this.onCompleted = onCompleted;
this.first = first;
this.second = second;
this.third = third;
addJoinObserver(first);
addJoinObserver(second);
addJoinObserver(third);
}
@Override
public void match() {
if (!first.queue().isEmpty()
&& !second.queue().isEmpty()
&& !third.queue().isEmpty()) {
Notification<T1> n1 = first.queue().peek();
Notification<T2> n2 = second.queue().peek();
Notification<T3> n3 = third.queue().peek();
if (n1.isOnCompleted() || n2.isOnCompleted() || n3.isOnCompleted()) {
onCompleted.call();
} else {
dequeue();
onNext.call(n1.getValue(), n2.getValue(), n3.getValue());
}
}
}
}
/**
* Copyright 2013 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package rx.joins;

import rx.Notification;
import rx.util.functions.Action0;
import rx.util.functions.Action3;

/**
* Represents an active plan.
*/
public class ActivePlan3<T1, T2, T3> extends ActivePlan0 {
private final Action3<T1, T2, T3> onNext;
private final Action0 onCompleted;
private final JoinObserver1<T1> first;
private final JoinObserver1<T2> second;
private final JoinObserver1<T3> third;
public ActivePlan3(JoinObserver1<T1> first,
JoinObserver1<T2> second,
JoinObserver1<T3> third,
Action3<T1, T2, T3> onNext,
Action0 onCompleted) {
this.onNext = onNext;
this.onCompleted = onCompleted;
this.first = first;
this.second = second;
this.third = third;
addJoinObserver(first);
addJoinObserver(second);
addJoinObserver(third);
}

@Override
public void match() {
if (!first.queue().isEmpty()
&& !second.queue().isEmpty()
&& !third.queue().isEmpty()) {
Notification<T1> n1 = first.queue().peek();
Notification<T2> n2 = second.queue().peek();
Notification<T3> n3 = third.queue().peek();

if (n1.isOnCompleted() || n2.isOnCompleted() || n3.isOnCompleted()) {
onCompleted.call();
} else {
dequeue();
onNext.call(n1.getValue(), n2.getValue(), n3.getValue());
}
}
}

}
52 changes: 26 additions & 26 deletions rxjava-core/src/main/java/rx/joins/JoinObserver.java
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
/**
* Copyright 2013 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package rx.joins;
import rx.Subscription;
/**
* Base interface to manage joined observations.
*/
public interface JoinObserver extends Subscription {
void subscribe(Object gate);
void dequeue();
}
/**
* Copyright 2013 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package rx.joins;

import rx.Subscription;

/**
* Base interface to manage joined observations.
*/
public interface JoinObserver extends Subscription {
void subscribe(Object gate);
void dequeue();
}
Loading