Undeprecating createInjector(Stage, ...).
The deprecation causes unnecessary churn in developer's codebases. Use of this API isn't likely to be buggy. It's common enough that we'll never be able to fully delete it.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1180 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/src/com/google/inject/Guice.java b/src/com/google/inject/Guice.java
index f13a20f..03e652a 100644
--- a/src/com/google/inject/Guice.java
+++ b/src/com/google/inject/Guice.java
@@ -51,12 +51,10 @@
private Guice() {}
/**
- * Creates an injector for the given set of modules.
- *
- * To create an Injector with a {@link Stage} or other options, see
- * {@link InjectorBuilder}.
+ * Creates an injector for the given set of modules. To create an injector
+ * with a {@link Stage} or other options, see {@link InjectorBuilder}.
*
- * @throws CreationException if one or more errors occur during Injector
+ * @throws CreationException if one or more errors occur during injector
* construction
*/
public static Injector createInjector(Module... modules) {
@@ -64,12 +62,10 @@
}
/**
- * Creates an injector for the given set of modules.
- *
- * To create an Injector with a {@link Stage} or other options, see
- * {@link InjectorBuilder}.
+ * Creates an injector for the given set of modules. To create an injector
+ * with a {@link Stage} or other options, see {@link InjectorBuilder}.
*
- * @throws CreationException if one or more errors occur during Injector
+ * @throws CreationException if one or more errors occur during injector
* creation
*/
public static Injector createInjector(Iterable<? extends Module> modules) {
@@ -78,28 +74,22 @@
/**
* Creates an injector for the given set of modules, in a given development
- * stage.
+ * stage. Use {@link InjectorBuilder} for advanced injector creation.
*
- * @throws CreationException if one or more errors occur during Injector
+ * @throws CreationException if one or more errors occur during injector
* creation.
- *
- * @deprecated Use {@link InjectorBuilder} for advanced Injector creation.
*/
- @Deprecated
public static Injector createInjector(Stage stage, Module... modules) {
return createInjector(stage, Arrays.asList(modules));
}
/**
* Creates an injector for the given set of modules, in a given development
- * stage.
+ * stage. Use {@link InjectorBuilder} for advanced injector creation.
*
- * @throws CreationException if one or more errors occur during Injector
+ * @throws CreationException if one or more errors occur during injector
* construction
- *
- * @deprecated Use {@link InjectorBuilder} for advanced Injector creation.
*/
- @Deprecated
public static Injector createInjector(Stage stage,
Iterable<? extends Module> modules) {
return new InjectorBuilder()
