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

Some refactoring now that FileSystems is supported on all platforms.

Browse Source
This commit is contained in:
Adam Murdoch
2014-03-15 16:14:40 +11:00
parent 46adcef093
commit 110472a36f
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,6 +168,9 @@ public abstract class Platform {
if (type.equals(SystemInfo.class)) { if (type.equals(SystemInfo.class)) {
return type.cast(new DefaultSystemInfo()); return type.cast(new DefaultSystemInfo());
} }
if (type.equals(FileSystems.class)) {
return type.cast(new PosixFileSystems());
}
return super.get(type, nativeLibraryLoader); return super.get(type, nativeLibraryLoader);
} }
} }
@@ -184,38 +187,28 @@ public abstract class Platform {
} }
} }
private abstract static class Linux extends Unix { private static class Linux32Bit extends Unix {
@Override
public <T extends NativeIntegration> T get(Class<T> type, NativeLibraryLoader nativeLibraryLoader) {
if (type.equals(FileSystems.class)) {
return type.cast(new PosixFileSystems());
}
return super.get(type, nativeLibraryLoader);
}
}
private static class Linux32Bit extends Linux {
@Override @Override
public String getId() { public String getId() {
return "linux-i386"; return "linux-i386";
} }
} }
private static class Linux64Bit extends Linux { private static class Linux64Bit extends Unix {
@Override @Override
public String getId() { public String getId() {
return "linux-amd64"; return "linux-amd64";
} }
} }
private static class FreeBSD32Bit extends Linux { private static class FreeBSD32Bit extends Unix {
@Override @Override
public String getId() { public String getId() {
return "freebsd-i386"; return "freebsd-i386";
} }
} }
private static class FreeBSD64Bit extends Linux { private static class FreeBSD64Bit extends Unix {
@Override @Override
public String getId() { public String getId() {
return "freebsd-amd64"; return "freebsd-amd64";
@@ -223,14 +216,6 @@ public abstract class Platform {
} }
private static abstract class OsX extends Posix { private static abstract class OsX extends Posix {
@Override
public <T extends NativeIntegration> T get(Class<T> type, NativeLibraryLoader nativeLibraryLoader) {
if (type.equals(FileSystems.class)) {
return type.cast(new PosixFileSystems());
}
return super.get(type, nativeLibraryLoader);
}
@Override @Override
public String getLibraryName() { public String getLibraryName() {
return "libnative-platform.dylib"; return "libnative-platform.dylib";