From 3b0c678a802b55e6d91c786fa1a5255da4dda140 Mon Sep 17 00:00:00 2001 From: Emil Forslund Date: Tue, 23 Aug 2016 17:08:48 -0700 Subject: [PATCH] Enums: Fix typo in EnumGeneratorBundle --- ...mGenetatorBundle.java => EnumGeneratorBundle.java} | 5 +++-- .../plugins/enums/EnumGeneratorComponent.java | 11 ++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) rename plugins/enum-generator/src/main/java/com/speedment/plugins/enums/{EnumGenetatorBundle.java => EnumGeneratorBundle.java} (84%) diff --git a/plugins/enum-generator/src/main/java/com/speedment/plugins/enums/EnumGenetatorBundle.java b/plugins/enum-generator/src/main/java/com/speedment/plugins/enums/EnumGeneratorBundle.java similarity index 84% rename from plugins/enum-generator/src/main/java/com/speedment/plugins/enums/EnumGenetatorBundle.java rename to plugins/enum-generator/src/main/java/com/speedment/plugins/enums/EnumGeneratorBundle.java index e02b91945f..5a5f998fa7 100644 --- a/plugins/enum-generator/src/main/java/com/speedment/plugins/enums/EnumGenetatorBundle.java +++ b/plugins/enum-generator/src/main/java/com/speedment/plugins/enums/EnumGeneratorBundle.java @@ -23,11 +23,12 @@ * * @author Per Minborg */ -public class EnumGenetatorBundle implements InjectBundle { +public class EnumGeneratorBundle implements InjectBundle { @Override public Stream> injectables() { - return InjectBundle.of(EnumGeneratorComponent.class) + return EnumGeneratorComponent.include() + .andThen(EnumGeneratorComponent.class) .injectables(); } diff --git a/plugins/enum-generator/src/main/java/com/speedment/plugins/enums/EnumGeneratorComponent.java b/plugins/enum-generator/src/main/java/com/speedment/plugins/enums/EnumGeneratorComponent.java index 80a3e175e5..de69d28843 100644 --- a/plugins/enum-generator/src/main/java/com/speedment/plugins/enums/EnumGeneratorComponent.java +++ b/plugins/enum-generator/src/main/java/com/speedment/plugins/enums/EnumGeneratorComponent.java @@ -20,13 +20,12 @@ import com.speedment.plugins.enums.internal.GeneratedEntityDecorator; import com.speedment.generator.StandardTranslatorKey; import com.speedment.generator.component.CodeGenerationComponent; -import com.speedment.generator.component.EventComponent; import com.speedment.generator.component.TypeMapperComponent; +import com.speedment.internal.common.injector.InjectBundle; import com.speedment.internal.common.injector.Injector; import static com.speedment.internal.common.injector.State.INITIALIZED; import static com.speedment.internal.common.injector.State.RESOLVED; import com.speedment.internal.common.injector.annotation.ExecuteBefore; -import com.speedment.internal.common.injector.annotation.Inject; import com.speedment.internal.common.injector.annotation.InjectKey; import com.speedment.internal.common.injector.annotation.WithState; import com.speedment.plugins.enums.internal.ui.CommaSeparatedStringEditor; @@ -54,7 +53,13 @@ @InjectKey(EnumGeneratorComponent.class) public final class EnumGeneratorComponent extends AbstractComponent { - private @Inject EventComponent events; + public static InjectBundle include() { + return InjectBundle.of( + TypeMapperComponent.class, + CodeGenerationComponent.class, + PropertyEditorComponent.class + ); + } @ExecuteBefore(RESOLVED) void installDecorators(Injector injector,