You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by GitBox <gi...@apache.org> on 2018/12/06 03:12:07 UTC
[GitHub] YorkShen closed pull request #1614: Fix some typos
YorkShen closed pull request #1614: Fix some typos
URL: https://github.com/apache/incubator-weex/pull/1614
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
index 13564ff86b..aeb9d3c2d4 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@ -441,7 +441,7 @@ public static String findSoPath(String libName) {
WXLogUtils.e(libName + "'s Path is" + soPath);
return soFile.getAbsolutePath();
} else {
- WXLogUtils.e(libName + "'s Path is " + soPath + " but file is not exist");
+ WXLogUtils.e(libName + "'s Path is " + soPath + " but file does not exist");
}
}
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 3c2779ab96..918fb2388a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1312,7 +1312,7 @@ public void createInstance(final String instanceId, final Script template,
final Map<String, Object> options, final String data) {
final WXSDKInstance instance = WXSDKManager.getInstance().getSDKInstance(instanceId);
if (instance == null) {
- WXLogUtils.e("WXBridgeManager", "createInstance failed, SDKInstance is not exist");
+ WXLogUtils.e("WXBridgeManager", "createInstance failed, SDKInstance does not exist");
return;
}
if (TextUtils.isEmpty(instanceId) || template == null || template.isEmpty() || mJSHandler == null) {
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
index aa43bca23b..02fbe1f793 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
@@ -158,7 +158,7 @@
/**
* Single progress init error
*/
- WX_ERR_SINGLE_PROCESS_DLOPEN_FILE_NOT_EXIST("-1004", "so file is not exist",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
+ WX_ERR_SINGLE_PROCESS_DLOPEN_FILE_NOT_EXIST("-1004", "so file does not exist",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
WX_ERR_SINGLE_PROCESS_DLOPEN_FLAIED("-1005", "dlopen so file failed",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
@@ -170,7 +170,7 @@
WX_JS_FRAMEWORK_REINIT_MULPROCESS_FAILED("-1009", "js framework reinit multiProcess failed",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
- WX_JS_FRAMEWORK_INIT_FAILED("-1010", "js framework init failed",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
+ WX_JS_FRAMEWORK_INIT_FAILED("-1010", "js framework init failed",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
WX_JS_FRAMEWORK_INIT_SINGLE_PROCESS_SUCCESS("-1011", "js framework init success in single process",ErrorType.NATIVE_ERROR,ErrorGroup.NATIVE),
diff --git a/ios/sdk/WeexSDK/Sources/Protocol/WXConfigCenterProtocol.h b/ios/sdk/WeexSDK/Sources/Protocol/WXConfigCenterProtocol.h
index 45aa826a9d..d6210f41e4 100644
--- a/ios/sdk/WeexSDK/Sources/Protocol/WXConfigCenterProtocol.h
+++ b/ios/sdk/WeexSDK/Sources/Protocol/WXConfigCenterProtocol.h
@@ -22,7 +22,7 @@
/**
get config from config center handler
@param key the key for config
- @param defaultValue default value for key if the key is not exist.
+ @param defaultValue default value for key if the key does not exist.
@param isDefault whether the value is default value
@return the value for config key
*/
diff --git a/weex_core/Source/android/jsengine/multiprocess/WeexJSConnection.cpp b/weex_core/Source/android/jsengine/multiprocess/WeexJSConnection.cpp
index f7cbd80e6c..629c329e75 100644
--- a/weex_core/Source/android/jsengine/multiprocess/WeexJSConnection.cpp
+++ b/weex_core/Source/android/jsengine/multiprocess/WeexJSConnection.cpp
@@ -494,7 +494,7 @@ void doExec(int fdClient, int fdServer, bool traceEnable, bool startupPie) {
int result = access(executableName.c_str(), 01);
#if PRINT_LOG_CACHEFILE
- mcfile << "jsengine WeexJSConnection::doExec file exsist result:"
+ mcfile << "jsengine WeexJSConnection::doExec file exist result:"
<< result << " startupPie:" << startupPie << std::endl;
#endif
if (result == -1) {
diff --git a/weex_core/Source/android/utils/so_utils.cpp b/weex_core/Source/android/utils/so_utils.cpp
index 02d6f5d2b0..b5379dc45d 100644
--- a/weex_core/Source/android/utils/so_utils.cpp
+++ b/weex_core/Source/android/utils/so_utils.cpp
@@ -178,7 +178,7 @@ namespace WeexCore {
return soPath;
} else {
const char *error = soPath.c_str();
- LOGE("so path: %s is not exsist, use full package lib", error);
+ LOGE("so path: %s does not exist, use full package lib", error);
// executablePath = s_cacheDir;
executablePath = SoUtils::cache_dir();
std::string lib = "/cache";
@@ -188,7 +188,7 @@ namespace WeexCore {
soPath = executablePath + "/" + SoUtils::jss_so_name();
// soPath = executablePath + "/" + g_jssSoName;
if (access(soPath.c_str(), 00) != 0) {
- LOGE("so path: %s is not exsist", soPath.c_str());
+ LOGE("so path: %s does not exist", soPath.c_str());
g_exception_handler("-1004", error);
//return false;
//use libweexjss.so directly
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services