Added EditorWebViewAbstract and replaced EditorWebView usage in Edito…

…rFragment
wordpress-mobile · Apr 24, 2015 · ef8b078 · ef8b078
1 parent 6195fe0
commit ef8b078
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 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
@@ -40,7 +40,7 @@ public class EditorFragment extends EditorFragmentAbstract implements View.OnCli
     private String mParamContent;
 
     private Activity mActivity;
-    private EditorWebView mWebView;
+    private EditorWebViewAbstract mWebView;
 
     private final Map<String, ToggleButton> mTagToggleButtonMap = new HashMap<>();
 
@@ -69,7 +69,7 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_editor, container, false);
-        mWebView = (EditorWebView) view.findViewById(R.id.webview);
+        mWebView = (EditorWebViewAbstract) view.findViewById(R.id.webview);
         initWebView();
 
         ToggleButton boldButton = (ToggleButton) view.findViewById(R.id.bold);

diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebView.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebView.java
@@ -2,27 +2,13 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.webkit.WebView;
 
-public class EditorWebView extends WebView {
-
-    public EditorWebView(Context context) {
-        super(context);
-    }
+public class EditorWebView extends EditorWebViewAbstract {
 
     public EditorWebView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public EditorWebView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    public boolean onCheckIsTextEditor() {
-        return true;
-    }
-
     public void execJavaScriptFromString(String javaScript) {
         this.loadUrl("javascript:" + javaScript);
     }

diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewAbstract.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewAbstract.java
@@ -0,0 +1,18 @@
+package org.wordpress.android.editor;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.webkit.WebView;
+
+public abstract class EditorWebViewAbstract extends WebView {
+    public abstract void execJavaScriptFromString(String javaScript);
+
+    public EditorWebViewAbstract(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onCheckIsTextEditor() {
+        return true;
+    }
+}