Merge pull request opencv#8335 from kuanyili:typo-patch

alalek · alalek · commit e4377e7c51d9 · 2017-03-09T10:43:00.000Z
diff --git a/modules/java/generator/src/java/android+AsyncServiceHelper.java b/modules/java/generator/src/java/android+AsyncServiceHelper.java
@@ -131,7 +131,7 @@ public void install()
                 }
                 public void cancel()
                 {
-                    Log.d(TAG, "Wating for OpenCV canceled by user");
+                    Log.d(TAG, "Waiting for OpenCV canceled by user");
                     mServiceInstallationProgress = false;
                     int Status = LoaderCallbackInterface.INSTALL_CANCELED;
                     Log.d(TAG, "Init finished with status " + Status);
@@ -197,7 +197,7 @@ public void install() {
                                         if (mEngineService.installVersion(mOpenCVersion))
                                         {
                                             mLibraryInstallationProgress = true;
-                                            Log.d(TAG, "Package installation statred");
+                                            Log.d(TAG, "Package installation started");
                                             Log.d(TAG, "Unbind from service");
                                             mAppContext.unbindService(mServiceConnection);
                                         }
@@ -228,7 +228,7 @@ public void cancel() {
                                     mUserAppCallback.onManagerConnected(LoaderCallbackInterface.INSTALL_CANCELED);
                                 }
                                 public void wait_install() {
-                                    Log.e(TAG, "Instalation was not started! Nothing to wait!");
+                                    Log.e(TAG, "Installation was not started! Nothing to wait!");
                                 }
                             };
 
diff --git a/modules/java/generator/src/java/android+BaseLoaderCallback.java b/modules/java/generator/src/java/android+BaseLoaderCallback.java
@@ -43,7 +43,7 @@ public void onClick(DialogInterface dialog, int which) {
             /** Package installation has been canceled. **/
             case LoaderCallbackInterface.INSTALL_CANCELED:
             {
-                Log.d(TAG, "OpenCV library instalation was canceled by user");
+                Log.d(TAG, "OpenCV library installation was canceled by user");
                 finish();
             } break;
             /** Application is incompatible with this version of OpenCV Manager. Possibly, a service update is required. **/
diff --git a/modules/java/generator/src/java/android+JavaCameraView.java b/modules/java/generator/src/java/android+JavaCameraView.java
@@ -275,7 +275,7 @@ protected void disconnectCamera() {
             synchronized (this) {
                 this.notify();
             }
-            Log.d(TAG, "Wating for thread");
+            Log.d(TAG, "Waiting for thread");
             if (mThread != null)
                 mThread.join();
         } catch (InterruptedException e) {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public void install()`
`131`	`131`	`}`
`132`	`132`	`public void cancel()`
`133`	`133`	`{`
`134`		`- Log.d(TAG, "Wating for OpenCV canceled by user");`
	`134`	`+ Log.d(TAG, "Waiting for OpenCV canceled by user");`
`135`	`135`	`mServiceInstallationProgress = false;`
`136`	`136`	`int Status = LoaderCallbackInterface.INSTALL_CANCELED;`
`137`	`137`	`Log.d(TAG, "Init finished with status " + Status);`
`@@ -197,7 +197,7 @@ public void install() {`
`197`	`197`	`if (mEngineService.installVersion(mOpenCVersion))`
`198`	`198`	`{`
`199`	`199`	`mLibraryInstallationProgress = true;`
`200`		`- Log.d(TAG, "Package installation statred");`
	`200`	`+ Log.d(TAG, "Package installation started");`
`201`	`201`	`Log.d(TAG, "Unbind from service");`
`202`	`202`	`mAppContext.unbindService(mServiceConnection);`
`203`	`203`	`}`
`@@ -228,7 +228,7 @@ public void cancel() {`
`228`	`228`	`mUserAppCallback.onManagerConnected(LoaderCallbackInterface.INSTALL_CANCELED);`
`229`	`229`	`}`
`230`	`230`	`public void wait_install() {`
`231`		`- Log.e(TAG, "Instalation was not started! Nothing to wait!");`
	`231`	`+ Log.e(TAG, "Installation was not started! Nothing to wait!");`
`232`	`232`	`}`
`233`	`233`	`};`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public void onClick(DialogInterface dialog, int which) {`
`43`	`43`	`/ Package installation has been canceled. /`
`44`	`44`	`case LoaderCallbackInterface.INSTALL_CANCELED:`
`45`	`45`	`{`
`46`		`- Log.d(TAG, "OpenCV library instalation was canceled by user");`
	`46`	`+ Log.d(TAG, "OpenCV library installation was canceled by user");`
`47`	`47`	`finish();`
`48`	`48`	`} break;`
`49`	`49`	`/ Application is incompatible with this version of OpenCV Manager. Possibly, a service update is required. /`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ protected void disconnectCamera() {`
`275`	`275`	`synchronized (this) {`
`276`	`276`	`this.notify();`
`277`	`277`	`}`
`278`		`- Log.d(TAG, "Wating for thread");`
	`278`	`+ Log.d(TAG, "Waiting for thread");`
`279`	`279`	`if (mThread != null)`
`280`	`280`	`mThread.join();`
`281`	`281`	`} catch (InterruptedException e) {`