Bug 1081397: Finalise large numbers of fields. r=rnewman

* * *
Bug 1081397: Finalise large numbers of fields. r=rnewman
This commit is contained in:
Chris Kitching 2014-10-11 00:17:01 +01:00
parent f4746e8579
commit ef5903ad00
146 changed files with 318 additions and 318 deletions

View File

@ -18,9 +18,9 @@ class ActionModeCompat implements GeckoPopupMenu.OnMenuItemClickListener,
View.OnClickListener {
private final String LOGTAG = "GeckoActionModeCompat";
private Callback mCallback;
private ActionModeCompatView mView;
private Presenter mPresenter;
private final Callback mCallback;
private final ActionModeCompatView mView;
private final Presenter mPresenter;
/* A set of callbacks to be called during this ActionMode's lifecycle. These will control the
* creation, interaction with, and destruction of menuitems for the view */

View File

@ -33,7 +33,7 @@ public class AlertNotification
private String mPrevAlertText = "";
private static final double UPDATE_THRESHOLD = .01;
private Context mContext;
private final Context mContext;
public AlertNotification(Context aContext, int aNotificationId, int aIcon,
String aTitle, String aText, long aWhen, Uri aIconUri) {

View File

@ -240,7 +240,7 @@ public class BrowserApp extends GeckoApp
// race by determining if the web content should be hidden at the animation's end.
private boolean mHideWebContentOnAnimationEnd;
private DynamicToolbar mDynamicToolbar = new DynamicToolbar();
private final DynamicToolbar mDynamicToolbar = new DynamicToolbar();
@Override
public View onCreateView(final String name, final Context context, final AttributeSet attrs) {

View File

@ -55,11 +55,11 @@ public class BrowserLocaleManager implements LocaleManager {
private volatile Locale currentLocale;
private volatile Locale systemLocale = Locale.getDefault();
private AtomicBoolean inited = new AtomicBoolean(false);
private final AtomicBoolean inited = new AtomicBoolean(false);
private boolean systemLocaleDidChange;
private BroadcastReceiver receiver;
private static AtomicReference<LocaleManager> instance = new AtomicReference<LocaleManager>();
private static final AtomicReference<LocaleManager> instance = new AtomicReference<LocaleManager>();
public static LocaleManager getInstance() {
LocaleManager localeManager = instance.get();

View File

@ -43,7 +43,7 @@ class ChromeCast implements GeckoMediaPlayer {
private final RouteInfo route;
private GoogleApiClient apiClient;
private RemoteMediaPlayer remoteMediaPlayer;
private boolean canMirror;
private final boolean canMirror;
private String mSessionId;
private MirrorChannel mMirrorChannel;
private boolean mApplicationStarted = false;

View File

@ -90,8 +90,8 @@ public class ContactService implements GeckoEventListener {
private HashMap<String, Integer> mWebsiteTypesMap;
private HashMap<String, Integer> mImTypesMap;
private ContentResolver mContentResolver;
private GeckoApp mActivity;
private final ContentResolver mContentResolver;
private final GeckoApp mActivity;
ContactService(EventDispatcher eventDispatcher, GeckoApp activity) {
mEventDispatcher = eventDispatcher;

View File

@ -31,7 +31,7 @@ public class DoorHangerPopup extends ArrowPopup
// Stores a set of all active DoorHanger notifications. A DoorHanger is
// uniquely identified by its tabId and value.
private HashSet<DoorHanger> mDoorHangers;
private final HashSet<DoorHanger> mDoorHangers;
// Whether or not the doorhanger popup is disabled.
private boolean mDisabled;

View File

@ -401,8 +401,8 @@ public class FormAssistPopup extends RelativeLayout implements GeckoEventListene
}
private class AutoCompleteListAdapter extends ArrayAdapter<Pair<String, String>> {
private LayoutInflater mInflater;
private int mTextViewResourceId;
private final LayoutInflater mInflater;
private final int mTextViewResourceId;
public AutoCompleteListAdapter(Context context, int textViewResourceId) {
super(context, textViewResourceId);

View File

@ -183,7 +183,7 @@ public abstract class GeckoApp
private FullScreenHolder mFullScreenPluginContainer;
private View mFullScreenPluginView;
private HashMap<String, PowerManager.WakeLock> mWakeLocks = new HashMap<String, PowerManager.WakeLock>();
private final HashMap<String, PowerManager.WakeLock> mWakeLocks = new HashMap<String, PowerManager.WakeLock>();
protected boolean mShouldRestore;
protected boolean mInitialized;

View File

@ -30,7 +30,7 @@ public class GeckoBatteryManager extends BroadcastReceiver {
private static boolean sCharging = kDefaultCharging;
private static double sRemainingTime = kDefaultRemainingTime;
private static GeckoBatteryManager sInstance = new GeckoBatteryManager();
private static final GeckoBatteryManager sInstance = new GeckoBatteryManager();
private final IntentFilter mFilter;
private Context mApplicationContext;

View File

@ -25,7 +25,7 @@ public class GeckoConnectivityReceiver extends BroadcastReceiver {
private static final String LOGTAG = "GeckoConnectivityReceiver";
private static GeckoConnectivityReceiver sInstance = new GeckoConnectivityReceiver();
private static final GeckoConnectivityReceiver sInstance = new GeckoConnectivityReceiver();
private final IntentFilter mFilter;
private Context mApplicationContext;

View File

@ -43,7 +43,7 @@ public class GeckoEvent {
private static final int EVENT_FACTORY_SIZE = 5;
// Maybe we're probably better to just make mType non final, and just store GeckoEvents in here...
private static SparseArray<ArrayBlockingQueue<GeckoEvent>> mEvents = new SparseArray<ArrayBlockingQueue<GeckoEvent>>();
private static final SparseArray<ArrayBlockingQueue<GeckoEvent>> mEvents = new SparseArray<ArrayBlockingQueue<GeckoEvent>>();
public static GeckoEvent get(NativeGeckoEvent type) {
synchronized (mEvents) {

View File

@ -997,7 +997,7 @@ final class DebugGeckoInputConnection
implements InvocationHandler {
private InputConnection mProxy;
private StringBuilder mCallLevel;
private final StringBuilder mCallLevel;
private DebugGeckoInputConnection(View targetView,
GeckoEditableClient editable) {

View File

@ -62,7 +62,7 @@ public class GeckoJavaSampler {
private boolean mPauseSampler;
private boolean mStopSampler;
private SparseArray<Sample[]> mSamples = new SparseArray<Sample[]>();
private final SparseArray<Sample[]> mSamples = new SparseArray<Sample[]>();
private int mSamplePos;
public SamplingThread(final int aInterval, final int aSampleCount) {

View File

@ -40,7 +40,7 @@ public final class GeckoProfile {
public static final String DEFAULT_PROFILE = "default";
public static final String GUEST_PROFILE = "guest";
private static HashMap<String, GeckoProfile> sProfileCache = new HashMap<String, GeckoProfile>();
private static final HashMap<String, GeckoProfile> sProfileCache = new HashMap<String, GeckoProfile>();
private static String sDefaultProfileName;
// Caches the guest profile dir.

View File

@ -58,7 +58,7 @@ public class GeckoProfileDirectories {
/**
* Returns true if the supplied profile entry represents the default profile.
*/
private static INISectionPredicate sectionIsDefault = new INISectionPredicate() {
private static final INISectionPredicate sectionIsDefault = new INISectionPredicate() {
@Override
public boolean matches(INISection section) {
return section.getIntProperty("Default") == 1;
@ -68,7 +68,7 @@ public class GeckoProfileDirectories {
/**
* Returns true if the supplied profile entry has a 'Name' field.
*/
private static INISectionPredicate sectionHasName = new INISectionPredicate() {
private static final INISectionPredicate sectionHasName = new INISectionPredicate() {
@Override
public boolean matches(INISection section) {
final String name = section.getStringProperty("Name");

View File

@ -37,7 +37,7 @@ public class GeckoThread extends Thread implements GeckoEventListener {
GeckoExited
}
private static AtomicReference<LaunchState> sLaunchState =
private static final AtomicReference<LaunchState> sLaunchState =
new AtomicReference<LaunchState>(LaunchState.Launching);
private static GeckoThread sGeckoThread;

View File

@ -31,7 +31,7 @@ public final class IntentHelper implements GeckoEventListener {
};
private static IntentHelper instance;
private Activity activity;
private final Activity activity;
private IntentHelper(Activity activity) {
this.activity = activity;

View File

@ -26,11 +26,11 @@ import android.graphics.drawable.Drawable;
* to specify the alpha) in order.
*/
public class LightweightThemeDrawable extends Drawable {
private Paint mPaint;
private final Paint mPaint;
private Paint mColorPaint;
private Bitmap mBitmap;
private Resources mResources;
private final Bitmap mBitmap;
private final Resources mResources;
private int mStartColor;
private int mEndColor;

View File

@ -47,7 +47,7 @@ class MemoryMonitor extends BroadcastReceiver {
private static final int MEMORY_PRESSURE_MEDIUM = 3;
private static final int MEMORY_PRESSURE_HIGH = 4;
private static MemoryMonitor sInstance = new MemoryMonitor();
private static final MemoryMonitor sInstance = new MemoryMonitor();
static MemoryMonitor getInstance() {
return sInstance;

View File

@ -64,7 +64,7 @@ public final class NotificationHelper implements GeckoEventListener {
private static final String CLEARED_EVENT = "notification-cleared";
private static final String CLOSED_EVENT = "notification-closed";
private Context mContext;
private final Context mContext;
// Holds a list of notifications that should be cleared if the Fennec Activity is shut down.
// Will not include ongoing or persistent notifications that are tied to Gecko's lifecycle.

View File

@ -26,7 +26,7 @@ public class ScrollAnimator implements View.OnGenericMotionListener {
static final float MAX_SCROLL = 0.075f * GeckoAppShell.getDpi();
private class ScrollRunnable extends TimerTask {
private View mView;
private final View mView;
public ScrollRunnable(View view) {
mView = view;

View File

@ -46,7 +46,7 @@ public class SuggestClient {
private final int mMaxResults;
// used by robocop for testing
private boolean mCheckNetwork;
private final boolean mCheckNetwork;
// used to make suggestions appear instantly after opt-in
private String mPrevQuery;

View File

@ -45,27 +45,27 @@ public class Tab {
private int mFaviconSize;
private boolean mHasFeeds;
private boolean mHasOpenSearch;
private SiteIdentity mSiteIdentity;
private final SiteIdentity mSiteIdentity;
private boolean mReaderEnabled;
private BitmapDrawable mThumbnail;
private int mHistoryIndex;
private int mHistorySize;
private int mParentId;
private boolean mExternal;
private final int mParentId;
private final boolean mExternal;
private boolean mBookmark;
private int mFaviconLoadId;
private String mContentType;
private boolean mHasTouchListeners;
private ZoomConstraints mZoomConstraints;
private boolean mIsRTL;
private ArrayList<View> mPluginViews;
private HashMap<Object, Layer> mPluginLayers;
private final ArrayList<View> mPluginViews;
private final HashMap<Object, Layer> mPluginLayers;
private int mBackgroundColor;
private int mState;
private Bitmap mThumbnailBitmap;
private boolean mDesktopMode;
private boolean mEnteringReaderMode;
private Context mAppContext;
private final Context mAppContext;
private ErrorType mErrorType = ErrorType.NONE;
private static final int MAX_HISTORY_LIST_SIZE = 50;
private volatile int mLoadProgress;

View File

@ -65,7 +65,7 @@ public class Tabs implements GeckoEventListener {
public static final int INVALID_TAB_ID = -1;
private static AtomicInteger sTabId = new AtomicInteger(0);
private static final AtomicInteger sTabId = new AtomicInteger(0);
private volatile boolean mInitialTabsAdded;
private Context mAppContext;

View File

@ -54,7 +54,7 @@ class TextSelection extends Layer implements GeckoEventListener {
// These timers are used to avoid flicker caused by selection handles showing/hiding quickly. For isntance
// when moving between single handle caret mode and two handle selection mode.
private Timer mActionModeTimer = new Timer("actionMode");
private final Timer mActionModeTimer = new Timer("actionMode");
private class ActionModeTimerTask extends TimerTask {
@Override
public void run() {

View File

@ -35,7 +35,7 @@ class AnimatorProxy {
public View getView();
}
private AnimatorProxyImpl mImpl;
private final AnimatorProxyImpl mImpl;
private AnimatorProxy(AnimatorProxyImpl impl) {
mImpl = impl;
@ -146,7 +146,7 @@ class AnimatorProxy {
* the NineOldAndroids library under the Apache License 2.0.
*/
private static class AnimatorProxyPreHC extends Animation implements AnimatorProxyImpl {
private WeakReference<View> mViewRef;
private final WeakReference<View> mViewRef;
private final RectF mBefore;
private final RectF mAfter;
@ -291,7 +291,7 @@ class AnimatorProxy {
}
private static class AnimatorProxyPostHC implements AnimatorProxyImpl {
private WeakReference<View> mViewRef;
private final WeakReference<View> mViewRef;
public AnimatorProxyPostHC(View view) {
mViewRef = new WeakReference<View>(view);

View File

@ -32,7 +32,7 @@ public class BounceAnimator extends ValueAnimator {
private final View mView;
private final String mPropertyName;
private List<Animator> animatorChain = new LinkedList<Animator>();
private final List<Animator> animatorChain = new LinkedList<Animator>();
public BounceAnimator(View view, String property) {
mView = view;

View File

@ -46,11 +46,11 @@ public class PropertyAnimator implements Runnable {
public void onPropertyAnimationEnd();
}
private Interpolator mInterpolator;
private final Interpolator mInterpolator;
private long mStartTime;
private long mDuration;
private float mDurationReciprocal;
private List<ElementHolder> mElementsList;
private final long mDuration;
private final float mDurationReciprocal;
private final List<ElementHolder> mElementsList;
private List<PropertyAnimationListener> mListeners;
FramePoster mFramePoster;
private boolean mUseHardwareLayer;

View File

@ -50,7 +50,7 @@ public class TelemetryRecorder {
private File tmpFile;
private File destFile;
private File cacheDir;
private final File cacheDir;
private OutputStream outputStream;
private MessageDigest checksum;

View File

@ -909,7 +909,7 @@ public class HealthReportDatabaseStorage implements HealthReportStorage {
* Cache the lookup from measurement and field specifier to field instance.
* This allows us to memoize the field ID lookup, too.
*/
private HashMap<String, Field> fields = new HashMap<String, Field>();
private final HashMap<String, Field> fields = new HashMap<String, Field>();
private boolean fieldsCacheUpdated = false;
private void invalidateFieldsCache() {

View File

@ -17,7 +17,7 @@ import android.content.Context;
public class HealthReportDatabases {
private static final String LOG_TAG = "HealthReportDatabases";
private Context context;
private final Context context;
private final HashMap<File, HealthReportDatabaseStorage> storages = new HashMap<File, HealthReportDatabaseStorage>();

View File

@ -53,7 +53,7 @@ public abstract class PreferenceFragment extends Fragment implements PreferenceM
// The issue is that the Handler references the Fragment; messages targeting
// the Handler reference it; and if such messages are long lived, the Fragment
// cannot be GCed. This is not an issue for us; our messages are short-lived.
private Handler mHandler = new Handler() {
private final Handler mHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
@ -299,7 +299,7 @@ public abstract class PreferenceFragment extends Fragment implements PreferenceM
mHandler.post(mRequestFocus);
}
private OnKeyListener mListOnKeyListener = new OnKeyListener() {
private final OnKeyListener mListOnKeyListener = new OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {

View File

@ -50,8 +50,8 @@ import android.util.Log;
public abstract class AbstractTransactionalProvider extends ContentProvider {
private static final String LOGTAG = "GeckoTransProvider";
private static boolean logDebug = Log.isLoggable(LOGTAG, Log.DEBUG);
private static boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
private static final boolean logDebug = Log.isLoggable(LOGTAG, Log.DEBUG);
private static final boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
protected abstract SQLiteDatabase getReadableDatabase(Uri uri);
protected abstract SQLiteDatabase getWritableDatabase(Uri uri);

View File

@ -1565,8 +1565,8 @@ final class BrowserDatabaseHelper extends SQLiteOpenHelper {
// Calculate these once, at initialization. isLoggable is too expensive to
// have in-line in each log call.
private static boolean logDebug = Log.isLoggable(LOGTAG, Log.DEBUG);
private static boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
private static final boolean logDebug = Log.isLoggable(LOGTAG, Log.DEBUG);
private static final boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
protected static void trace(String message) {
if (logVerbose) {
Log.v(LOGTAG, message);

View File

@ -247,8 +247,8 @@ public class BrowserProvider extends SharedBrowserDatabaseProvider {
// Calculate these once, at initialization. isLoggable is too expensive to
// have in-line in each log call.
private static boolean logDebug = Log.isLoggable(LOGTAG, Log.DEBUG);
private static boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
private static final boolean logDebug = Log.isLoggable(LOGTAG, Log.DEBUG);
private static final boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
protected static void trace(String message) {
if (logVerbose) {
Log.v(LOGTAG, message);

View File

@ -32,8 +32,8 @@ public class FormHistoryProvider extends SQLiteBridgeContentProvider {
// This should be kept in sync with the db version in toolkit/components/satchel/nsFormHistory.js
private static int DB_VERSION = 4;
private static String DB_FILENAME = "formhistory.sqlite";
private static final int DB_VERSION = 4;
private static final String DB_FILENAME = "formhistory.sqlite";
private static final String TELEMETRY_TAG = "SQLITEBRIDGE_PROVIDER_FORMS";
private static final String WHERE_GUID_IS_NULL = BrowserContract.DeletedFormHistory.GUID + " IS NULL";

View File

@ -27,8 +27,8 @@ public class HomeProvider extends SQLiteBridgeContentProvider {
private static final String LOGTAG = "GeckoHomeProvider";
// This should be kept in sync with the db version in mobile/android/modules/HomeProvider.jsm
private static int DB_VERSION = 2;
private static String DB_FILENAME = "home.sqlite";
private static final int DB_VERSION = 2;
private static final String DB_FILENAME = "home.sqlite";
private static final String TELEMETRY_TAG = "SQLITEBRIDGE_PROVIDER_HOME";
private static final String TABLE_ITEMS = "items";

View File

@ -39,8 +39,8 @@ public class PasswordsProvider extends SQLiteBridgeContentProvider {
private static final UriMatcher URI_MATCHER;
private static HashMap<String, String> PASSWORDS_PROJECTION_MAP;
private static HashMap<String, String> DELETED_PASSWORDS_PROJECTION_MAP;
private static final HashMap<String, String> PASSWORDS_PROJECTION_MAP;
private static final HashMap<String, String> DELETED_PASSWORDS_PROJECTION_MAP;
// this should be kept in sync with the version in toolkit/components/passwordmgr/storage-mozStorage.js
private static final int DB_VERSION = 5;

View File

@ -74,7 +74,7 @@ abstract public class FxAccountAbstractSetupActivity extends FxAccountAbstractAc
// By default, any custom server configuration is only shown when the account
// is configured to use a custom server.
private static boolean ALWAYS_SHOW_CUSTOM_SERVER_LAYOUT = false;
private static final boolean ALWAYS_SHOW_CUSTOM_SERVER_LAYOUT = false;
protected int minimumPasswordLength = 8;

View File

@ -130,7 +130,7 @@ abstract class Axis {
private float mTouchPos; /* Position of the most recent touch event on the current drag. */
private float mLastTouchPos; /* Position of the touch event before touchPos. */
private float mVelocity; /* Velocity in this direction; pixels per animation frame. */
private float[] mRecentVelocities; /* Circular buffer of recent velocities since last touch start. */
private final float[] mRecentVelocities;/* Circular buffer of recent velocities since last touch start. */
private int mRecentVelocityCount; /* Number of values put into mRecentVelocities (unbounded). */
private boolean mScrollingDisabled; /* Whether movement on this axis is locked. */
private boolean mDisableSnap; /* Whether overscroll snapping is disabled. */

View File

@ -18,7 +18,7 @@ public class BufferedCairoImage extends CairoImage {
private IntSize mSize;
private int mFormat;
private static String LOGTAG = "GeckoBufferedCairoImage";
private static final String LOGTAG = "GeckoBufferedCairoImage";
/** Creates a buffered Cairo image from a byte buffer. */
public BufferedCairoImage(ByteBuffer inBuffer, int inWidth, int inHeight, int inFormat) {

View File

@ -75,7 +75,7 @@ final class DisplayPortCalculator {
PREF_DISPLAYPORT_PB_VELOCITY_THRESHOLD };
PrefsHelper.getPrefs(prefs, new PrefsHelper.PrefHandlerBase() {
private Map<String, Integer> mValues = new HashMap<String, Integer>();
private final Map<String, Integer> mValues = new HashMap<String, Integer>();
@Override public void prefValue(String pref, int value) {
mValues.put(pref, value);

View File

@ -88,7 +88,7 @@ public class GLController {
private EGL10 mEGL;
private EGLDisplay mEGLDisplay;
private EGLConfig mEGLConfig;
private EGLPreloadingThread mEGLPreloadingThread;
private final EGLPreloadingThread mEGLPreloadingThread;
private EGLSurface mEGLSurfaceForCompositor;
private static final int LOCAL_EGL_OPENGL_ES2_BIT = 4;

View File

@ -33,7 +33,7 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
private LayerRenderer mLayerRenderer;
private boolean mLayerRendererInitialized;
private Context mContext;
private final Context mContext;
private IntSize mScreenSize;
private IntSize mWindowSize;
private DisplayPortMetrics mDisplayPort;
@ -59,7 +59,7 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
*/
private ImmutableViewportMetrics mFrameMetrics;
private List<DrawListener> mDrawListeners;
private final List<DrawListener> mDrawListeners;
/* Used as temporaries by syncViewportInfo */
private final ViewTransform mCurrentViewTransform;
@ -94,7 +94,7 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
private final PanZoomController mPanZoomController;
private final LayerMarginsAnimator mMarginsAnimator;
private LayerView mView;
private final LayerView mView;
/* This flag is true from the time that browser.js detects a first-paint is about to start,
* to the time that we receive the first-paint composite notification from the compositor.

View File

@ -41,9 +41,9 @@ class JavaPanZoomController
{
private static final String LOGTAG = "GeckoPanZoomController";
private static String MESSAGE_ZOOM_RECT = "Browser:ZoomToRect";
private static String MESSAGE_ZOOM_PAGE = "Browser:ZoomToPageWidth";
private static String MESSAGE_TOUCH_LISTENER = "Tab:HasTouchListener";
private static final String MESSAGE_ZOOM_RECT = "Browser:ZoomToRect";
private static final String MESSAGE_ZOOM_PAGE = "Browser:ZoomToPageWidth";
private static final String MESSAGE_TOUCH_LISTENER = "Tab:HasTouchListener";
// Animation stops if the velocity is below this value when overscrolled or panning.
private static final float STOPPED_THRESHOLD = 4.0f;
@ -902,8 +902,8 @@ class JavaPanZoomController
* The viewport metrics that represent the start and end of the bounce-back animation,
* respectively.
*/
private ImmutableViewportMetrics mBounceStartMetrics;
private ImmutableViewportMetrics mBounceEndMetrics;
private final ImmutableViewportMetrics mBounceStartMetrics;
private final ImmutableViewportMetrics mBounceEndMetrics;
// How long ago this bounce was started in ns.
private long mBounceDuration;

View File

@ -253,8 +253,8 @@ public class LayerMarginsAnimator {
}
class LayerMarginsAnimationTask extends RenderTask {
private float mStartLeft, mStartTop, mStartRight, mStartBottom;
private float mTop, mBottom, mLeft, mRight;
private final float mStartLeft, mStartTop, mStartRight, mStartBottom;
private final float mTop, mBottom, mLeft, mRight;
private boolean mContinueAnimation;
public LayerMarginsAnimationTask(boolean runAfter, ImmutableViewportMetrics metrics,

View File

@ -69,10 +69,10 @@ public class LayerRenderer implements Tabs.OnTabsChangedListener {
private long mLastFrameTime;
private final CopyOnWriteArrayList<RenderTask> mTasks;
private CopyOnWriteArrayList<Layer> mExtraLayers = new CopyOnWriteArrayList<Layer>();
private final CopyOnWriteArrayList<Layer> mExtraLayers = new CopyOnWriteArrayList<Layer>();
// Dropped frames display
private int[] mFrameTimings;
private final int[] mFrameTimings;
private int mCurrentFrame, mFrameTimingsSum, mDroppedFrames;
// Render profiling output
@ -417,9 +417,9 @@ public class LayerRenderer implements Tabs.OnTabsChangedListener {
// The timestamp recording the start of this frame.
private long mFrameStartTime;
// A fixed snapshot of the viewport metrics that this frame is using to render content.
private ImmutableViewportMetrics mFrameMetrics;
private final ImmutableViewportMetrics mFrameMetrics;
// A rendering context for page-positioned layers, and one for screen-positioned layers.
private RenderContext mPageContext, mScreenContext;
private final RenderContext mPageContext, mScreenContext;
// Whether a layer was updated.
private boolean mUpdated;
private final Rect mPageRect;

View File

@ -50,12 +50,12 @@ import android.widget.FrameLayout;
* Note that LayerView is accessed by Robocop via reflection.
*/
public class LayerView extends FrameLayout implements Tabs.OnTabsChangedListener {
private static String LOGTAG = "GeckoLayerView";
private static final String LOGTAG = "GeckoLayerView";
private GeckoLayerClient mLayerClient;
private PanZoomController mPanZoomController;
private LayerMarginsAnimator mMarginsAnimator;
private GLController mGLController;
private final GLController mGLController;
private InputConnectionHandler mInputConnectionHandler;
private LayerRenderer mRenderer;
/* Must be a PAINT_xxx constant */

View File

@ -18,10 +18,10 @@ import android.widget.AbsoluteLayout;
public class PluginLayer extends TileLayer {
private static final String LOGTAG = "PluginLayer";
private View mView;
private final View mView;
private SurfaceView mSurfaceView;
private PluginLayoutParams mLayoutParams;
private AbsoluteLayout mContainer;
private final PluginLayoutParams mLayoutParams;
private final AbsoluteLayout mContainer;
private boolean mDestroyed;
private boolean mViewVisible;
@ -123,7 +123,7 @@ public class PluginLayer extends TileLayer {
private static final String LOGTAG = "GeckoApp.PluginLayoutParams";
private RectF mRect;
private int mMaxDimension;
private final int mMaxDimension;
private float mLastResolution;
public PluginLayoutParams(RectF rect, int maxDimension) {

View File

@ -28,7 +28,7 @@ public class ScrollbarLayer extends TileLayer {
private final float[] mCoords;
private final RectF mCapRectF;
private LayerRenderer mRenderer;
private final LayerRenderer mRenderer;
private int mProgram;
private int mPositionHandle;
private int mTextureHandle;

View File

@ -36,12 +36,12 @@ import java.util.Stack;
class SimpleScaleGestureDetector {
private static final String LOGTAG = "GeckoSimpleScaleGestureDetector";
private SimpleScaleGestureListener mListener;
private final SimpleScaleGestureListener mListener;
private long mLastEventTime;
private boolean mScaleResult;
/* Information about all pointers that are down. */
private LinkedList<PointerInfo> mPointerInfo;
private final LinkedList<PointerInfo> mPointerInfo;
/** Creates a new gesture detector with the given listener. */
SimpleScaleGestureDetector(SimpleScaleGestureListener listener) {

View File

@ -20,10 +20,10 @@ import android.util.Log;
class SubdocumentScrollHelper implements GeckoEventListener {
private static final String LOGTAG = "GeckoSubdocScroll";
private static String MESSAGE_PANNING_OVERRIDE = "Panning:Override";
private static String MESSAGE_CANCEL_OVERRIDE = "Panning:CancelOverride";
private static String MESSAGE_SCROLL = "Gesture:Scroll";
private static String MESSAGE_SCROLL_ACK = "Gesture:ScrollAck";
private static final String MESSAGE_PANNING_OVERRIDE = "Panning:Override";
private static final String MESSAGE_CANCEL_OVERRIDE = "Panning:CancelOverride";
private static final String MESSAGE_SCROLL = "Gesture:Scroll";
private static final String MESSAGE_SCROLL_ACK = "Gesture:ScrollAck";
private final Handler mUiHandler;
private final EventDispatcher mEventDispatcher;

View File

@ -19,7 +19,7 @@ public class TextureGenerator {
private static TextureGenerator sSharedInstance;
private ArrayBlockingQueue<Integer> mTextureIds;
private final ArrayBlockingQueue<Integer> mTextureIds;
private EGLContext mContext;
private TextureGenerator() { mTextureIds = new ArrayBlockingQueue<Integer>(POOL_SIZE); }

View File

@ -12,7 +12,7 @@ import java.util.ArrayList;
/** Manages a list of dead tiles, so we don't leak resources. */
public class TextureReaper {
private static TextureReaper sSharedInstance;
private ArrayList<Integer> mDeadTextureIDs;
private final ArrayList<Integer> mDeadTextureIDs;
private TextureReaper() { mDeadTextureIDs = new ArrayList<Integer>(); }

View File

@ -915,7 +915,7 @@ public class BrowserHealthRecorder implements HealthRecorder, GeckoEventListener
}
}
private static ConcurrentLinkedQueue<Search> delayedSearches = new ConcurrentLinkedQueue<>();
private static final ConcurrentLinkedQueue<Search> delayedSearches = new ConcurrentLinkedQueue<>();
public static void recordSearchDelayed(String location, String engineID) {
final Search search = new Search(location, engineID);

View File

@ -104,7 +104,7 @@ class BookmarksListAdapter extends MultiTypeCursorAdapter {
// mParentStack holds folder info instances (id + title) that allow
// us to navigate back up the folder hierarchy.
private LinkedList<FolderInfo> mParentStack;
private final LinkedList<FolderInfo> mParentStack;
// Refresh folder listener.
private OnRefreshFolderListener mListener;

View File

@ -33,7 +33,7 @@ public class HomeListView extends ListView
protected OnUrlOpenListener mUrlOpenListener;
// Top divider
private boolean mShowTopDivider;
private final boolean mShowTopDivider;
// ContextMenuInfo maker
private HomeContextMenuInfo.Factory mContextMenuInfoFactory;

View File

@ -45,7 +45,7 @@ public class HomePager extends ViewPager {
private final OnAddPanelListener mAddPanelListener;
private final HomeConfig mConfig;
private ConfigLoaderCallbacks mConfigLoaderCallbacks;
private final ConfigLoaderCallbacks mConfigLoaderCallbacks;
private String mInitialPanelId;

View File

@ -30,7 +30,7 @@ public class PanelGridView extends GridView
private final ViewConfig viewConfig;
private final PanelViewAdapter adapter;
private PanelViewItemHandler itemHandler;
private final PanelViewItemHandler itemHandler;
private OnItemOpenListener itemOpenListener;
private HomeContextMenuInfo mContextMenuInfo;
private HomeContextMenuInfo.Factory mContextMenuInfoFactory;

View File

@ -59,7 +59,7 @@ public class PanelInfoManager implements GeckoEventListener {
public void onComplete(List<PanelInfo> panelInfos);
}
private static AtomicInteger sRequestId = new AtomicInteger(0);
private static final AtomicInteger sRequestId = new AtomicInteger(0);
// Stores set of pending request callbacks.
private static final SparseArray<RequestCallback> sCallbacks = new SparseArray<RequestCallback>();

View File

@ -679,7 +679,7 @@ abstract class PanelLayout extends FrameLayout {
}
private class PanelOnItemOpenListener implements OnItemOpenListener {
private ViewState mViewState;
private final ViewState mViewState;
public PanelOnItemOpenListener(ViewState viewState) {
mViewState = viewState;
@ -702,7 +702,7 @@ abstract class PanelLayout extends FrameLayout {
}
private class PanelKeyListener implements View.OnKeyListener {
private ViewState mViewState;
private final ViewState mViewState;
public PanelKeyListener(ViewState viewState) {
mViewState = viewState;

View File

@ -206,7 +206,7 @@ class PinSiteDialog extends DialogFragment {
}
private static class SearchAdapter extends CursorAdapter {
private LayoutInflater mInflater;
private final LayoutInflater mInflater;
public SearchAdapter(Context context) {
super(context, null, 0);

View File

@ -105,8 +105,8 @@ public class TopSitesPanel extends HomeFragment {
return new TopSitesPanel();
}
private static boolean logDebug = Log.isLoggable(LOGTAG, Log.DEBUG);
private static boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
private static final boolean logDebug = Log.isLoggable(LOGTAG, Log.DEBUG);
private static final boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
private static void debug(final String message) {
if (logDebug) {
@ -406,7 +406,7 @@ public class TopSitesPanel extends HomeFragment {
// Max number of search results.
private static final int SEARCH_LIMIT = 30;
private static final String TELEMETRY_HISTOGRAM_LOAD_CURSOR = "FENNEC_TOPSITES_LOADER_TIME_MS";
private int mMaxGridEntries;
private final int mMaxGridEntries;
public TopSitesLoader(Context context) {
super(context);
@ -701,7 +701,7 @@ public class TopSitesPanel extends HomeFragment {
@SuppressWarnings("serial")
static class ThumbnailsLoader extends AsyncTaskLoader<Map<String, ThumbnailInfo>> {
private Map<String, ThumbnailInfo> mThumbnailInfos;
private ArrayList<String> mUrls;
private final ArrayList<String> mUrls;
private static final ArrayList<String> COLUMNS = new ArrayList<String>() {{
add(TILE_IMAGE_URL_COLUMN);

View File

@ -32,7 +32,7 @@ public class TopSitesThumbnailView extends ImageView {
private final float mStrokeWidth = getResources().getDisplayMetrics().density * 2;
// Paint for drawing the border.
private static Paint sBorderPaint;
private static final Paint sBorderPaint;
// Initializing the static border paint.
static {

View File

@ -88,13 +88,13 @@ public class GeckoMenu extends ListView
protected static final int NO_ID = 0;
// List of all menu items.
private List<GeckoMenuItem> mItems;
private final List<GeckoMenuItem> mItems;
// Map of "always" action-items in action-bar and their views.
private Map<GeckoMenuItem, View> mPrimaryActionItems;
private final Map<GeckoMenuItem, View> mPrimaryActionItems;
// Map of "ifRoom" action-items in action-bar and their views.
private Map<GeckoMenuItem, View> mSecondaryActionItems;
private final Map<GeckoMenuItem, View> mSecondaryActionItems;
// Reference to a callback for menu events.
private Callback mCallback;
@ -109,7 +109,7 @@ public class GeckoMenu extends ListView
private final ActionItemBarPresenter mSecondaryActionItemBar;
// Adapter to hold the list of menu items.
private MenuItemsAdapter mAdapter;
private final MenuItemsAdapter mAdapter;
// Show/hide icons in the list.
boolean mShowIcons;
@ -686,7 +686,7 @@ public class GeckoMenu extends ListView
private static final int VIEW_TYPE_DEFAULT = 0;
private static final int VIEW_TYPE_ACTION_MODE = 1;
private List<GeckoMenuItem> mItems;
private final List<GeckoMenuItem> mItems;
public MenuItemsAdapter() {
mItems = new ArrayList<GeckoMenuItem>();

View File

@ -20,7 +20,7 @@ public class MenuItemDefault extends TextView
private static final int[] STATE_UNCHECKED = new int[] { android.R.attr.state_checkable };
private Drawable mIcon;
private Drawable mState;
private final Drawable mState;
private static Rect sIconBounds;
private boolean mCheckable;

View File

@ -12,7 +12,7 @@ class ByteBufferInputStream extends InputStream {
protected ByteBuffer mBuf;
// Reference to a native object holding the data backing the ByteBuffer.
private NativeReference mNativeRef;
private final NativeReference mNativeRef;
protected ByteBufferInputStream(ByteBuffer buffer, NativeReference ref) {
mBuf = buffer;

View File

@ -55,7 +55,7 @@ public class SendTabList extends ListView {
// Listener to fire when a share target is selected (either directly or via the prompt)
private SendTabTargetSelectedListener listener;
private State currentState = LOADING;
private final State currentState = LOADING;
/**
* Enum defining the states this view may occupy.

View File

@ -22,14 +22,14 @@ import android.util.Log;
import java.util.ArrayList;
class AndroidImport implements Runnable {
static final private String LOGTAG = "AndroidImport";
private Context mContext;
private Runnable mOnDoneRunnable;
private ArrayList<ContentProviderOperation> mOperations;
private ContentResolver mCr;
private LocalBrowserDB mDB;
private boolean mImportBookmarks;
private boolean mImportHistory;
private static final String LOGTAG = "AndroidImport";
private final Context mContext;
private final Runnable mOnDoneRunnable;
private final ArrayList<ContentProviderOperation> mOperations;
private final ContentResolver mCr;
private final LocalBrowserDB mDB;
private final boolean mImportBookmarks;
private final boolean mImportHistory;
public AndroidImport(Context context, Runnable onDoneRunnable,
boolean doBookmarks, boolean doHistory) {

View File

@ -16,9 +16,9 @@ import android.util.AttributeSet;
import android.util.Log;
class AndroidImportPreference extends MultiPrefMultiChoicePreference {
static final private String LOGTAG = "AndroidImport";
private static final String LOGTAG = "AndroidImport";
private static final String PREF_KEY_PREFIX = "import_android.data.";
private Context mContext;
private final Context mContext;
public AndroidImportPreference(Context context, AttributeSet attrs) {
super(context, attrs);

View File

@ -1028,7 +1028,7 @@ OnSharedPreferenceChangeListener
}
@SuppressWarnings("serial")
private Map<String, PrefHandler> handlers = new HashMap<String, PrefHandler>() {{
private final Map<String, PrefHandler> handlers = new HashMap<String, PrefHandler>() {{
put(ClearOnShutdownPref.PREF, new ClearOnShutdownPref());
}};

View File

@ -12,7 +12,7 @@ import android.preference.Preference;
import android.util.AttributeSet;
class LinkPreference extends Preference {
private String mUrl;
private final String mUrl;
public LinkPreference(Context context, AttributeSet attrs) {
super(context, attrs);

View File

@ -45,7 +45,7 @@ public class PanelsPreference extends CustomListPreference {
private View preferenceView;
protected boolean mIsHidden;
private boolean mIsRemovable;
private final boolean mIsRemovable;
private boolean mAnimate;
private static final int ANIMATION_DURATION_MS = 400;

View File

@ -21,7 +21,7 @@ import android.util.AttributeSet;
class SyncPreference extends Preference {
private static final boolean DEFAULT_TO_FXA = true;
private Context mContext;
private final Context mContext;
public SyncPreference(Context context, AttributeSet attrs) {
super(context, attrs);

View File

@ -18,8 +18,8 @@ public class ColorPickerInput extends PromptInput {
public static final String INPUT_TYPE = "color";
public static final String LOGTAG = "GeckoColorPickerInput";
private boolean mShowAdvancedButton = true;
private int mInitialColor;
private final boolean mShowAdvancedButton = true;
private final int mInitialColor;
public ColorPickerInput(JSONObject obj) {
super(obj);

View File

@ -40,7 +40,7 @@ public class IconGridInput extends PromptInput implements OnItemClickListener {
private static int mMaxColumns = -1; // The maximum number of columns to show
private static int mIconSize = -1; // Size of icons in the grid
private int mSelected; // Current selection
private JSONArray mArray;
private final JSONArray mArray;
public IconGridInput(JSONObject obj) {
super(obj);

View File

@ -132,7 +132,7 @@ public class PromptInput {
public static class CheckboxInput extends PromptInput {
public static final String INPUT_TYPE = "checkbox";
private boolean mChecked;
private final boolean mChecked;
public CheckboxInput(JSONObject obj) {
super(obj);

View File

@ -14,7 +14,7 @@ import java.nio.ByteBuffer;
* easier to use.
*/
public class ByteBufferInputStream extends InputStream {
private ByteBuffer mByteBuffer;
private final ByteBuffer mByteBuffer;
public ByteBufferInputStream(ByteBuffer aByteBuffer) {
mByteBuffer = aByteBuffer;

View File

@ -26,7 +26,7 @@ public class SQLiteBridge {
private static final String LOGTAG = "SQLiteBridge";
// Path to the database. If this database was not opened with openDatabase, we reopen it every query.
private String mDb;
private final String mDb;
// Pointer to the database if it was opened with openDatabase. 0 implies closed.
protected volatile long mDbPointer;

View File

@ -42,7 +42,7 @@ import android.net.Uri;
*/
public class CommandProcessor {
private static final String LOG_TAG = "Command";
private static AtomicInteger currentId = new AtomicInteger();
private static final AtomicInteger currentId = new AtomicInteger();
protected ConcurrentHashMap<String, CommandRunner> commands = new ConcurrentHashMap<String, CommandRunner>();
private final static CommandProcessor processor = new CommandProcessor();

View File

@ -87,7 +87,7 @@ public class JSONRecordFetcher {
private class LatchedJSONRecordFetchDelegate implements JSONRecordFetchDelegate {
public ExtendedJSONObject body = null;
public Exception exception = null;
private CountDownLatch latch;
private final CountDownLatch latch;
public LatchedJSONRecordFetchDelegate(CountDownLatch latch) {
this.latch = latch;

View File

@ -26,7 +26,7 @@ public class SyncConfiguration {
public class EditorBranch implements Editor {
private String prefix;
private final String prefix;
private Editor editor;
public EditorBranch(SyncConfiguration config, String prefix) {
@ -105,8 +105,8 @@ public class SyncConfiguration {
*/
public class ConfigurationBranch implements SharedPreferences {
private SyncConfiguration config;
private String prefix; // Including trailing period.
private final SyncConfiguration config;
private final String prefix; // Including trailing period.
public ConfigurationBranch(SyncConfiguration syncConfiguration,
String prefix) {

View File

@ -40,7 +40,7 @@ public class Utils {
private static final String LOG_TAG = "Utils";
private static SecureRandom sharedSecureRandom = new SecureRandom();
private static final SecureRandom sharedSecureRandom = new SecureRandom();
// See <http://developer.android.com/reference/android/content/Context.html#getSharedPreferences%28java.lang.String,%20int%29>
public static final int SHARED_PREFERENCES_MODE = 0;

View File

@ -38,57 +38,57 @@ import ch.boye.httpclientandroidlib.entity.StringEntity;
public class JPakeClient {
private static String LOG_TAG = "JPakeClient";
private static final String LOG_TAG = "JPakeClient";
// J-PAKE constants.
public final static int REQUEST_TIMEOUT = 60 * 1000; // 1 min
public final static int KEYEXCHANGE_VERSION = 3;
public final static String JPAKE_VERIFY_VALUE = "0123456789ABCDEF";
public static final int REQUEST_TIMEOUT = 60 * 1000; // 1 min
public static final int KEYEXCHANGE_VERSION = 3;
public static final String JPAKE_VERIFY_VALUE = "0123456789ABCDEF";
private final static String JPAKE_SIGNERID_SENDER = "sender";
private final static String JPAKE_SIGNERID_RECEIVER = "receiver";
private final static int JPAKE_LENGTH_SECRET = 8;
private final static int JPAKE_LENGTH_CLIENTID = 256;
private static final String JPAKE_SIGNERID_SENDER = "sender";
private static final String JPAKE_SIGNERID_RECEIVER = "receiver";
private static final int JPAKE_LENGTH_SECRET = 8;
private static final int JPAKE_LENGTH_CLIENTID = 256;
private final static int MAX_TRIES = 10;
private final static int MAX_TRIES_FIRST_MSG = 300;
private final static int MAX_TRIES_LAST_MSG = 300;
private static final int MAX_TRIES = 10;
private static final int MAX_TRIES_FIRST_MSG = 300;
private static final int MAX_TRIES_LAST_MSG = 300;
// J-PAKE session values.
public String clientId;
public String secret;
public String clientId;
public String secret;
public String myEtag;
public String mySignerId;
public String theirEtag;
public String theirSignerId;
public String jpakeServer;
public String myEtag;
public String mySignerId;
public String theirEtag;
public String theirSignerId;
public String jpakeServer;
// J-PAKE state.
public boolean paired = false;
public boolean finished = false;
public boolean paired;
public boolean finished;
// J-PAKE values.
public int jpakePollInterval;
public int jpakeMaxTries;
public String channel;
public volatile String channelUrl;
public int jpakePollInterval;
public int jpakeMaxTries;
public String channel;
public volatile String channelUrl;
// J-PAKE session data.
public KeyBundle myKeyBundle;
public JSONObject jCreds;
public KeyBundle myKeyBundle;
public JSONObject jCreds;
public ExtendedJSONObject jOutgoing;
public ExtendedJSONObject jIncoming;
public ExtendedJSONObject jOutgoing;
public ExtendedJSONObject jIncoming;
public JPakeParty jParty;
public JPakeNumGenerator numGen;
public JPakeParty jParty;
public JPakeNumGenerator numGen;
public int pollTries = 0;
public int pollTries;
// UI controller.
private SetupSyncActivity controllerActivity;
private Queue<JPakeStage> stages;
private final SetupSyncActivity controllerActivity;
private Queue<JPakeStage> stages;
public JPakeClient(SetupSyncActivity activity) {
controllerActivity = activity;

View File

@ -28,7 +28,7 @@ import ch.boye.httpclientandroidlib.message.BasicHeader;
public class GetRequestStage extends JPakeStage {
private Timer timerScheduler = new Timer();
private final Timer timerScheduler = new Timer();
private int pollTries;
private GetStepTimerTask getStepTimerTask;
@ -188,7 +188,7 @@ public class GetRequestStage extends JPakeStage {
*
*/
public class GetStepTimerTask extends TimerTask {
private Resource request;
private final Resource request;
public GetStepTimerTask(Resource request) {
this.request = request;

View File

@ -26,8 +26,8 @@ public class Crypto5MiddlewareRepository extends MiddlewareRepository {
public RecordFactory recordFactory = new IdentityRecordFactory();
public class Crypto5MiddlewareRepositorySessionCreationDelegate extends MiddlewareRepository.SessionCreationDelegate {
private Crypto5MiddlewareRepository repository;
private RepositorySessionCreationDelegate outerDelegate;
private final Crypto5MiddlewareRepository repository;
private final RepositorySessionCreationDelegate outerDelegate;
public Crypto5MiddlewareRepositorySessionCreationDelegate(Crypto5MiddlewareRepository repository, RepositorySessionCreationDelegate outerDelegate) {
this.repository = repository;
@ -53,7 +53,7 @@ public class Crypto5MiddlewareRepository extends MiddlewareRepository {
}
public KeyBundle keyBundle;
private Repository inner;
private final Repository inner;
public Crypto5MiddlewareRepository(Repository inner, KeyBundle keys) {
super();

View File

@ -58,8 +58,8 @@ import org.mozilla.gecko.sync.repositories.domain.Record;
*
*/
public class Crypto5MiddlewareRepositorySession extends MiddlewareRepositorySession {
private KeyBundle keyBundle;
private RecordFactory recordFactory;
private final KeyBundle keyBundle;
private final RecordFactory recordFactory;
public Crypto5MiddlewareRepositorySession(RepositorySession session, Crypto5MiddlewareRepository repository, RecordFactory recordFactory) {
super(session, repository);
@ -68,9 +68,9 @@ public class Crypto5MiddlewareRepositorySession extends MiddlewareRepositorySess
}
public class DecryptingTransformingFetchDelegate implements RepositorySessionFetchRecordsDelegate {
private RepositorySessionFetchRecordsDelegate next;
private KeyBundle keyBundle;
private RecordFactory recordFactory;
private final RepositorySessionFetchRecordsDelegate next;
private final KeyBundle keyBundle;
private final RecordFactory recordFactory;
DecryptingTransformingFetchDelegate(RepositorySessionFetchRecordsDelegate next, KeyBundle bundle, RecordFactory recordFactory) {
this.next = next;

View File

@ -32,8 +32,8 @@ public abstract class MiddlewareRepositorySession extends RepositorySession {
public class MiddlewareRepositorySessionBeginDelegate implements RepositorySessionBeginDelegate {
private MiddlewareRepositorySession outerSession;
private RepositorySessionBeginDelegate next;
private final MiddlewareRepositorySession outerSession;
private final RepositorySessionBeginDelegate next;
public MiddlewareRepositorySessionBeginDelegate(MiddlewareRepositorySession outerSession, RepositorySessionBeginDelegate next) {
this.outerSession = outerSession;

View File

@ -184,7 +184,7 @@ public class BaseResource implements Resource {
delegate.addHeaders(request, client);
}
private static Object connManagerMonitor = new Object();
private static final Object connManagerMonitor = new Object();
private static ClientConnectionManager connManager;
// Call within a synchronized block on connManagerMonitor.

View File

@ -15,7 +15,7 @@ public class HashSetStoreTracker implements StoreTracker {
// Used to store GUIDs that were not locally modified but
// have been modified by a call to `store`, and thus
// should not be returned by a subsequent fetch.
private HashSet<String> guids;
private final HashSet<String> guids;
public HashSetStoreTracker() {
guids = new HashSet<String>();

View File

@ -95,7 +95,7 @@ public class Server11RepositorySession extends RepositorySession {
/**
* Used to track outstanding requests, so that we can abort them as needed.
*/
private Set<SyncStorageCollectionRequest> pending = Collections.synchronizedSet(new HashSet<SyncStorageCollectionRequest>());
private final Set<SyncStorageCollectionRequest> pending = Collections.synchronizedSet(new HashSet<SyncStorageCollectionRequest>());
@Override
public void abort() {
@ -115,7 +115,7 @@ public class Server11RepositorySession extends RepositorySession {
*/
public class RequestFetchDelegateAdapter extends WBOCollectionRequestDelegate {
RepositorySessionFetchRecordsDelegate delegate;
private DelayedWorkTracker workTracker = new DelayedWorkTracker();
private final DelayedWorkTracker workTracker = new DelayedWorkTracker();
// So that we can clean up.
private SyncStorageCollectionRequest request;
@ -427,9 +427,9 @@ public class Server11RepositorySession extends RepositorySession {
protected class RecordUploadRunnable implements Runnable, SyncStorageRequestDelegate {
public final String LOG_TAG = "RecordUploadRunnable";
private ArrayList<byte[]> outgoing;
private final ArrayList<byte[]> outgoing;
private ArrayList<String> outgoingGuids;
private long byteCount;
private final long byteCount;
public RecordUploadRunnable(RepositorySessionStoreDelegate storeDelegate,
ArrayList<byte[]> outgoing,
@ -556,7 +556,7 @@ public class Server11RepositorySession extends RepositorySession {
}
public class ByteArraysEntity extends EntityTemplate {
private long count;
private final long count;
public ByteArraysEntity(ArrayList<byte[]> arrays, long totalBytes) {
super(new ByteArraysContentProducer(arrays));
this.count = totalBytes;

View File

@ -87,7 +87,7 @@ public class AndroidBrowserBookmarksDataAccessor extends AndroidBrowserRepositor
context.getContentResolver().delete(uri, EXCLUDE_SPECIAL_GUIDS_WHERE_CLAUSE, null);
}
private String[] GUID_AND_ID = new String[] { BrowserContract.Bookmarks.GUID,
private final String[] GUID_AND_ID = new String[] { BrowserContract.Bookmarks.GUID,
BrowserContract.Bookmarks._ID };
protected Cursor getGuidsIDsForFolders() throws NullCursorException {

View File

@ -42,8 +42,8 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
public static final int DEFAULT_INSERTION_FLUSH_THRESHOLD = 50;
// TODO: synchronization for these.
private HashMap<String, Long> parentGuidToIDMap = new HashMap<String, Long>();
private HashMap<Long, String> parentIDToGuidMap = new HashMap<Long, String>();
private final HashMap<String, Long> parentGuidToIDMap = new HashMap<String, Long>();
private final HashMap<Long, String> parentIDToGuidMap = new HashMap<Long, String>();
/**
* Some notes on reparenting/reordering.
@ -100,11 +100,11 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
*/
// TODO: can we guarantee serial access to these?
private HashMap<String, ArrayList<String>> missingParentToChildren = new HashMap<String, ArrayList<String>>();
private HashMap<String, JSONArray> parentToChildArray = new HashMap<String, JSONArray>();
private final HashMap<String, ArrayList<String>> missingParentToChildren = new HashMap<String, ArrayList<String>>();
private final HashMap<String, JSONArray> parentToChildArray = new HashMap<String, JSONArray>();
private int needsReparenting = 0;
private AndroidBrowserBookmarksDataAccessor dataAccessor;
private final AndroidBrowserBookmarksDataAccessor dataAccessor;
protected BookmarksDeletionManager deletionManager;
protected BookmarksInsertionManager insertionManager;

View File

@ -23,7 +23,7 @@ import android.net.Uri;
public class AndroidBrowserHistoryDataAccessor extends
AndroidBrowserRepositoryDataAccessor {
private AndroidBrowserHistoryDataExtender dataExtender;
private final AndroidBrowserHistoryDataExtender dataExtender;
public AndroidBrowserHistoryDataAccessor(Context context) {
super(context);

View File

@ -27,8 +27,8 @@ public abstract class AndroidBrowserRepository extends Repository {
}
class CleanThread extends Thread {
private RepositorySessionCleanDelegate delegate;
private Context context;
private final RepositorySessionCleanDelegate delegate;
private final Context context;
public CleanThread(RepositorySessionCleanDelegate delegate, Context context) {
if (context == null) {
@ -56,8 +56,8 @@ public abstract class AndroidBrowserRepository extends Repository {
protected abstract void sessionCreator(RepositorySessionCreationDelegate delegate, Context context);
class CreateSessionThread extends Thread {
private RepositorySessionCreationDelegate delegate;
private Context context;
private final RepositorySessionCreationDelegate delegate;
private final Context context;
public CreateSessionThread(RepositorySessionCreationDelegate delegate, Context context) {
if (context == null) {

View File

@ -200,8 +200,8 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
class GuidsSinceRunnable implements Runnable {
private RepositorySessionGuidsSinceDelegate delegate;
private long timestamp;
private final RepositorySessionGuidsSinceDelegate delegate;
private final long timestamp;
public GuidsSinceRunnable(long timestamp,
RepositorySessionGuidsSinceDelegate delegate) {
@ -300,9 +300,9 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
}
public class FetchRunnable extends FetchingRunnable {
private String[] guids;
private long end;
private RecordFilter filter;
private final String[] guids;
private final long end;
private final RecordFilter filter;
public FetchRunnable(String[] guids,
long end,
@ -349,9 +349,9 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
}
class FetchSinceRunnable extends FetchingRunnable {
private long since;
private long end;
private RecordFilter filter;
private final long since;
private final long end;
private final RecordFilter filter;
public FetchSinceRunnable(long since,
long end,

View File

@ -44,8 +44,8 @@ public class FormHistoryRepositorySession extends
*/
public static final int INSERT_ITEM_THRESHOLD = 200;
private static Uri FORM_HISTORY_CONTENT_URI = BrowserContractHelpers.FORM_HISTORY_CONTENT_URI;
private static Uri DELETED_FORM_HISTORY_CONTENT_URI = BrowserContractHelpers.DELETED_FORM_HISTORY_CONTENT_URI;
private static final Uri FORM_HISTORY_CONTENT_URI = BrowserContractHelpers.FORM_HISTORY_CONTENT_URI;
private static final Uri DELETED_FORM_HISTORY_CONTENT_URI = BrowserContractHelpers.DELETED_FORM_HISTORY_CONTENT_URI;
public static class FormHistoryRepository extends Repository {

View File

@ -49,11 +49,11 @@ public class PasswordsRepositorySession extends
}
private static final String LOG_TAG = "PasswordsRepoSession";
private static String COLLECTION = "passwords";
private static final String COLLECTION = "passwords";
private RepoUtils.QueryHelper passwordsHelper;
private RepoUtils.QueryHelper deletedPasswordsHelper;
private ContentProviderClient passwordsProvider;
private final RepoUtils.QueryHelper passwordsHelper;
private final RepoUtils.QueryHelper deletedPasswordsHelper;
private final ContentProviderClient passwordsProvider;
private final Context context;

View File

@ -9,8 +9,8 @@ import java.util.concurrent.ExecutorService;
import org.mozilla.gecko.sync.repositories.RepositorySession;
public class DeferredRepositorySessionBeginDelegate implements RepositorySessionBeginDelegate {
private RepositorySessionBeginDelegate inner;
private ExecutorService executor;
private final RepositorySessionBeginDelegate inner;
private final ExecutorService executor;
public DeferredRepositorySessionBeginDelegate(final RepositorySessionBeginDelegate inner, final ExecutorService executor) {
this.inner = inner;
this.executor = executor;

Some files were not shown because too many files have changed in this diff Show More