Merge pull request #527 from yands11/master

Apply space convention after 'if'

Author: rkistner

zxing-android-embedded/build.gradle

@@ -97,7 +97,7 @@ project.afterEvaluate {
 // To release, place bintray_user and bintray_key properties in ~/.gradle/gradle.properties,
 // and run ./gradlew clean assembleRelease bintrayUpload
 
-if(project.hasProperty('bintray_user') && project.hasProperty('bintray_key')) {
+if (project.hasProperty('bintray_user') && project.hasProperty('bintray_key')) {
     bintray {
         user = bintray_user
         key = bintray_key

zxing-android-embedded/src/com/journeyapps/barcodescanner/CameraPreview.java

@@ -209,7 +209,7 @@ public boolean handleMessage(Message message) {
                     pause();
                     fireState.cameraError(error);
                 }
-            } else if(message.what == R.id.zxing_camera_closed) {
+            } else if (message.what == R.id.zxing_camera_closed) {
                 fireState.cameraClosed();
             }
             return false;
@@ -280,11 +280,11 @@ protected void initializeAttributes(AttributeSet attrs) {
 
         // See zxing_attrs.xml for the enum values
         int scalingStrategyNumber = styledAttributes.getInteger(R.styleable.zxing_camera_preview_zxing_preview_scaling_strategy, -1);
-        if(scalingStrategyNumber == 1) {
+        if (scalingStrategyNumber == 1) {
             previewScalingStrategy = new CenterCropStrategy();
-        } else if(scalingStrategyNumber == 2) {
+        } else if (scalingStrategyNumber == 2) {
             previewScalingStrategy = new FitCenterStrategy();
-        } else if(scalingStrategyNumber == 3) {
+        } else if (scalingStrategyNumber == 3) {
             previewScalingStrategy = new FitXYStrategy();
         }
 
@@ -293,14 +293,14 @@ protected void initializeAttributes(AttributeSet attrs) {
 
     private void rotationChanged() {
         // Confirm that it did actually change
-        if(isActive() && getDisplayRotation() != openedOrientation) {
+        if (isActive() && getDisplayRotation() != openedOrientation) {
             pause();
             resume();
         }
     }
 
     private void setupSurfaceView() {
-        if(useTextureView) {
+        if (useTextureView) {
             textureView = new TextureView(getContext());
             textureView.setSurfaceTextureListener(surfaceTextureListener());
             addView(textureView);
@@ -431,7 +431,7 @@ private void containerSized(Size containerSize) {
                 displayConfiguration.setPreviewScalingStrategy(getPreviewScalingStrategy());
                 cameraInstance.setDisplayConfiguration(displayConfiguration);
                 cameraInstance.configureCamera();
-                if(torchOn) {
+                if (torchOn) {
                     cameraInstance.setTorch(torchOn);
                 }
             }
@@ -451,14 +451,14 @@ public void setPreviewScalingStrategy(PreviewScalingStrategy previewScalingStrat
      * Override this to specify a different preview scaling strategy.
      */
     public PreviewScalingStrategy getPreviewScalingStrategy() {
-        if(previewScalingStrategy != null) {
+        if (previewScalingStrategy != null) {
             return previewScalingStrategy;
         }
 
         // If we are using SurfaceTexture, it is safe to use centerCrop.
         // For SurfaceView, it's better to use fitCenter, otherwise the preview may overlap to
         // other views.
-        if(textureView != null) {
+        if (textureView != null) {
             return new CenterCropStrategy();
         } else {
             return new FitCenterStrategy();
@@ -521,8 +521,8 @@ private void startPreviewIfReady() {
         if (currentSurfaceSize != null && previewSize != null && surfaceRect != null) {
             if (surfaceView != null && currentSurfaceSize.equals(new Size(surfaceRect.width(), surfaceRect.height()))) {
                 startCameraPreview(new CameraSurface(surfaceView.getHolder()));
-            } else if(textureView != null && textureView.getSurfaceTexture() != null) {
-                if(previewSize != null) {
+            } else if (textureView != null && textureView.getSurfaceTexture() != null) {
+                if (previewSize != null) {
                     Matrix transform = calculateTextureTransform(new Size(textureView.getWidth(), textureView.getHeight()), previewSize);
                     textureView.setTransform(transform);
                 }
@@ -539,15 +539,15 @@ private void startPreviewIfReady() {
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
         containerSized(new Size(r - l, b - t));
 
-        if(surfaceView != null) {
+        if (surfaceView != null) {
             if (surfaceRect == null) {
                 // Match the container, to reduce the risk of issues. The preview should never be drawn
                 // while the surface has this size.
                 surfaceView.layout(0, 0, getWidth(), getHeight());
             } else {
                 surfaceView.layout(surfaceRect.left, surfaceRect.top, surfaceRect.right, surfaceRect.bottom);
             }
-        } else if(textureView != null) {
+        } else if (textureView != null) {
             textureView.layout(0, 0, getWidth(), getHeight());
         }
     }
@@ -617,11 +617,11 @@ public void resume() {
             // The activity was paused but not stopped, so the surface still exists. Therefore
             // surfaceCreated() won't be called, so init the camera here.
             startPreviewIfReady();
-        } else if(surfaceView != null) {
+        } else if (surfaceView != null) {
             // Install the callback and wait for surfaceCreated() to init the camera.
             surfaceView.getHolder().addCallback(surfaceCallback);
-        } else if(textureView != null) {
-            if(textureView.isAvailable()) {
+        } else if (textureView != null) {
+            if (textureView.isAvailable()) {
                 surfaceTextureListener().onSurfaceTextureAvailable(textureView.getSurfaceTexture(), textureView.getWidth(), textureView.getHeight());
             } else {
                 textureView.setSurfaceTextureListener(surfaceTextureListener());
@@ -656,7 +656,7 @@ public void pause() {
             SurfaceHolder surfaceHolder = surfaceView.getHolder();
             surfaceHolder.removeCallback(surfaceCallback);
         }
-        if(currentSurfaceSize == null && textureView != null) {
+        if (currentSurfaceSize == null && textureView != null) {
             textureView.setSurfaceTextureListener(null);
         }
 
@@ -678,7 +678,7 @@ public void pauseAndWait() {
         pause();
         long startTime = System.nanoTime();
         while(instance != null && !instance.isCameraClosed()) {
-            if(System.nanoTime() - startTime > 2000000000) {
+            if (System.nanoTime() - startTime > 2000000000) {
                 // Don't wait for longer than 2 seconds
                 break;
             }
@@ -714,7 +714,7 @@ public double getMarginFraction() {
      * @param marginFraction the fraction
      */
     public void setMarginFraction(double marginFraction) {
-        if(marginFraction >= 0.5d) {
+        if (marginFraction >= 0.5d) {
             throw new IllegalArgumentException("The margin fraction must be less than 0.5");
         }
         this.marginFraction = marginFraction;
@@ -835,7 +835,7 @@ protected Rect calculateFramingRect(Rect container, Rect surface) {
         Rect intersection = new Rect(container);
         boolean intersects = intersection.intersect(surface);
 
-        if(framingRectSize != null) {
+        if (framingRectSize != null) {
             // Specific size is specified. Make sure it's not larger than the container or surface.
             int horizontalMargin = Math.max(0, (intersection.width() - framingRectSize.width) / 2);
             int verticalMargin = Math.max(0, (intersection.height() - framingRectSize.height) / 2);
@@ -864,7 +864,7 @@ protected Parcelable onSaveInstanceState() {
 
     @Override
     protected void onRestoreInstanceState(Parcelable state) {
-        if(!(state instanceof Bundle)) {
+        if (!(state instanceof Bundle)) {
             super.onRestoreInstanceState(state);
             return;
         }

zxing-android-embedded/src/com/journeyapps/barcodescanner/CaptureManager.java

@@ -108,7 +108,7 @@ public void cameraError(Exception error) {
 
         @Override
         public void cameraClosed() {
-            if(finishWhenClosed) {
+            if (finishWhenClosed) {
                 Log.d(TAG, "Camera closed; finishing activity");
                 finish();
             }
@@ -147,7 +147,7 @@ public void initializeFromIntent(Intent intent, Bundle savedInstanceState) {
             this.orientationLock = savedInstanceState.getInt(SAVED_ORIENTATION_LOCK, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
         }
 
-        if(intent != null) {
+        if (intent != null) {
             // Only lock the orientation if it's not locked to something else yet
             boolean orientationLocked = intent.getBooleanExtra(Intents.Scan.ORIENTATION_LOCKED, true);
             if (orientationLocked) {
@@ -214,7 +214,7 @@ public void decode() {
      * Call from Activity#onResume().
      */
     public void onResume() {
-        if(Build.VERSION.SDK_INT >= 23) {
+        if (Build.VERSION.SDK_INT >= 23) {
             openCameraWithPermission();
         } else {
             barcodeView.resume();
@@ -229,7 +229,7 @@ private void openCameraWithPermission() {
         if (ContextCompat.checkSelfPermission(this.activity, Manifest.permission.CAMERA)
                 == PackageManager.PERMISSION_GRANTED) {
             barcodeView.resume();
-        } else if(!askedPermission) {
+        } else if (!askedPermission) {
             ActivityCompat.requestPermissions(this.activity,
                     new String[]{Manifest.permission.CAMERA},
                     cameraPermissionReqCode);
@@ -248,7 +248,7 @@ private void openCameraWithPermission() {
      *     or {@link android.content.pm.PackageManager#PERMISSION_DENIED}. Never null.
      */
     public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
-        if(requestCode == cameraPermissionReqCode) {
+        if (requestCode == cameraPermissionReqCode) {
             if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 // permission was granted
                 barcodeView.resume();
@@ -359,7 +359,7 @@ private void finish() {
     }
 
     protected void closeAndFinish() {
-        if(barcodeView.getBarcodeView().isCameraClosed()) {
+        if (barcodeView.getBarcodeView().isCameraClosed()) {
             finish();
         } else {
             finishWhenClosed = true;

zxing-android-embedded/src/com/journeyapps/barcodescanner/DecoderResultPointCallback.java

@@ -26,7 +26,7 @@ public void setDecoder(Decoder decoder) {
 
     @Override
     public void foundPossibleResultPoint(ResultPoint point) {
-        if(decoder != null) {
+        if (decoder != null) {
             decoder.foundPossibleResultPoint(point);
         }
     }

zxing-android-embedded/src/com/journeyapps/barcodescanner/DecoderThread.java

@@ -36,7 +36,7 @@ public class DecoderThread {
         public boolean handleMessage(Message message) {
             if (message.what == R.id.zxing_decode) {
                 decode((SourceData) message.obj);
-            } else if(message.what == R.id.zxing_preview_failed) {
+            } else if (message.what == R.id.zxing_preview_failed) {
                 // Error already logged. Try again.
                 requestNextPreview();
             }
@@ -142,7 +142,7 @@ private void decode(SourceData sourceData) {
         sourceData.setCropRect(cropRect);
         LuminanceSource source = createSource(sourceData);
 
-        if(source != null) {
+        if (source != null) {
             rawResult = decoder.decode(source);
         }
 

zxing-android-embedded/src/com/journeyapps/barcodescanner/DecoratedBarcodeView.java

@@ -143,7 +143,7 @@ public void initializeFromIntent(Intent intent) {
         }
 
         if (intent.hasExtra(Intents.Scan.TORCH_ENABLED)) {
-            if(intent.getBooleanExtra(Intents.Scan.TORCH_ENABLED, false)) {
+            if (intent.getBooleanExtra(Intents.Scan.TORCH_ENABLED, false)) {
                 this.setTorchOn();
             }
         }
@@ -183,7 +183,7 @@ public CameraSettings getCameraSettings() {
 
     public void setStatusText(String text) {
         // statusView is optional when using a custom layout
-        if(statusView != null) {
+        if (statusView != null) {
             statusView.setText(text);
         }
     }

zxing-android-embedded/src/com/journeyapps/barcodescanner/DefaultDecoderFactory.java

@@ -39,11 +39,11 @@ public Decoder createDecoder(Map<DecodeHintType, ?> baseHints) {
 
         hints.putAll(baseHints);
 
-        if(this.hints != null) {
+        if (this.hints != null) {
             hints.putAll(this.hints);
         }
 
-        if(this.decodeFormats != null) {
+        if (this.decodeFormats != null) {
             hints.put(DecodeHintType.POSSIBLE_FORMATS, decodeFormats);
         }
 

zxing-android-embedded/src/com/journeyapps/barcodescanner/RotationListener.java

@@ -40,7 +40,7 @@ public void listen(Context context, RotationCallback callback) {
             public void onOrientationChanged(int orientation) {
                 WindowManager localWindowManager = windowManager;
                 RotationCallback localCallback = RotationListener.this.callback;
-                if(windowManager != null && localCallback != null) {
+                if (windowManager != null && localCallback != null) {
                     int newRotation = localWindowManager.getDefaultDisplay().getRotation();
                     if (newRotation != lastRotation) {
                         lastRotation = newRotation;
@@ -57,7 +57,7 @@ public void onOrientationChanged(int orientation) {
     public void stop() {
         // To reduce the effect of possible leaks, we clear any references we have to external
         // objects.
-        if(this.orientationEventListener != null) {
+        if (this.orientationEventListener != null) {
             this.orientationEventListener.disable();
         }
         this.orientationEventListener = null;

zxing-android-embedded/src/com/journeyapps/barcodescanner/Size.java

@@ -43,7 +43,7 @@ public Size scale(int n, int d) {
      * @return the scaled size
      */
     public Size scaleFit(Size into) {
-        if(width * into.height >= into.width * height) {
+        if (width * into.height >= into.width * height) {
             // match width
             return new Size(into.width, height * into.width / width);
         } else {
@@ -59,7 +59,7 @@ public Size scaleFit(Size into) {
      * @return the scaled size
      */
     public Size scaleCrop(Size into) {
-        if(width * into.height <= into.width * height) {
+        if (width * into.height <= into.width * height) {
             // match width
             return new Size(into.width, height * into.width / width);
         } else {

zxing-android-embedded/src/com/journeyapps/barcodescanner/SourceData.java

@@ -45,7 +45,7 @@ public SourceData(byte[] data, int dataWidth, int dataHeight, int imageFormat, i
         this.data = new RawImageData(data, dataWidth, dataHeight);
         this.rotation = rotation;
         this.imageFormat = imageFormat;
-        if(dataWidth * dataHeight > data.length) {
+        if (dataWidth * dataHeight > data.length) {
             throw new IllegalArgumentException("Image data does not match the resolution. " + dataWidth + "x" + dataHeight + " > " + data.length);
         }
     }
@@ -150,7 +150,7 @@ public Bitmap getBitmap(int scaleFactor) {
     public Bitmap getBitmap(Rect cropRect, int scaleFactor) {
         if (cropRect == null) {
             cropRect = new Rect(0, 0, data.getWidth(), data.getHeight());
-        } else if(isRotated()) {
+        } else if (isRotated()) {
             //noinspection SuspiciousNameCombination
             cropRect = new Rect(cropRect.top, cropRect.left, cropRect.bottom, cropRect.right);
         }