Skip to content

Commit 0dfd189

Browse files
committed
Merge pull request #77 from omo/onsubscribe
Rename OnSubscribe subclasses to OnSubscribeXx
2 parents c22d0bb + 77a1380 commit 0dfd189

10 files changed

+22
-22
lines changed

rxandroid/src/main/java/rx/android/content/ContentObservable.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static <T> Observable<T> bindFragment(Object fragment, Observable<T> sour
102102
* @param filter Selects the Intent broadcasts to be received.
103103
*/
104104
public static Observable<Intent> fromBroadcast(Context context, IntentFilter filter){
105-
return Observable.create(new OperatorBroadcastRegister(context, filter, null, null));
105+
return Observable.create(new OnSubscribeBroadcastRegister(context, filter, null, null));
106106
}
107107

108108
/**
@@ -116,7 +116,7 @@ public static Observable<Intent> fromBroadcast(Context context, IntentFilter fil
116116
* the Intent. If null, the main thread of the process will be used.
117117
*/
118118
public static Observable<Intent> fromBroadcast(Context context, IntentFilter filter, String broadcastPermission, Handler schedulerHandler){
119-
return Observable.create(new OperatorBroadcastRegister(context, filter, broadcastPermission, schedulerHandler));
119+
return Observable.create(new OnSubscribeBroadcastRegister(context, filter, broadcastPermission, schedulerHandler));
120120
}
121121

122122
/**
@@ -126,7 +126,7 @@ public static Observable<Intent> fromBroadcast(Context context, IntentFilter fil
126126
* @param filter Selects the Intent broadcasts to be received.
127127
*/
128128
public static Observable<Intent> fromLocalBroadcast(Context context, IntentFilter filter){
129-
return Observable.create(new OperatorLocalBroadcastRegister(context, filter));
129+
return Observable.create(new OnSubscribeLocalBroadcastRegister(context, filter));
130130
}
131131

132132
/**
@@ -135,7 +135,7 @@ public static Observable<Intent> fromLocalBroadcast(Context context, IntentFilte
135135
* Items will be observed on the main Android UI thread
136136
*/
137137
public static Observable<String> fromSharedPreferencesChanges(SharedPreferences sharedPreferences){
138-
return Observable.create(new OperatorSharedPreferenceChange(sharedPreferences));
138+
return Observable.create(new OnSubscribeSharedPreferenceChange(sharedPreferences));
139139
}
140140

141141
private ContentObservable() {

rxandroid/src/main/java/rx/android/content/OperatorBroadcastRegister.java renamed to rxandroid/src/main/java/rx/android/content/OnSubscribeBroadcastRegister.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
import rx.functions.Action0;
2626
import rx.subscriptions.Subscriptions;
2727

28-
class OperatorBroadcastRegister implements Observable.OnSubscribe<Intent> {
28+
class OnSubscribeBroadcastRegister implements Observable.OnSubscribe<Intent> {
2929

3030
private final Context context;
3131
private final IntentFilter intentFilter;
3232
private final String broadcastPermission;
3333
private final Handler schedulerHandler;
3434

35-
public OperatorBroadcastRegister(Context context, IntentFilter intentFilter, String broadcastPermission, Handler schedulerHandler) {
35+
public OnSubscribeBroadcastRegister(Context context, IntentFilter intentFilter, String broadcastPermission, Handler schedulerHandler) {
3636
this.context = context;
3737
this.intentFilter = intentFilter;
3838
this.broadcastPermission = broadcastPermission;

rxandroid/src/main/java/rx/android/content/OperatorLocalBroadcastRegister.java renamed to rxandroid/src/main/java/rx/android/content/OnSubscribeLocalBroadcastRegister.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
import rx.functions.Action0;
2626
import rx.subscriptions.Subscriptions;
2727

28-
class OperatorLocalBroadcastRegister implements Observable.OnSubscribe<Intent> {
28+
class OnSubscribeLocalBroadcastRegister implements Observable.OnSubscribe<Intent> {
2929

3030
private final Context context;
3131
private final IntentFilter intentFilter;
3232

33-
public OperatorLocalBroadcastRegister(Context context, IntentFilter intentFilter) {
33+
public OnSubscribeLocalBroadcastRegister(Context context, IntentFilter intentFilter) {
3434
this.context = context;
3535
this.intentFilter = intentFilter;
3636
}

rxandroid/src/main/java/rx/android/content/OperatorSharedPreferenceChange.java renamed to rxandroid/src/main/java/rx/android/content/OnSubscribeSharedPreferenceChange.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import rx.functions.Action0;
2020
import rx.subscriptions.Subscriptions;
2121

22-
class OperatorSharedPreferenceChange implements Observable.OnSubscribe<String>{
22+
class OnSubscribeSharedPreferenceChange implements Observable.OnSubscribe<String>{
2323

2424
private final SharedPreferences sharedPreferences;
2525

26-
public OperatorSharedPreferenceChange(SharedPreferences sharedPreferences) {
26+
public OnSubscribeSharedPreferenceChange(SharedPreferences sharedPreferences) {
2727
this.sharedPreferences = sharedPreferences;
2828
}
2929

rxandroid/src/main/java/rx/android/view/OperatorViewClick.java renamed to rxandroid/src/main/java/rx/android/view/OnSubscribeViewClick.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
import java.util.Map;
2727
import java.util.WeakHashMap;
2828

29-
final class OperatorViewClick implements Observable.OnSubscribe<OnClickEvent> {
29+
final class OnSubscribeViewClick implements Observable.OnSubscribe<OnClickEvent> {
3030
private final boolean emitInitialValue;
3131
private final View view;
3232

33-
public OperatorViewClick(final View view, final boolean emitInitialValue) {
33+
public OnSubscribeViewClick(final View view, final boolean emitInitialValue) {
3434
this.emitInitialValue = emitInitialValue;
3535
this.view = view;
3636
}

rxandroid/src/main/java/rx/android/view/ViewObservable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static Observable<OnClickEvent> clicks(final View view) {
3030
}
3131

3232
public static Observable<OnClickEvent> clicks(final View view, final boolean emitInitialValue) {
33-
return Observable.create(new OperatorViewClick(view, emitInitialValue));
33+
return Observable.create(new OnSubscribeViewClick(view, emitInitialValue));
3434
}
3535

3636
/**

rxandroid/src/main/java/rx/android/widget/OperatorAdapterViewOnItemClick.java renamed to rxandroid/src/main/java/rx/android/widget/OnSubscribeAdapterViewOnItemClick.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
import rx.android.AndroidSubscriptions;
3030
import rx.functions.Action0;
3131

32-
class OperatorAdapterViewOnItemClick implements Observable.OnSubscribe<OnItemClickEvent> {
32+
class OnSubscribeAdapterViewOnItemClick implements Observable.OnSubscribe<OnItemClickEvent> {
3333

3434
private final AdapterView<?> adapterView;
3535

36-
public OperatorAdapterViewOnItemClick(final AdapterView<?> adapterView) {
36+
public OnSubscribeAdapterViewOnItemClick(final AdapterView<?> adapterView) {
3737
this.adapterView = adapterView;
3838
}
3939

rxandroid/src/main/java/rx/android/widget/OperatorCompoundButtonInput.java renamed to rxandroid/src/main/java/rx/android/widget/OnSubscribeCompoundButtonInput.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import java.util.Map;
2929
import java.util.WeakHashMap;
3030

31-
class OperatorCompoundButtonInput implements Observable.OnSubscribe<OnCheckedChangeEvent> {
31+
class OnSubscribeCompoundButtonInput implements Observable.OnSubscribe<OnCheckedChangeEvent> {
3232
private final boolean emitInitialValue;
3333
private final CompoundButton button;
3434

35-
public OperatorCompoundButtonInput(final CompoundButton button, final boolean emitInitialValue) {
35+
public OnSubscribeCompoundButtonInput(final CompoundButton button, final boolean emitInitialValue) {
3636
this.emitInitialValue = emitInitialValue;
3737
this.button = button;
3838
}

rxandroid/src/main/java/rx/android/widget/OperatorTextViewInput.java renamed to rxandroid/src/main/java/rx/android/widget/OnSubscribeTextViewInput.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import android.text.TextWatcher;
2424
import android.widget.TextView;
2525

26-
class OperatorTextViewInput implements Observable.OnSubscribe<OnTextChangeEvent> {
26+
class OnSubscribeTextViewInput implements Observable.OnSubscribe<OnTextChangeEvent> {
2727
private final boolean emitInitialValue;
2828
private final TextView input;
2929

30-
public OperatorTextViewInput(final TextView input, final boolean emitInitialValue) {
30+
public OnSubscribeTextViewInput(final TextView input, final boolean emitInitialValue) {
3131
this.input = input;
3232
this.emitInitialValue = emitInitialValue;
3333
}

rxandroid/src/main/java/rx/android/widget/WidgetObservable.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ public static Observable<OnTextChangeEvent> text(final TextView input) {
1717
}
1818

1919
public static Observable<OnTextChangeEvent> text(final TextView input, final boolean emitInitialValue) {
20-
return Observable.create(new OperatorTextViewInput(input, emitInitialValue));
20+
return Observable.create(new OnSubscribeTextViewInput(input, emitInitialValue));
2121
}
2222

2323
public static Observable<OnCheckedChangeEvent> input(final CompoundButton button) {
2424
return input(button, false);
2525
}
2626

2727
public static Observable<OnCheckedChangeEvent> input(final CompoundButton button, final boolean emitInitialValue) {
28-
return Observable.create(new OperatorCompoundButtonInput(button, emitInitialValue));
28+
return Observable.create(new OnSubscribeCompoundButtonInput(button, emitInitialValue));
2929
}
3030

3131
public static Observable<OnItemClickEvent> itemClicks(final AdapterView<?> adapterView) {
32-
return Observable.create(new OperatorAdapterViewOnItemClick(adapterView));
32+
return Observable.create(new OnSubscribeAdapterViewOnItemClick(adapterView));
3333
}
3434

3535
/**

0 commit comments

Comments
 (0)