Bug 575866 - Move GeckoInputConnection class into its own file, r=blassey
authorMichael Wu <mwu@mozilla.com>
Tue, 29 Jun 2010 21:13:44 -0700
changeset 46428 d4cedbf0062535ae22caafda549cd55b5edc537f
parent 46427 e7d8dc674c0516e8ed184c29dac465ea355f7821
child 46429 9cb6ba93cf985a70b38a0f04041d0279ed1e5df1
push id14182
push usermwu@mozilla.com
push dateWed, 30 Jun 2010 04:16:02 +0000
treeherdermozilla-central@d4cedbf00625 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey
bugs575866
milestone2.0b2pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 575866 - Move GeckoInputConnection class into its own file, r=blassey
embedding/android/GeckoInputConnection.java
embedding/android/GeckoSurfaceView.java
embedding/android/Makefile.in
new file mode 100644
--- /dev/null
+++ b/embedding/android/GeckoInputConnection.java
@@ -0,0 +1,174 @@
+/* -*- Mode: Java; tab-width: 20; indent-tabs-mode: nil; -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Android code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Michael Wu <mwu@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.gecko;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+import android.os.*;
+import android.app.*;
+import android.text.*;
+import android.view.*;
+import android.view.inputmethod.*;
+import android.content.*;
+
+import android.util.*;
+
+public class GeckoInputConnection
+    extends BaseInputConnection
+{
+    public GeckoInputConnection (View targetView) {
+        super(targetView, true);
+        mQueryResult = new SynchronousQueue<String>();
+        mExtractedText.partialStartOffset = -1;
+        mExtractedText.partialEndOffset = -1;
+    }
+
+    @Override
+    public Editable getEditable() {
+        Log.i("GeckoAppJava", "getEditable");
+        return null;
+    }
+
+    @Override
+    public boolean beginBatchEdit() {
+        GeckoAppShell.sendEventToGecko(new GeckoEvent(true, null));
+        return true;
+    }
+    @Override
+    public boolean commitCompletion(CompletionInfo text) {
+        Log.i("GeckoAppJava", "Stub: commitCompletion");
+        return true;
+    }
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+        GeckoAppShell.sendEventToGecko(new GeckoEvent(true, text.toString()));
+        endBatchEdit();
+        return true;
+    }
+    @Override
+    public boolean deleteSurroundingText(int leftLength, int rightLength) {
+        GeckoAppShell.sendEventToGecko(new GeckoEvent(leftLength, rightLength));
+        updateExtractedText();
+        return true;
+    }
+    @Override
+    public boolean endBatchEdit() {
+        updateExtractedText();
+        GeckoAppShell.sendEventToGecko(new GeckoEvent(false, null));
+        return true;
+    }
+    @Override
+    public boolean finishComposingText() {
+        endBatchEdit();
+        return true;
+    }
+    @Override
+    public int getCursorCapsMode(int reqModes) {
+        return 0;
+    }
+    @Override
+    public ExtractedText getExtractedText(ExtractedTextRequest req, int flags) {
+        mExtractToken = req.token;
+        GeckoAppShell.sendEventToGecko(new GeckoEvent(false, 0));
+        try {
+            mExtractedText.text = mQueryResult.take();
+            mExtractedText.selectionStart = mSelectionStart;
+            mExtractedText.selectionEnd = mSelectionEnd;
+        } catch (InterruptedException e) {
+            Log.i("GeckoAppJava", "getExtractedText: Interrupted!");
+        }
+        return mExtractedText;
+    }
+    @Override
+    public CharSequence getTextAfterCursor(int length, int flags) {
+        GeckoAppShell.sendEventToGecko(new GeckoEvent(true, length));
+        try {
+            String result = mQueryResult.take();
+            return result;
+        } catch (InterruptedException e) {
+            Log.i("GeckoAppJava", "getTextAfterCursor: Interrupted!");
+        }
+        return null;
+    }
+    @Override
+    public CharSequence getTextBeforeCursor(int length, int flags) {
+        GeckoAppShell.sendEventToGecko(new GeckoEvent(false, length));
+        try {
+            String result = mQueryResult.take();
+            return result;
+        } catch (InterruptedException e) {
+            Log.i("GeckoAppJava", "getTextBeforeCursor: Interrupted!");
+        }
+        return null;
+    }
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+        beginBatchEdit();
+        GeckoAppShell.sendEventToGecko(new GeckoEvent(true, text.toString()));
+        return true;
+    }
+    @Override
+    public boolean setSelection(int start, int end) {
+        Log.i("GeckoAppJava", "Stub: setSelection " + start + " " + end);
+        return true;
+    }
+
+    private void updateExtractedText() {
+        GeckoAppShell.sendEventToGecko(new GeckoEvent(false, 0));
+        try {
+            mExtractedText.text = mQueryResult.take();
+            mExtractedText.selectionStart = mSelectionStart;
+            mExtractedText.selectionEnd = mSelectionEnd;
+        } catch (InterruptedException e) {
+            Log.i("GeckoAppJava", "getExtractedText: Interrupted!");
+        }
+
+        InputMethodManager imm = (InputMethodManager)
+            GeckoApp.surfaceView.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.updateExtractedText(GeckoApp.surfaceView, mExtractToken, mExtractedText);
+    }
+
+    int mExtractToken;
+    final ExtractedText mExtractedText = new ExtractedText();
+
+    int mSelectionStart, mSelectionEnd;
+    SynchronousQueue<String> mQueryResult;
+}
--- a/embedding/android/GeckoSurfaceView.java
+++ b/embedding/android/GeckoSurfaceView.java
@@ -306,130 +306,8 @@ class GeckoSurfaceView
     // IME stuff
     GeckoInputConnection inputConnection;
     int mIMEState;
 
     // Software rendering
     ByteBuffer mSoftwareBuffer;
     Bitmap mSoftwareBitmap;
 }
-
-class GeckoInputConnection
-    extends BaseInputConnection
-{
-    public GeckoInputConnection (View targetView) {
-        super(targetView, true);
-        mQueryResult = new SynchronousQueue<String>();
-        mExtractedText.partialStartOffset = -1;
-        mExtractedText.partialEndOffset = -1;
-    }
-
-    @Override
-    public Editable getEditable() {
-        Log.i("GeckoAppJava", "getEditable");
-        return null;
-    }
-
-    @Override
-    public boolean beginBatchEdit() {
-        GeckoAppShell.sendEventToGecko(new GeckoEvent(true, null));
-        return true;
-    }
-    @Override
-    public boolean commitCompletion(CompletionInfo text) {
-        Log.i("GeckoAppJava", "Stub: commitCompletion");
-        return true;
-    }
-    @Override
-    public boolean commitText(CharSequence text, int newCursorPosition) {
-        GeckoAppShell.sendEventToGecko(new GeckoEvent(true, text.toString()));
-        endBatchEdit();
-        return true;
-    }
-    @Override
-    public boolean deleteSurroundingText(int leftLength, int rightLength) {
-        GeckoAppShell.sendEventToGecko(new GeckoEvent(leftLength, rightLength));
-        updateExtractedText();
-        return true;
-    }
-    @Override
-    public boolean endBatchEdit() {
-        updateExtractedText();
-        GeckoAppShell.sendEventToGecko(new GeckoEvent(false, null));
-        return true;
-    }
-    @Override
-    public boolean finishComposingText() {
-        endBatchEdit();
-        return true;
-    }
-    @Override
-    public int getCursorCapsMode(int reqModes) {
-        return 0;
-    }
-    @Override
-    public ExtractedText getExtractedText(ExtractedTextRequest req, int flags) {
-        mExtractToken = req.token;
-        GeckoAppShell.sendEventToGecko(new GeckoEvent(false, 0));
-        try {
-            mExtractedText.text = mQueryResult.take();
-            mExtractedText.selectionStart = mSelectionStart;
-            mExtractedText.selectionEnd = mSelectionEnd;
-        } catch (InterruptedException e) {
-            Log.i("GeckoAppJava", "getExtractedText: Interrupted!");
-        }
-        return mExtractedText;
-    }
-    @Override
-    public CharSequence getTextAfterCursor(int length, int flags) {
-        GeckoAppShell.sendEventToGecko(new GeckoEvent(true, length));
-        try {
-            String result = mQueryResult.take();
-            return result;
-        } catch (InterruptedException e) {
-            Log.i("GeckoAppJava", "getTextAfterCursor: Interrupted!");
-        }
-        return null;
-    }
-    @Override
-    public CharSequence getTextBeforeCursor(int length, int flags) {
-        GeckoAppShell.sendEventToGecko(new GeckoEvent(false, length));
-        try {
-            String result = mQueryResult.take();
-            return result;
-        } catch (InterruptedException e) {
-            Log.i("GeckoAppJava", "getTextBeforeCursor: Interrupted!");
-        }
-        return null;
-    }
-    @Override
-    public boolean setComposingText(CharSequence text, int newCursorPosition) {
-        beginBatchEdit();
-        GeckoAppShell.sendEventToGecko(new GeckoEvent(true, text.toString()));
-        return true;
-    }
-    @Override
-    public boolean setSelection(int start, int end) {
-        Log.i("GeckoAppJava", "Stub: setSelection " + start + " " + end);
-        return true;
-    }
-
-    private void updateExtractedText() {
-        GeckoAppShell.sendEventToGecko(new GeckoEvent(false, 0));
-        try {
-            mExtractedText.text = mQueryResult.take();
-            mExtractedText.selectionStart = mSelectionStart;
-            mExtractedText.selectionEnd = mSelectionEnd;
-        } catch (InterruptedException e) {
-            Log.i("GeckoAppJava", "getExtractedText: Interrupted!");
-        }
-
-        InputMethodManager imm = (InputMethodManager)
-            GeckoApp.surfaceView.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.updateExtractedText(GeckoApp.surfaceView, mExtractToken, mExtractedText);
-    }
-
-    int mExtractToken;
-    final ExtractedText mExtractedText = new ExtractedText();
-
-    int mSelectionStart, mSelectionEnd;
-    SynchronousQueue<String> mQueryResult;
-}
--- a/embedding/android/Makefile.in
+++ b/embedding/android/Makefile.in
@@ -43,16 +43,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/ipc/app/defs.mk
 
 JAVAFILES = \
   GeckoApp.java \
   GeckoAppShell.java \
   GeckoEvent.java \
   GeckoSurfaceView.java \
+  GeckoInputConnection.java \
   $(NULL)
 
 DEFINES += \
   -DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
   -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
   -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
 GARBAGE += \