Merge pull request #14602 from asashour:java_lang_

modules/core/misc/java/src/java/core+CvType.java

@@ -25,11 +25,11 @@ public final class CvType {
 
     public static final int makeType(int depth, int channels) {
         if (channels <= 0 || channels >= CV_CN_MAX) {
-            throw new java.lang.UnsupportedOperationException(
+            throw new UnsupportedOperationException(
                     "Channels count should be 1.." + (CV_CN_MAX - 1));
         }
         if (depth < 0 || depth >= CV_DEPTH_MAX) {
-            throw new java.lang.UnsupportedOperationException(
+            throw new UnsupportedOperationException(
                     "Data type depth should be 0.." + (CV_DEPTH_MAX - 1));
         }
         return (depth & (CV_DEPTH_MAX - 1)) + ((channels - 1) << CV_CN_SHIFT);
@@ -89,7 +89,7 @@ public final class CvType {
         case CV_64F:
             return 8 * channels(type);
         default:
-            throw new java.lang.UnsupportedOperationException(
+            throw new UnsupportedOperationException(
                     "Unsupported CvType value: " + type);
         }
     }
@@ -122,7 +122,7 @@ public final class CvType {
             s = "CV_USRTYPE1";
             break;
         default:
-            throw new java.lang.UnsupportedOperationException(
+            throw new UnsupportedOperationException(
                     "Unsupported CvType value: " + type);
         }
 

modules/imgproc/misc/java/src/java/imgproc+Moments.java

 package org.opencv.imgproc;
 
-import java.lang.Math;
-
 //javadoc:Moments
 public class Moments {
 

modules/java/generator/android/java/org/opencv/android/Utils.java

@@ -87,9 +87,9 @@ public class Utils {
      */
     public static void bitmapToMat(Bitmap bmp, Mat mat, boolean unPremultiplyAlpha) {
         if (bmp == null)
-            throw new java.lang.IllegalArgumentException("bmp == null");
+            throw new IllegalArgumentException("bmp == null");
         if (mat == null)
-            throw new java.lang.IllegalArgumentException("mat == null");
+            throw new IllegalArgumentException("mat == null");
         nBitmapToMat2(bmp, mat.nativeObj, unPremultiplyAlpha);
     }
 
@@ -117,9 +117,9 @@ public class Utils {
      */
     public static void matToBitmap(Mat mat, Bitmap bmp, boolean premultiplyAlpha) {
         if (mat == null)
-            throw new java.lang.IllegalArgumentException("mat == null");
+            throw new IllegalArgumentException("mat == null");
         if (bmp == null)
-            throw new java.lang.IllegalArgumentException("bmp == null");
+            throw new IllegalArgumentException("bmp == null");
         nMatToBitmap2(mat.nativeObj, bmp, premultiplyAlpha);
     }