Skip to content

Commit b746221

Browse files
committed
Renamed callback classes for clarity
- JsCallbackHandler -> JsCallbackReceiver - JsCallbackListener -> OnJsEditorStateChangedListener
1 parent bedf027 commit b746221

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
import java.util.HashMap;
2727
import java.util.Map;
2828

29-
public class EditorFragment extends EditorFragmentAbstract implements View.OnClickListener, JsCallbackListener {
29+
public class EditorFragment extends EditorFragmentAbstract implements View.OnClickListener,
30+
OnJsEditorStateChangedListener {
3031
private static final String ARG_PARAM_TITLE = "param_title";
3132
private static final String ARG_PARAM_CONTENT = "param_content";
3233

@@ -105,7 +106,7 @@ public boolean onJsAlert(WebView view, String url, String message, JsResult resu
105106

106107
String htmlEditor = Utils.getHtmlFromFile(getActivity(), "android-editor.html");
107108

108-
mWebView.addJavascriptInterface(new JsCallbackHandler(this), JS_CALLBACK_HANDLER);
109+
mWebView.addJavascriptInterface(new JsCallbackReceiver(this), JS_CALLBACK_HANDLER);
109110

110111
mWebView.loadDataWithBaseURL("file:///android_asset/", htmlEditor, "text/html", "utf-8", "");
111112

WordPressEditor/src/main/java/org/wordpress/android/editor/JsCallbackHandler.java renamed to WordPressEditor/src/main/java/org/wordpress/android/editor/JsCallbackReceiver.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.HashSet;
88
import java.util.Set;
99

10-
public class JsCallbackHandler {
10+
public class JsCallbackReceiver {
1111
private static final String JS_CALLBACK_DELIMITER = "~";
1212

1313
private static final String CALLBACK_DOM_LOADED = "callback-dom-loaded";
@@ -26,24 +26,25 @@ public class JsCallbackHandler {
2626

2727
private static final String CALLBACK_LOG = "callback-log";
2828

29-
private final JsCallbackListener mJsCallbackListener;
29+
private final OnJsEditorStateChangedListener mListener;
3030

3131
private Set<String> mPreviousStyleSet = new HashSet<>();
3232

33-
public JsCallbackHandler(EditorFragmentAbstract editorFragmentAbstract) {
34-
mJsCallbackListener = (JsCallbackListener) editorFragmentAbstract;
33+
public JsCallbackReceiver(EditorFragmentAbstract editorFragmentAbstract) {
34+
mListener = (OnJsEditorStateChangedListener) editorFragmentAbstract;
3535
}
3636

3737
@JavascriptInterface
3838
public void executeCallback(String callbackId, String params) {
3939
switch (callbackId) {
4040
case CALLBACK_DOM_LOADED:
41-
mJsCallbackListener.onDomLoaded();
41+
mListener.onDomLoaded();
4242
break;
4343
case CALLBACK_SELECTION_STYLE:
4444
// Compare the new styles to the previous ones, and notify the JsCallbackListener of the changeset
4545
Set<String> newStyleSet = Utils.splitDelimitedString(params, JS_CALLBACK_DELIMITER);
46-
mJsCallbackListener.onSelectionStyleChanged(Utils.getChangeMapFromSets(mPreviousStyleSet, newStyleSet));
46+
mListener.onSelectionStyleChanged(Utils.getChangeMapFromSets(mPreviousStyleSet,
47+
newStyleSet));
4748
mPreviousStyleSet = newStyleSet;
4849
break;
4950
case CALLBACK_SELECTION_CHANGED:

WordPressEditor/src/main/java/org/wordpress/android/editor/JsCallbackListener.java renamed to WordPressEditor/src/main/java/org/wordpress/android/editor/OnJsEditorStateChangedListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.Map;
44

5-
public interface JsCallbackListener {
5+
public interface OnJsEditorStateChangedListener {
66
void onDomLoaded();
77
void onSelectionStyleChanged(Map<String, Boolean> changeSet);
88
}

0 commit comments

Comments
 (0)