rik/jlibloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some tidy-ups to exception handling in Native.get().

Browse Source
This commit is contained in:
Adam Murdoch
2012-09-01 10:31:15 +10:00
parent b8b96291c6
commit b7f6183c4b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/rubygrapefruit/platform/Native.java
View File

@@ -70,8 +70,14 @@ public class Native {
public static <T extends NativeIntegration> T get(Class<T> type) public static <T extends NativeIntegration> T get(Class<T> type)
throws NativeIntegrationUnavailableException, NativeException { throws NativeIntegrationUnavailableException, NativeException {
init(null); init(null);
Platform platform = Platform.current(); try {
return platform.get(type); Platform platform = Platform.current();
return platform.get(type);
} catch (NativeException e) {
throw e;
} catch (Exception e) {
throw new NativeException(String.format("Failed to load native integration %s.", type.getSimpleName()), e);
}
} }
private static void copy(URL source, File dest) { private static void copy(URL source, File dest) {

2
src/main/java/net/rubygrapefruit/platform/internal/Platform.java
View File

@@ -34,7 +34,7 @@ public abstract class Platform {
public <T extends NativeIntegration> T get(Class<T> type) { public <T extends NativeIntegration> T get(Class<T> type) {
throw new NativeIntegrationUnavailableException(String.format("Native integration %s is not supported on this operating system (%s %s)", throw new NativeIntegrationUnavailableException(String.format("Native integration %s is not supported on this operating system (%s %s)",
type.getName(), getOperatingSystem(), getArchitecture())); type.getSimpleName(), getOperatingSystem(), getArchitecture()));
} }
public abstract String getLibraryName() throws NativeIntegrationUnavailableException; public abstract String getLibraryName() throws NativeIntegrationUnavailableException;