Renamed callback classes for clarity

- JsCallbackHandler -> JsCallbackReceiver - JsCallbackListener -> OnJsEditorStateChangedListener
wordpress-mobile · Apr 13, 2015 · b746221 · b746221
1 parent bedf027
commit b746221
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java
@@ -26,7 +26,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class EditorFragment extends EditorFragmentAbstract implements View.OnClickListener, JsCallbackListener {
+public class EditorFragment extends EditorFragmentAbstract implements View.OnClickListener,
+        OnJsEditorStateChangedListener {
     private static final String ARG_PARAM_TITLE = "param_title";
     private static final String ARG_PARAM_CONTENT = "param_content";
 
@@ -105,7 +106,7 @@ public boolean onJsAlert(WebView view, String url, String message, JsResult resu
 
         String htmlEditor = Utils.getHtmlFromFile(getActivity(), "android-editor.html");
 
-        mWebView.addJavascriptInterface(new JsCallbackHandler(this), JS_CALLBACK_HANDLER);
+        mWebView.addJavascriptInterface(new JsCallbackReceiver(this), JS_CALLBACK_HANDLER);
 
         mWebView.loadDataWithBaseURL("file:///android_asset/", htmlEditor, "text/html", "utf-8", "");
 

diff --git a/...ess/android/editor/JsCallbackHandler.java → ...ss/android/editor/JsCallbackReceiver.java b/...ess/android/editor/JsCallbackHandler.java → ...ss/android/editor/JsCallbackReceiver.java
@@ -7,7 +7,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-public class JsCallbackHandler {
+public class JsCallbackReceiver {
     private static final String JS_CALLBACK_DELIMITER = "~";
 
     private static final String CALLBACK_DOM_LOADED = "callback-dom-loaded";
@@ -26,24 +26,25 @@ public class JsCallbackHandler {
 
     private static final String CALLBACK_LOG = "callback-log";
 
-    private final JsCallbackListener mJsCallbackListener;
+    private final OnJsEditorStateChangedListener mListener;
 
     private Set<String> mPreviousStyleSet = new HashSet<>();
 
-    public JsCallbackHandler(EditorFragmentAbstract editorFragmentAbstract) {
-        mJsCallbackListener = (JsCallbackListener) editorFragmentAbstract;
+    public JsCallbackReceiver(EditorFragmentAbstract editorFragmentAbstract) {
+        mListener = (OnJsEditorStateChangedListener) editorFragmentAbstract;
     }
 
     @JavascriptInterface
     public void executeCallback(String callbackId, String params) {
         switch (callbackId) {
             case CALLBACK_DOM_LOADED:
-                mJsCallbackListener.onDomLoaded();
+                mListener.onDomLoaded();
                 break;
             case CALLBACK_SELECTION_STYLE:
                 // Compare the new styles to the previous ones, and notify the JsCallbackListener of the changeset
                 Set<String> newStyleSet = Utils.splitDelimitedString(params, JS_CALLBACK_DELIMITER);
-                mJsCallbackListener.onSelectionStyleChanged(Utils.getChangeMapFromSets(mPreviousStyleSet, newStyleSet));
+                mListener.onSelectionStyleChanged(Utils.getChangeMapFromSets(mPreviousStyleSet,
+                        newStyleSet));
                 mPreviousStyleSet = newStyleSet;
                 break;
             case CALLBACK_SELECTION_CHANGED:

diff --git a/...ss/android/editor/JsCallbackListener.java → ...ditor/OnJsEditorStateChangedListener.java b/...ss/android/editor/JsCallbackListener.java → ...ditor/OnJsEditorStateChangedListener.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-public interface JsCallbackListener {
+public interface OnJsEditorStateChangedListener {
     void onDomLoaded();
     void onSelectionStyleChanged(Map<String, Boolean> changeSet);
 }