Bug 1258789 - Add star to WhitespaceAround and fix. r=grisha
MozReview-Commit-ID: 3FY8m1qPj8V
--- a/mobile/android/app/checkstyle.xml
+++ b/mobile/android/app/checkstyle.xml
@@ -55,13 +55,13 @@
</module>
<module name="WhitespaceAround">
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyMethods" value="true"/>
<property name="allowEmptyTypes" value="true"/>
<property name="allowEmptyLoops" value="true"/>
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN,
LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE,
- LOR, LT, NOT_EQUAL, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN"/>
+ LOR, LT, NOT_EQUAL, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,"/>
</module>
</module>
</module>
--- a/mobile/android/base/java/org/mozilla/gecko/AlarmReceiver.java
+++ b/mobile/android/base/java/org/mozilla/gecko/AlarmReceiver.java
@@ -29,14 +29,14 @@ public class AlarmReceiver extends Broad
TimerTask releaseLockTask = new TimerTask() {
@Override
public void run() {
wakeLock.release();
}
};
Timer timer = new Timer();
// 5 seconds ought to be enough for anybody
- timer.schedule(releaseLockTask, 5*1000);
+ timer.schedule(releaseLockTask, 5 * 1000);
}
@WrapForJNI
private static native void notifyAlarmFired();
}
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -135,17 +135,17 @@ public abstract class GeckoApp
GeckoMenu.MenuPresenter,
LocationListener,
NativeEventListener,
SensorEventListener,
Tabs.OnTabsChangedListener,
ViewTreeObserver.OnGlobalLayoutListener {
private static final String LOGTAG = "GeckoApp";
- private static final int ONE_DAY_MS = 1000*60*60*24;
+ private static final int ONE_DAY_MS = 1000 * 60 * 60 * 24;
public static final String ACTION_ALERT_CALLBACK = "org.mozilla.gecko.ACTION_ALERT_CALLBACK";
public static final String ACTION_HOMESCREEN_SHORTCUT = "org.mozilla.gecko.BOOKMARK";
public static final String ACTION_DEBUG = "org.mozilla.gecko.DEBUG";
public static final String ACTION_LAUNCH_SETTINGS = "org.mozilla.gecko.SETTINGS";
public static final String ACTION_LOAD = "org.mozilla.gecko.LOAD";
public static final String ACTION_INIT_PW = "org.mozilla.gecko.INIT_PW";
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoEvent.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoEvent.java
@@ -430,17 +430,17 @@ public class GeckoEvent {
event.mY = s.values[1];
event.mZ = s.values[2];
if (s.values.length >= 4) {
event.mW = s.values[3];
} else {
// s.values[3] was optional in API <= 18, so we need to compute it
// The values form a unit quaternion, so we can compute the angle of
// rotation purely based on the given 3 values.
- event.mW = 1 - s.values[0]*s.values[0] - s.values[1]*s.values[1] - s.values[2]*s.values[2];
+ event.mW = 1 - s.values[0] * s.values[0] - s.values[1] * s.values[1] - s.values[2] * s.values[2];
event.mW = (event.mW > 0.0) ? Math.sqrt(event.mW) : 0.0;
}
break;
}
// SensorEvent timestamp is in nanoseconds, Gecko expects microseconds.
event.mTime = s.timestamp / 1000;
return event;
--- a/mobile/android/base/java/org/mozilla/gecko/ZoomedView.java
+++ b/mobile/android/base/java/org/mozilla/gecko/ZoomedView.java
@@ -601,17 +601,17 @@ public class ZoomedView extends FrameLay
zoomFactor = ZOOM_FACTORS_LIST[currentZoomFactorIndex];
ImmutableViewportMetrics metrics = layerView.getViewportMetrics();
refreshZoomedViewSize(metrics);
setTextInZoomFactorButton(zoomFactor);
}
private void setTextInZoomFactorButton(float zoom) {
- final String percentageValue = Integer.toString((int) (100*zoom));
+ final String percentageValue = Integer.toString((int) (100 * zoom));
changeZoomFactorButton.setText("- " + getResources().getString(R.string.percent, percentageValue) + " +");
}
@Override
public void handleMessage(final String event, final JSONObject message) {
ThreadUtils.postToUiThread(new Runnable() {
@Override
public void run() {
--- a/mobile/android/base/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
+++ b/mobile/android/base/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
@@ -207,17 +207,17 @@ class JavaPanZoomController
mSubscroller.destroy();
mTouchEventHandler.destroy();
}
private final static float easeOut(float t) {
// ease-out approx.
// -(t-1)^2+1
t = t-1;
- return -t*t+1;
+ return -t * t + 1;
}
private void setState(PanZoomState state) {
if (state != mState) {
GeckoAppShell.notifyObservers("PanZoom:StateChange", state.toString());
mState = state;
// Let the target know we've finished with it (for now)
--- a/mobile/android/base/java/org/mozilla/gecko/widget/FaviconView.java
+++ b/mobile/android/base/java/org/mozilla/gecko/widget/FaviconView.java
@@ -168,17 +168,17 @@ public class FaviconView extends ImageVi
} else {
mDominantColor = 0;
}
}
private void scaleBitmap() {
// If the Favicon can be resized to fill the view exactly without an enlargment of more than
// a factor of two, do so.
- int doubledSize = mIconBitmap.getWidth()*2;
+ int doubledSize = mIconBitmap.getWidth() * 2;
if (mActualWidth > doubledSize) {
// If the view is more than twice the size of the image, just double the image size
// and do the rest with padding.
mIconBitmap = Bitmap.createScaledBitmap(mIconBitmap, doubledSize, doubledSize, true);
} else {
// Otherwise, scale the image to fill the view.
mIconBitmap = Bitmap.createScaledBitmap(mIconBitmap, mActualWidth, mActualWidth, true);
}