Skip to content

Commit 9ecc5a4

Browse files
gnudlesjoeferner
gnudles
authored and
joeferner
committed
updated source files to compile on electron 7
1 parent 1ba14d2 commit 9ecc5a4

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

Diff for: ‎src/java.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ v8::Local<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
203203
classPath << ":";
204204
#endif
205205
}
206-
v8::Local<v8::Value> arrayItemValue = classPathArrayTemp->Get(i);
206+
v8::Local<v8::Value> arrayItemValue = classPathArrayTemp->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
207207
if(!arrayItemValue->IsString()) {
208208
return Nan::TypeError("Classpath must only contain strings");
209209
}
@@ -231,7 +231,7 @@ v8::Local<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
231231
//printf("classPath: %s\n", classPath.str().c_str());
232232
vmOptions[0].optionString = strdup(classPath.str().c_str());
233233
for(uint32_t i=0; i<optionsArrayTemp->Length(); i++) {
234-
v8::Local<v8::Value> arrayItemValue = optionsArrayTemp->Get(i);
234+
v8::Local<v8::Value> arrayItemValue = optionsArrayTemp->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
235235
if(!arrayItemValue->IsString()) {
236236
delete[] vmOptions;
237237
return Nan::TypeError("options must only contain strings");
@@ -769,7 +769,7 @@ NAN_METHOD(Java::newArray) {
769769
if(strcmp(className.c_str(), "byte") == 0) {
770770
results = env->NewByteArray(arrayObj->Length());
771771
for(uint32_t i=0; i<arrayObj->Length(); i++) {
772-
v8::Local<v8::Value> item = arrayObj->Get(i);
772+
v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
773773
jobject val = v8ToJava(env, item);
774774
jclass byteClazz = env->FindClass("java/lang/Byte");
775775
jmethodID byte_byteValue = env->GetMethodID(byteClazz, "byteValue", "()B");
@@ -783,7 +783,7 @@ NAN_METHOD(Java::newArray) {
783783
else if(strcmp(className.c_str(), "char") == 0) {
784784
results = env->NewCharArray(arrayObj->Length());
785785
for(uint32_t i=0; i<arrayObj->Length(); i++) {
786-
v8::Local<v8::Value> item = arrayObj->Get(i);
786+
v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
787787
jobject val = v8ToJava(env, item);
788788
jclass stringClazz = env->FindClass("java/lang/String");
789789
jmethodID string_charAt = env->GetMethodID(stringClazz, "charAt", "(I)C");
@@ -797,7 +797,7 @@ NAN_METHOD(Java::newArray) {
797797
else if(strcmp(className.c_str(), "short") == 0) {
798798
results = env->NewShortArray(arrayObj->Length());
799799
for(uint32_t i=0; i<arrayObj->Length(); i++) {
800-
v8::Local<v8::Value> item = arrayObj->Get(i);
800+
v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
801801
jobject val = v8ToJava(env, item);
802802
jclass shortClazz = env->FindClass("java/lang/Short");
803803
jmethodID short_shortValue = env->GetMethodID(shortClazz, "shortValue", "()S");
@@ -811,7 +811,7 @@ NAN_METHOD(Java::newArray) {
811811
else if(strcmp(className.c_str(), "double") == 0) {
812812
results = env->NewDoubleArray(arrayObj->Length());
813813
for(uint32_t i=0; i<arrayObj->Length(); i++) {
814-
v8::Local<v8::Value> item = arrayObj->Get(i);
814+
v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
815815
jobject val = v8ToJava(env, item);
816816
jclass doubleClazz = env->FindClass("java/lang/Double");
817817
jmethodID double_doubleValue = env->GetMethodID(doubleClazz, "doubleValue", "()D");
@@ -825,7 +825,7 @@ NAN_METHOD(Java::newArray) {
825825
else if(strcmp(className.c_str(), "int") == 0) {
826826
results = env->NewIntArray(arrayObj->Length());
827827
for(uint32_t i=0; i<arrayObj->Length(); i++) {
828-
v8::Local<v8::Value> item = arrayObj->Get(i);
828+
v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
829829
jobject val = v8ToJava(env, item);
830830
jclass integerClazz = env->FindClass("java/lang/Integer");
831831
jmethodID integer_intValue = env->GetMethodID(integerClazz, "intValue", "()I");
@@ -839,7 +839,7 @@ NAN_METHOD(Java::newArray) {
839839
else if(strcmp(className.c_str(), "float") == 0) {
840840
results = env->NewFloatArray(arrayObj->Length());
841841
for(uint32_t i=0; i<arrayObj->Length(); i++) {
842-
v8::Local<v8::Value> item = arrayObj->Get(i);
842+
v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
843843
jobject val = v8ToJava(env, item);
844844
jclass floatClazz = env->FindClass("java/lang/Float");
845845
jmethodID float_floatValue = env->GetMethodID(floatClazz, "floatValue", "()F");
@@ -853,7 +853,7 @@ NAN_METHOD(Java::newArray) {
853853
else if(strcmp(className.c_str(), "boolean") == 0) {
854854
results = env->NewBooleanArray(arrayObj->Length());
855855
for(uint32_t i=0; i<arrayObj->Length(); i++) {
856-
v8::Local<v8::Value> item = arrayObj->Get(i);
856+
v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
857857
jobject val = v8ToJava(env, item);
858858
jclass booleanClazz = env->FindClass("java/lang/Boolean");
859859
jmethodID boolean_booleanValue = env->GetMethodID(booleanClazz, "booleanValue", "()Z");
@@ -877,7 +877,7 @@ NAN_METHOD(Java::newArray) {
877877
results = env->NewObjectArray(arrayObj->Length(), clazz, NULL);
878878

879879
for(uint32_t i=0; i<arrayObj->Length(); i++) {
880-
v8::Local<v8::Value> item = arrayObj->Get(i);
880+
v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
881881
jobject val = v8ToJava(env, item);
882882
env->SetObjectArrayElement((jobjectArray)results, i, val);
883883
if(env->ExceptionOccurred()) {
@@ -1251,7 +1251,7 @@ void EIO_AfterCallJs(uv_work_t* req) {
12511251
jobject javaResult;
12521252

12531253
v8::Local<v8::Object> dynamicProxyDataFunctions = Nan::New(dynamicProxyData->functions);
1254-
v8::Local<v8::Value> fnObj = dynamicProxyDataFunctions->Get(Nan::New<v8::String>(dynamicProxyData->methodName.c_str()).ToLocalChecked());
1254+
v8::Local<v8::Value> fnObj = dynamicProxyDataFunctions->Get(Nan::GetCurrentContext(), Nan::New<v8::String>(dynamicProxyData->methodName.c_str()).ToLocalChecked()).ToLocalChecked();
12551255
if(fnObj->IsUndefined() || fnObj->IsNull()) {
12561256
dynamicProxyData->throwableClass = "java/lang/NoSuchMethodError";
12571257
dynamicProxyData->throwableMessage = "Could not find js function " + dynamicProxyData->methodName;
@@ -1275,7 +1275,7 @@ void EIO_AfterCallJs(uv_work_t* req) {
12751275
}
12761276
argv = new v8::Local<v8::Value>[argc];
12771277
for(i=0; i<argc; i++) {
1278-
argv[i] = v8Args->Get(i);
1278+
argv[i] = v8Args->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
12791279
}
12801280

12811281
Nan::TryCatch tryCatch;

Diff for: ‎src/javaObject.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
v8::Local<v8::Function> promisify;
3131
if(java->DoPromise()) {
32-
v8::Local<v8::Object> asyncOptions = java->handle()->Get(Nan::New<v8::String>("asyncOptions").ToLocalChecked()).As<v8::Object>();
33-
v8::Local<v8::Value> promisifyValue = asyncOptions->Get(Nan::New<v8::String>("promisify").ToLocalChecked());
32+
v8::Local<v8::Object> asyncOptions = java->handle()->Get(Nan::GetCurrentContext(), Nan::New<v8::String>("asyncOptions").ToLocalChecked()).ToLocalChecked().As<v8::Object>();
33+
v8::Local<v8::Value> promisifyValue = asyncOptions->Get(Nan::GetCurrentContext(), Nan::New<v8::String>("promisify").ToLocalChecked()).ToLocalChecked();
3434
promisify = promisifyValue.As<v8::Function>();
3535
}
3636

Diff for: ‎src/utils.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ static std::string getArrayElementType(v8::Local<v8::Array> array, uint32_t arra
275275
}
276276

277277
for(uint32_t i=0; i<arraySize; i++) {
278-
v8::Local<v8::Value> arg = array->Get(i);
278+
v8::Local<v8::Value> arg = array->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
279279
if (arg->IsArray()) {
280280
return kObject; // We can exit as soon as we know java/lang/Object is required.
281281
}
@@ -332,7 +332,7 @@ jobject v8ToJava(JNIEnv* env, v8::Local<v8::Value> arg) {
332332
jclass objectClazz = env->FindClass(arrayType.c_str());
333333
jobjectArray result = env->NewObjectArray(arraySize, objectClazz, NULL);
334334
for(uint32_t i=0; i<arraySize; i++) {
335-
jobject val = v8ToJava(env, array->Get(i));
335+
jobject val = v8ToJava(env, array->Get(Nan::GetCurrentContext(), i).ToLocalChecked());
336336
env->SetObjectArrayElement(result, i, val);
337337
}
338338
return result;
@@ -405,7 +405,7 @@ void checkJavaException(JNIEnv* env) {
405405
}
406406

407407
jobject v8ToJava_javaLong(JNIEnv* env, v8::Local<v8::Object> obj) {
408-
jobject longValue = v8ToJava(env, obj->Get(Nan::New<v8::String>("longValue").ToLocalChecked()));
408+
jobject longValue = v8ToJava(env, obj->Get(Nan::GetCurrentContext(), Nan::New<v8::String>("longValue").ToLocalChecked()).ToLocalChecked());
409409
jclass longClazz = env->FindClass("java/lang/Long");
410410
jmethodID long_constructor = env->GetMethodID(longClazz, "<init>", "(Ljava/lang/String;)V");
411411
jobject jobj = env->NewObject(longClazz, long_constructor, longValue);
@@ -452,7 +452,7 @@ v8::Local<v8::Value> javaExceptionToV8(Java* java, JNIEnv* env, jthrowable ex, c
452452
msg << "\n" << javaExceptionToString(env, ex);
453453

454454
v8::Local<v8::Value> v8ex = v8::Exception::Error(Nan::New<v8::String>(msg.str().c_str()).ToLocalChecked());
455-
((v8::Object*)*v8ex)->Set(Nan::New<v8::String>("cause").ToLocalChecked(), javaToV8(java, env, ex));
455+
((v8::Object*)*v8ex)->Set(Nan::GetCurrentContext(), Nan::New<v8::String>("cause").ToLocalChecked(), javaToV8(java, env, ex));
456456
return v8ex;
457457
}
458458

@@ -639,7 +639,7 @@ v8::Local<v8::Value> javaArrayToV8(Java* java, JNIEnv* env, jobjectArray objArra
639639
jlong* elems = env->GetLongArrayElements((jlongArray)objArray, 0);
640640
for(jsize i=0; i<arraySize; i++) {
641641
jobject obj = longToJavaLongObj(env, elems[i]);
642-
result->Set(i, JavaObject::New(java, obj));
642+
result->Set(Nan::GetCurrentContext(), i, JavaObject::New(java, obj));
643643
}
644644
env->ReleaseLongArrayElements((jlongArray)objArray, elems, 0);
645645
}
@@ -649,7 +649,7 @@ v8::Local<v8::Value> javaArrayToV8(Java* java, JNIEnv* env, jobjectArray objArra
649649
for(jsize i=0; i<arraySize; i++) {
650650
jobject obj = env->GetObjectArrayElement(objArray, i);
651651
v8::Local<v8::Value> item = javaToV8(java, env, obj);
652-
result->Set(i, item);
652+
result->Set(Nan::GetCurrentContext(), i, item);
653653
}
654654
break;
655655
}
@@ -712,7 +712,7 @@ v8::Local<v8::Value> javaToV8(Java* java, JNIEnv* env, jobject obj, DynamicProxy
712712
std::string strValue = javaObjectToString(env, obj);
713713
v8::Local<v8::Value> v8Result = Nan::New<v8::NumberObject>((double)result);
714714
v8::NumberObject* v8ResultNumberObject = v8::NumberObject::Cast(*v8Result);
715-
v8ResultNumberObject->Set(Nan::New<v8::String>("longValue").ToLocalChecked(), Nan::New<v8::String>(strValue.c_str()).ToLocalChecked());
715+
v8ResultNumberObject->Set(Nan::GetCurrentContext(), Nan::New<v8::String>("longValue").ToLocalChecked(), Nan::New<v8::String>(strValue.c_str()).ToLocalChecked());
716716
SetHiddenValue(v8ResultNumberObject, Nan::New<v8::String>(V8_HIDDEN_MARKER_JAVA_LONG).ToLocalChecked(), Nan::New<v8::Boolean>(true));
717717
return v8Result;
718718
}

0 commit comments

Comments
 (0)