some exception refactoring

Matthias Fuchs · Matthias Fuchs · commit a60c0de67d14 · 2019-06-23T09:33:46.000+02:00
diff --git a/native/libjcocoa.xcodeproj/project.xcworkspace/xcuserdata/matthias.fuchs.xcuserdatad/UserInterfaceState.xcuserstate b/native/libjcocoa.xcodeproj/project.xcworkspace/xcuserdata/matthias.fuchs.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/native/libjcocoa.xcodeproj/xcshareddata/xcschemes/libjcocoa.xcscheme b/native/libjcocoa.xcodeproj/xcshareddata/xcschemes/libjcocoa.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1020"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "65152903163458B4002A41D8"
+               BuildableName = "libjcocoa.dylib"
+               BlueprintName = "libjcocoa"
+               ReferencedContainer = "container:libjcocoa.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "65152903163458B4002A41D8"
+            BuildableName = "libjcocoa.dylib"
+            BlueprintName = "libjcocoa"
+            ReferencedContainer = "container:libjcocoa.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "65152903163458B4002A41D8"
+            BuildableName = "libjcocoa.dylib"
+            BlueprintName = "libjcocoa"
+            ReferencedContainer = "container:libjcocoa.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/native/libjcocoa/WLJavaProxy.m b/native/libjcocoa/WLJavaProxy.m
@@ -39,8 +39,8 @@ -(WLJavaProxy*)init:(jobject)thePeer
         
         return self;
     } @catch (NSException *e) {
-        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
         NSLog(@"Exception: %@", e);
+        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
     }
 }
 
@@ -59,8 +59,8 @@ -(void)dealloc
             //JNF_COCOA_EXIT(env);
         }
     } @catch (NSException *e) {
-        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
         NSLog(@"Exception: %@", e);
+        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
     }
 }
 
@@ -74,8 +74,8 @@ +(void)setJVM:(JavaVM*)theJvm
             jvm = theJvm;
         }
     } @catch (NSException *e) {
-        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
         NSLog(@"Exception: %@", e);
+        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
     }
 }
 
@@ -89,31 +89,38 @@ -(NSMethodSignature*)methodSignatureForSelector:(SEL)sel
         if ( attach == 0 ){
             //JNF_COCOA_ENTER(env);
             signature = (NSMethodSignature*)(*env)->CallLongMethod(env, peer, jMethodSignatureForSelector, sel);
+            
+            if (!signature) {
+                signature = [@"" methodSignatureForSelector:sel];
+            }
+            
             //JNF_COCOA_EXIT(env);
         }
         //(*jvm)->DetachCurrentThread(jvm);
         return signature;
     } @catch (NSException *e) {
-        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
         NSLog(@"Exception: %@", e);
+        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
     }
 }
 
 -(void)forwardInvocation:(NSInvocation *)invocation
 {
     JNIEnv *env=0;
+    SEL aSelector = [invocation selector];
+    int attach = (*jvm)->AttachCurrentThread(jvm, (void**)&env, NULL);
     
     @try {
-        int attach = (*jvm)->AttachCurrentThread(jvm, (void**)&env, NULL);
-        if ( attach == 0 ){
+        if ( attach == 0 ) {
             //JNF_COCOA_ENTER(env);
             (*env)->CallVoidMethod(env, peer, jForwardInvocation, invocation);
             //JNF_COCOA_EXIT(env);
         }
         //(*jvm)->DetachCurrentThread(jvm);
     } @catch (NSException *e) {
-        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
-        NSLog(@"Exception: %@", e);
+        NSString *message = [NSString stringWithFormat:@"Selector '%@' caused exception: %@", NSStringFromSelector(aSelector), e.reason];
+        NSLog(@"%@", message);
+        [JavaUtil throwJavaException: env withMessage: [message UTF8String] ];
     }
 }
 
@@ -132,8 +139,8 @@ -(BOOL)respondsToSelector:(SEL)aSelector
         //(*jvm)->DetachCurrentThread(jvm);
         return response==1?TRUE:FALSE;
     } @catch (NSException *e) {
-        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
         NSLog(@"Exception: %@", e);
+        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
     }
 }
 
@@ -148,8 +155,30 @@ -(jobject)javaPeer
         }
         return NULL;
     } @catch (NSException *e) {
-        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
         NSLog(@"Exception: %@", e);
+        [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];
     }
 }
+
++ (NSSet<NSString *> *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
+//    SEL theSelector = @selector(keyPathsForValuesAffectingValueForKey:);
+//    NSMethodSignature *aSignature = [NSObject methodSignatureForSelector:theSelector];
+//    NSInvocation *anInvocation = [NSInvocation invocationWithMethodSignature:aSignature];
+//
+//    [anInvocation setSelector:theSelector];
+//    [anInvocation setTarget:self];
+//    [anInvocation setArgument:&key atIndex:1];
+//
+//    [self forwardInvocation:anInvocation];
+//
+//    void *result;
+//    [anInvocation getReturnValue:result];
+//
+//    return result;
+    
+    
+    NSSet *keyPaths  = [[NSSet alloc] initWithObjects: key];
+    return keyPaths;
+}
+
 @end

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ -(WLJavaProxy*)init:(jobject)thePeer`
`39`	`39`
`40`	`40`	`return self;`
`41`	`41`	`} @catch (NSException *e) {`
`42`		`- [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`43`	`42`	`NSLog(@"Exception: %@", e);`
	`43`	`+ [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`@@ -59,8 +59,8 @@ -(void)dealloc`
`59`	`59`	`//JNF_COCOA_EXIT(env);`
`60`	`60`	`}`
`61`	`61`	`} @catch (NSException *e) {`
`62`		`- [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`63`	`62`	`NSLog(@"Exception: %@", e);`
	`63`	`+ [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`@@ -74,8 +74,8 @@ +(void)setJVM:(JavaVM*)theJvm`
`74`	`74`	`jvm = theJvm;`
`75`	`75`	`}`
`76`	`76`	`} @catch (NSException *e) {`
`77`		`- [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`78`	`77`	`NSLog(@"Exception: %@", e);`
	`78`	`+ [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`@@ -89,31 +89,38 @@ -(NSMethodSignature*)methodSignatureForSelector:(SEL)sel`
`89`	`89`	`if ( attach == 0 ){`
`90`	`90`	`//JNF_COCOA_ENTER(env);`
`91`	`91`	`signature = (NSMethodSignature)(env)->CallLongMethod(env, peer, jMethodSignatureForSelector, sel);`
	`92`	`+`
	`93`	`+ if (!signature) {`
	`94`	`+ signature = [@"" methodSignatureForSelector:sel];`
	`95`	`+ }`
	`96`	`+`
`92`	`97`	`//JNF_COCOA_EXIT(env);`
`93`	`98`	`}`
`94`	`99`	`//(*jvm)->DetachCurrentThread(jvm);`
`95`	`100`	`return signature;`
`96`	`101`	`} @catch (NSException *e) {`
`97`		`- [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`98`	`102`	`NSLog(@"Exception: %@", e);`
	`103`	`+ [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`99`	`104`	`}`
`100`	`105`	`}`
`101`	`106`
`102`	`107`	`-(void)forwardInvocation:(NSInvocation *)invocation`
`103`	`108`	`{`
`104`	`109`	`JNIEnv *env=0;`
	`110`	`+ SEL aSelector = [invocation selector];`
	`111`	`+ int attach = (jvm)->AttachCurrentThread(jvm, (void*)&env, NULL);`
`105`	`112`
`106`	`113`	`@try {`
`107`		`- int attach = (jvm)->AttachCurrentThread(jvm, (void*)&env, NULL);`
`108`		`- if ( attach == 0 ){`
	`114`	`+ if ( attach == 0 ) {`
`109`	`115`	`//JNF_COCOA_ENTER(env);`
`110`	`116`	`(*env)->CallVoidMethod(env, peer, jForwardInvocation, invocation);`
`111`	`117`	`//JNF_COCOA_EXIT(env);`
`112`	`118`	`}`
`113`	`119`	`//(*jvm)->DetachCurrentThread(jvm);`
`114`	`120`	`} @catch (NSException *e) {`
`115`		`- [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`116`		`- NSLog(@"Exception: %@", e);`
	`121`	`+ NSString *message = [NSString stringWithFormat:@"Selector '%@' caused exception: %@", NSStringFromSelector(aSelector), e.reason];`
	`122`	`+ NSLog(@"%@", message);`
	`123`	`+ [JavaUtil throwJavaException: env withMessage: [message UTF8String] ];`
`117`	`124`	`}`
`118`	`125`	`}`
`119`	`126`
`@@ -132,8 +139,8 @@ -(BOOL)respondsToSelector:(SEL)aSelector`
`132`	`139`	`//(*jvm)->DetachCurrentThread(jvm);`
`133`	`140`	`return response==1?TRUE:FALSE;`
`134`	`141`	`} @catch (NSException *e) {`
`135`		`- [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`136`	`142`	`NSLog(@"Exception: %@", e);`
	`143`	`+ [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`137`	`144`	`}`
`138`	`145`	`}`
`139`	`146`
`@@ -148,8 +155,30 @@ -(jobject)javaPeer`
`148`	`155`	`}`
`149`	`156`	`return NULL;`
`150`	`157`	`} @catch (NSException *e) {`
`151`		`- [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`152`	`158`	`NSLog(@"Exception: %@", e);`
	`159`	`+ [JavaUtil throwJavaException: env withMessage: [[e reason] UTF8String] ];`
`153`	`160`	`}`
`154`	`161`	`}`
	`162`	`+`
	`163`	`++ (NSSet<NSString > )keyPathsForValuesAffectingValueForKey:(NSString *)key {`
	`164`	`+// SEL theSelector = @selector(keyPathsForValuesAffectingValueForKey:);`
	`165`	`+// NSMethodSignature *aSignature = [NSObject methodSignatureForSelector:theSelector];`
	`166`	`+// NSInvocation *anInvocation = [NSInvocation invocationWithMethodSignature:aSignature];`
	`167`	`+//`
	`168`	`+// [anInvocation setSelector:theSelector];`
	`169`	`+// [anInvocation setTarget:self];`
	`170`	`+// [anInvocation setArgument:&key atIndex:1];`
	`171`	`+//`
	`172`	`+// [self forwardInvocation:anInvocation];`
	`173`	`+//`
	`174`	`+// void *result;`
	`175`	`+// [anInvocation getReturnValue:result];`
	`176`	`+//`
	`177`	`+// return result;`
	`178`	`+`
	`179`	`+`
	`180`	`+ NSSet *keyPaths = [[NSSet alloc] initWithObjects: key];`
	`181`	`+ return keyPaths;`
	`182`	`+}`
	`183`	`+`
`155`	`184`	`@end`