Use ServiceLoader to load different implementations

This commit is contained in:
Alexander Udalov
2013-08-20 17:04:30 +04:00
parent 026d76ea42
commit a2e4029bb5
6 changed files with 40 additions and 8 deletions
@@ -0,0 +1 @@
org.jetbrains.jet.lang.resolve.java.resolver.ProgressCheckerImpl
@@ -0,0 +1 @@
org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementFactoryImpl
@@ -0,0 +1 @@
org.jetbrains.jet.lang.resolve.java.structure.impl.JavaSignatureFormatterImpl
@@ -18,11 +18,21 @@ package org.jetbrains.jet.lang.resolve.java.resolver;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Iterator;
import java.util.ServiceLoader;
public abstract class ProgressChecker { public abstract class ProgressChecker {
private static ProgressChecker instance;
@NotNull @NotNull
public static ProgressChecker getInstance() { public static ProgressChecker getInstance() {
// TODO: ServiceLoader.load() if (instance == null) {
return new ProgressCheckerImpl(); Iterator<ProgressChecker> iterator =
ServiceLoader.load(ProgressChecker.class, ProgressChecker.class.getClassLoader()).iterator();
assert iterator.hasNext() : "No service found: " + ProgressChecker.class.getName();
instance = iterator.next();
}
return instance;
} }
public abstract void checkCanceled(); public abstract void checkCanceled();
@@ -17,13 +17,22 @@
package org.jetbrains.jet.lang.resolve.java.structure; package org.jetbrains.jet.lang.resolve.java.structure;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementFactoryImpl;
import java.util.Iterator;
import java.util.ServiceLoader;
public abstract class JavaElementFactory { public abstract class JavaElementFactory {
private static JavaElementFactory instance;
@NotNull @NotNull
public static JavaElementFactory getInstance() { public static JavaElementFactory getInstance() {
// TODO: ServiceLoader.load if (instance == null) {
return new JavaElementFactoryImpl(); Iterator<JavaElementFactory> iterator =
ServiceLoader.load(JavaElementFactory.class, JavaElementFactory.class.getClassLoader()).iterator();
assert iterator.hasNext() : "No service found: " + JavaElementFactory.class.getName();
instance = iterator.next();
}
return instance;
} }
@NotNull @NotNull
@@ -17,12 +17,22 @@
package org.jetbrains.jet.lang.resolve.java.structure; package org.jetbrains.jet.lang.resolve.java.structure;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaSignatureFormatterImpl;
import java.util.Iterator;
import java.util.ServiceLoader;
public abstract class JavaSignatureFormatter { public abstract class JavaSignatureFormatter {
private static JavaSignatureFormatter instance;
@NotNull
public static JavaSignatureFormatter getInstance() { public static JavaSignatureFormatter getInstance() {
// TODO: ServiceLoader.load if (instance == null) {
return new JavaSignatureFormatterImpl(); Iterator<JavaSignatureFormatter> iterator =
ServiceLoader.load(JavaSignatureFormatter.class, JavaSignatureFormatter.class.getClassLoader()).iterator();
assert iterator.hasNext() : "No service found: " + JavaSignatureFormatter.class.getName();
instance = iterator.next();
}
return instance;
} }
/** /**