Reorder fields/methods in JniInterface

remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chromoting.jni;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ skipping 20 matching lines @@
 
 /**
  * Initializes the Chromium remoting library, and provides JNI calls into it.
  * All interaction with the native code is centralized in this class.
  */
 @JNINamespace("remoting")
 public class JniInterface {
     /** The status code indicating successful connection. */
     private static final int SUCCESSFUL_CONNECTION = 3;
 
-    /** The application context. */
-    private static Activity sContext = null;
-
     /*
      * Library-loading state machine.
      */
     /** Whether we've already loaded the library. */
     private static boolean sLoaded = false;
 
+    /** The application context. */
+    private static Activity sContext = null;
+
+    /*
+     * Connection-initiating state machine.
+     */
+    /** Whether the native code is attempting a connection. */
+    private static boolean sConnected = false;
+
+    /** Callback to signal upon successful connection. */
+    private static Runnable sSuccessCallback = null;
+
+    /** Dialog for reporting connection progress. */
+    private static ProgressDialog sProgressIndicator = null;
+
+    /** Callback to signal whenever we need to redraw. */
+    private static Runnable sRedrawCallback = null;
+
+    /** Bitmap holding a copy of the latest video frame. */
+    private static Bitmap sFrameBitmap = null;
+
+    /** Lock to protect the frame bitmap reference. */
+    private static final Object sFrameLock = new Object();
+
+    /** Position of cursor hot-spot. */
+    private static Point sCursorHotspot = new Point();
+
+    /** Bitmap holding the cursor shape. */
+    private static Bitmap sCursorBitmap = null;
+
     /**
      * To be called once from the main Activity. Any subsequent calls will update the application
      * context, but not reload the library. This is useful e.g. when the activity is closed and the
      * user later wants to return to the application.
      */
     public static void loadLibrary(Activity context) {
         sContext = context;
 
         synchronized(JniInterface.class) {
             if (sLoaded) return;
         }
 
         System.loadLibrary("remoting_client_jni");
 
         nativeLoadNative(context);
         sLoaded = true;
     }
 
     /** Performs the native portion of the initialization. */
     private static native void nativeLoadNative(Context context);
 
     /*
      * API/OAuth2 keys access.
      */
     public static native String nativeGetApiKey();
     public static native String nativeGetClientId();
     public static native String nativeGetClientSecret();
 
-    /*
-     * Connection-initiating state machine.
-     */
-    /** Whether the native code is attempting a connection. */
-    private static boolean sConnected = false;
-
-    /** Callback to signal upon successful connection. */
-    private static Runnable sSuccessCallback = null;
-
-    /** Dialog for reporting connection progress. */
-    private static ProgressDialog sProgressIndicator = null;
-
     /** Attempts to form a connection to the user-selected host. */
     public static void connectToHost(String username, String authToken,
             String hostJid, String hostId, String hostPubkey, Runnable successCallback) {
         synchronized(JniInterface.class) {
             if (!sLoaded) return;
 
             if (sConnected) {
                 disconnectFromHost();
             }
         }
 
         sSuccessCallback = successCallback;
         SharedPreferences prefs = sContext.getPreferences(Activity.MODE_PRIVATE);
         nativeConnect(username, authToken, hostJid, hostId, hostPubkey,
                 prefs.getString(hostId + "_id", ""), prefs.getString(hostId + "_secret", ""));
         sConnected = true;
     }
 
+    /** Performs the native portion of the connection. */
+    private static native void nativeConnect(String username, String authToken, String hostJid,
+            String hostId, String hostPubkey, String pairId, String pairSecret);
+
     /** Severs the connection and cleans up. */
     public static void disconnectFromHost() {
         synchronized(JniInterface.class) {
             if (!sLoaded || !sConnected) return;
 
             if (sProgressIndicator != null) {
                 sProgressIndicator.dismiss();
                 sProgressIndicator = null;
             }
         }
 
         nativeDisconnect();
         sSuccessCallback = null;
         sConnected = false;
 
         // Drop the reference to free the Bitmap for GC.
         synchronized (sFrameLock) {
             sFrameBitmap = null;
         }
     }
 
-    /** Performs the native portion of the connection. */
-    private static native void nativeConnect(String username, String authToken, String hostJid,
-            String hostId, String hostPubkey, String pairId, String pairSecret);
-
     /** Performs the native portion of the cleanup. */
     private static native void nativeDisconnect();
 
-    /** Position of cursor hotspot within cursor image. */
-    public static Point getCursorHotspot() { return sCursorHotspot; }
-
-    /** Returns the current cursor shape. */
-    public static Bitmap getCursorBitmap() { return sCursorBitmap; }
-
-    /*
-     * Entry points *from* the native code.
-     */

[Lambros, 2013/11/15 19:36:28]

I removed this comment, which accounts for the missing 3 lines in this CL.

-    /** Callback to signal whenever we need to redraw. */
-    private static Runnable sRedrawCallback = null;
-
-    /** Bitmap holding a copy of the latest video frame. */
-    private static Bitmap sFrameBitmap = null;
-
-    /** Lock to protect the frame bitmap reference. */
-    private static final Object sFrameLock = new Object();
-
-    /** Position of cursor hot-spot. */
-    private static Point sCursorHotspot = new Point();
-
-    /** Bitmap holding the cursor shape. */
-    private static Bitmap sCursorBitmap = null;
-
     /** Reports whenever the connection status changes. */
     @CalledByNative
     private static void reportConnectionStatus(int state, int error) {
         if (state < SUCCESSFUL_CONNECTION && error == 0) {
             // The connection is still being established, so we'll report the current progress.
             synchronized (JniInterface.class) {
                 if (sProgressIndicator == null) {
                     sProgressIndicator = ProgressDialog.show(sContext, sContext.
                             getString(R.string.progress_title), sContext.getResources().
                             getStringArray(R.array.protoc_states)[state], true, true,
@@ skipping 94 matching lines @@
                     @Override
                     public void onCancel(DialogInterface dialog) {
                         // The user backed out of the dialog (equivalent to the cancel button).
                         pinDialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick();
                     }
                 });
 
         pinDialog.show();
     }
 
+    /** Performs the native response to the user's PIN. */
+    private static native void nativeAuthenticationResponse(String pin, boolean createPair);
+
     /** Saves newly-received pairing credentials to permanent storage. */
     @CalledByNative
     private static void commitPairingCredentials(String host, byte[] id, byte[] secret) {
         synchronized (sContext) {
             sContext.getPreferences(Activity.MODE_PRIVATE).edit().
                     putString(host + "_id", new String(id)).
                     putString(host + "_secret", new String(secret)).
                     apply();
         }
     }
 
+    /** Moves the mouse cursor, possibly while clicking the specified (nonnegative) button. */
+    public static void mouseAction(int x, int y, int whichButton, boolean buttonDown) {
+        if (!sConnected) {
+            return;
+        }
+
+        nativeMouseAction(x, y, whichButton, buttonDown);
+    }
+
+    /** Passes mouse information to the native handling code. */
+    private static native void nativeMouseAction(int x, int y, int whichButton, boolean buttonDown);
+
+    /** Presses and releases the specified (nonnegative) key. */
+    public static void keyboardAction(int keyCode, boolean keyDown) {
+        if (!sConnected) {
+            return;
+        }
+
+        nativeKeyboardAction(keyCode, keyDown);
+    }
+
+    /** Passes key press information to the native handling code. */
+    private static native void nativeKeyboardAction(int keyCode, boolean keyDown);
+
     /**
      * Sets the redraw callback to the provided functor. Provide a value of null whenever the
      * window is no longer visible so that we don't continue to draw onto it.
      */
     public static void provideRedrawCallback(Runnable redrawCallback) {
         sRedrawCallback = redrawCallback;
     }
 
     /** Forces the native graphics thread to redraw to the canvas. */
     public static boolean redrawGraphics() {
         synchronized(JniInterface.class) {
             if (!sConnected || sRedrawCallback == null) return false;
         }
 
         nativeScheduleRedraw();
         return true;
     }
 
+    /** Schedules a redraw on the native graphics thread. */
+    private static native void nativeScheduleRedraw();
+
     /** Performs the redrawing callback. This is a no-op if the window isn't visible. */
     @CalledByNative
     private static void redrawGraphicsInternal() {
         if (sRedrawCallback != null) {
             sRedrawCallback.run();
         }
     }
 
     /**
      * Returns a bitmap of the latest video frame. Called on the native graphics thread when
@@ skipping 44 matching lines @@
     public static void updateCursorShape(int width, int height, int hotspotX, int hotspotY,
                                          ByteBuffer buffer) {
         sCursorHotspot = new Point(hotspotX, hotspotY);
 
         int[] data = new int[width * height];
         buffer.order(ByteOrder.LITTLE_ENDIAN);
         buffer.asIntBuffer().get(data, 0, data.length);
         sCursorBitmap = Bitmap.createBitmap(data, width, height, Bitmap.Config.ARGB_8888);
     }
 
-    /** Moves the mouse cursor, possibly while clicking the specified (nonnegative) button. */
-    public static void mouseAction(int x, int y, int whichButton, boolean buttonDown) {
-        if (!sConnected) {
-            return;
-        }
+    /** Position of cursor hotspot within cursor image. */
+    public static Point getCursorHotspot() { return sCursorHotspot; }
 
-        nativeMouseAction(x, y, whichButton, buttonDown);
-    }
-
-    /** Presses and releases the specified (nonnegative) key. */
-    public static void keyboardAction(int keyCode, boolean keyDown) {
-        if (!sConnected) {
-            return;
-        }
-
-        nativeKeyboardAction(keyCode, keyDown);
-    }
-
-    /** Performs the native response to the user's PIN. */
-    private static native void nativeAuthenticationResponse(String pin, boolean createPair);
-
-    /** Schedules a redraw on the native graphics thread. */
-    private static native void nativeScheduleRedraw();
-
-    /** Passes mouse information to the native handling code. */
-    private static native void nativeMouseAction(int x, int y, int whichButton, boolean buttonDown);
-
-    /** Passes key press information to the native handling code. */
-    private static native void nativeKeyboardAction(int keyCode, boolean keyDown);
+    /** Returns the current cursor shape. */
+    public static Bitmap getCursorBitmap() { return sCursorBitmap; }
 }