diff --git a/pom.xml b/pom.xml
index e617892..442298a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
de.extio
game-engine
- 1.0.29
+ 1.0.30
25
diff --git a/src/main/java/de/extio/game_engine/storage/StorageServiceAutoConfiguration.java b/src/main/java/de/extio/game_engine/storage/StorageServiceAutoConfiguration.java
index f800cfe..925f030 100644
--- a/src/main/java/de/extio/game_engine/storage/StorageServiceAutoConfiguration.java
+++ b/src/main/java/de/extio/game_engine/storage/StorageServiceAutoConfiguration.java
@@ -3,15 +3,29 @@ package de.extio.game_engine.storage;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
+import de.extio.game_engine.event.EventService;
+import de.extio.game_engine.i18n.LocalizationService;
+import de.extio.game_engine.renderer.work.RenderingBoPool;
+import de.extio.game_engine.storage.dialog.FileSelectionDialogModule;
+
@AutoConfiguration
@ConditionalOnProperty(name = "game-engine.storage.enabled", havingValue = "true", matchIfMissing = true)
public class StorageServiceAutoConfiguration {
-
+
@Bean
@ConditionalOnMissingBean
StorageService storageService() {
return new StorageServiceImpl();
}
+
+ @Bean
+ @ConditionalOnMissingBean
+ @ConditionalOnProperty(name = "game-engine.storage.dialog.enabled", havingValue = "true", matchIfMissing = true)
+ @ConditionalOnProperty(name = "game-engine.renderer.enabled", havingValue = "true", matchIfMissing = true)
+ FileSelectionDialogModule fileSelectionDialog(final ApplicationContext applicationContext, final EventService eventService, final LocalizationService localizationService, final RenderingBoPool renderingBoPool, final StorageService storageService) {
+ return new FileSelectionDialogModule(applicationContext, eventService, localizationService, renderingBoPool, storageService);
+ }
}
diff --git a/src/main/java/de/extio/game_engine/storage/dialog/FileSelectionDialogModule.java b/src/main/java/de/extio/game_engine/storage/dialog/FileSelectionDialogModule.java
index 5916246..360f857 100644
--- a/src/main/java/de/extio/game_engine/storage/dialog/FileSelectionDialogModule.java
+++ b/src/main/java/de/extio/game_engine/storage/dialog/FileSelectionDialogModule.java
@@ -10,9 +10,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.UUID;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Component;
import de.extio.game_engine.event.Event;
import de.extio.game_engine.event.EventService;
@@ -40,7 +38,6 @@ import de.extio.game_engine.storage.StorageItemDescriptor;
import de.extio.game_engine.storage.StorageResource;
import de.extio.game_engine.storage.StorageService;
-@Component
public class FileSelectionDialogModule extends AbstractClientModule {
public enum FileSelectionMode {
@@ -98,20 +95,23 @@ public class FileSelectionDialogModule extends AbstractClientModule {
private static final String BUTTON_CANCEL = "FileSelectionDialog_Button_Cancel";
- @Autowired
- private ApplicationContext applicationContext;
+ private final ApplicationContext applicationContext;
- @Autowired
- private EventService eventService;
+ private final EventService eventService;
- @Autowired
- private LocalizationService localizationService;
+ private final LocalizationService localizationService;
- @Autowired
- private RenderingBoPool renderingBoPool;
+ private final RenderingBoPool renderingBoPool;
- @Autowired
- private StorageService storageService;
+ private final StorageService storageService;
+
+ public FileSelectionDialogModule(final ApplicationContext applicationContext, final EventService eventService, final LocalizationService localizationService, final RenderingBoPool renderingBoPool, final StorageService storageService) {
+ this.applicationContext = applicationContext;
+ this.eventService = eventService;
+ this.localizationService = localizationService;
+ this.renderingBoPool = renderingBoPool;
+ this.storageService = storageService;
+ }
private Window dialogWindow;