From 14869fb591214ca5a08acbf0ff16b133c31ebc6a Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Thu, 21 Jun 2012 16:54:11 +0200 Subject: [PATCH] Clean up: No functional changes. --- .../com/twelvemonkeys/lang/NativeLoader.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sandbox/sandbox-common/src/main/java/com/twelvemonkeys/lang/NativeLoader.java b/sandbox/sandbox-common/src/main/java/com/twelvemonkeys/lang/NativeLoader.java index 572edeba..6d097cfa 100755 --- a/sandbox/sandbox-common/src/main/java/com/twelvemonkeys/lang/NativeLoader.java +++ b/sandbox/sandbox-common/src/main/java/com/twelvemonkeys/lang/NativeLoader.java @@ -33,8 +33,8 @@ import com.twelvemonkeys.util.FilterIterator; import com.twelvemonkeys.util.service.ServiceRegistry; import java.io.*; +import java.util.Collections; import java.util.Iterator; -import java.util.Arrays; /** * NativeLoader @@ -182,6 +182,7 @@ final class NativeLoader { Iterator providers = sRegistry.providers(pLibrary); while (providers.hasNext()) { NativeResourceSPI resourceSPI = providers.next(); + try { return resourceSPI.getClassPathResource(Platform.get()); } @@ -372,27 +373,29 @@ final class NativeLoader { private static class NativeResourceRegistry extends ServiceRegistry { public NativeResourceRegistry() { - super(Arrays.asList(NativeResourceSPI.class).iterator()); + super(Collections.singletonList(NativeResourceSPI.class).iterator()); registerApplicationClasspathSPIs(); } - Iterator providers(String pNativeResource) { - return new FilterIterator(providers(NativeResourceSPI.class), - new NameFilter(pNativeResource)); + Iterator providers(final String nativeResource) { + return new FilterIterator( + providers(NativeResourceSPI.class), + new NameFilter(nativeResource) + ); } } private static class NameFilter implements FilterIterator.Filter { - private final String mName; + private final String name; NameFilter(String pName) { if (pName == null) { throw new IllegalArgumentException("name == null"); } - mName = pName; + name = pName; } public boolean accept(NativeResourceSPI pElement) { - return mName.equals(pElement.getResourceName()); + return name.equals(pElement.getResourceName()); } } } \ No newline at end of file