Move ParameterAdapterManager to SolApplication

Author: Mpcs

engine/src/main/java/org/destinationsol/SolApplication.java

@@ -30,6 +30,7 @@
 import org.destinationsol.game.SaveManager;
 import org.destinationsol.game.SolGame;
 import org.destinationsol.game.WorldConfig;
+import org.destinationsol.game.console.adapter.ParameterAdapterManager;
 import org.destinationsol.game.context.Context;
 import org.destinationsol.game.context.internal.ContextImpl;
 import org.destinationsol.menu.MenuScreens;
@@ -76,6 +77,7 @@ public class SolApplication implements ApplicationListener {
     private String fatalErrorMsg;
     private String fatalErrorTrace;
     private SolGame solGame;
+    private ParameterAdapterManager parameterAdapterManager;
     private Context context;
 
     private WorldConfig worldConfig;
@@ -125,6 +127,7 @@ public void create() {
         menuScreens = new MenuScreens(layouts, isMobile(), options);
 
         inputManager.setScreen(this, menuScreens.main);
+        parameterAdapterManager = ParameterAdapterManager.createCore(this);
     }
 
     @Override
@@ -250,7 +253,6 @@ public void play(boolean tut, String shipName, boolean isNewGame) {
 
         FactionInfo factionInfo = new FactionInfo();
         solGame = new SolGame(shipName, tut, isNewGame, commonDrawer, context, worldConfig);
-        solGame.createParameterAdapter();
         factionDisplay = new FactionDisplay(solGame, factionInfo);
         inputManager.setScreen(this, solGame.getScreens().mainGameScreen);
     }
@@ -277,6 +279,10 @@ public SolGame getGame() {
         return solGame;
     }
 
+    public ParameterAdapterManager getParameterAdapterManager() {
+        return parameterAdapterManager;
+    }
+
     public SolLayouts getLayouts() {
         return layouts;
     }

engine/src/main/java/org/destinationsol/game/SolGame.java

@@ -32,9 +32,7 @@
 import org.destinationsol.game.asteroid.AsteroidBuilder;
 import org.destinationsol.game.attributes.RegisterUpdateSystem;
 import org.destinationsol.game.chunk.ChunkManager;
-import org.destinationsol.game.console.adapter.ParameterAdapterManager;
 import org.destinationsol.game.context.Context;
-import org.destinationsol.game.context.internal.ContextImpl;
 import org.destinationsol.game.drawables.DrawableDebugger;
 import org.destinationsol.game.drawables.DrawableManager;
 import org.destinationsol.game.farBg.FarBackgroundManagerOld;
@@ -97,7 +95,6 @@ public class SolGame {
     private final MountDetectDrawer mountDetectDrawer;
     private final TutorialManager tutorialManager;
     private final GalaxyFiller galaxyFiller;
-    private ParameterAdapterManager parameterAdapterManager;
     private Hero hero;
     private float timeStep;
     private float time;
@@ -249,9 +246,6 @@ private void createAndSpawnMercenariesFromSave() {
         }
     }
 
-    public void createParameterAdapter() {
-        parameterAdapterManager = ParameterAdapterManager.createCore(this.solApplication);
-    }
     public void onGameEnd(Context context) {
         // If the hero tries to exit while dead, respawn them first, then save
         if (hero.isDead()) {
@@ -557,10 +551,4 @@ public HullConfigManager getHullConfigManager() {
         return hullConfigManager;
     }
 
-    public ParameterAdapterManager getParameterAdapterManager() {
-        if (parameterAdapterManager == null) {
-            parameterAdapterManager = ParameterAdapterManager.createCore(this.solApplication);
-        }
-        return parameterAdapterManager;
-    }
 }

engine/src/main/java/org/destinationsol/game/console/CommandParameter.java

@@ -78,7 +78,7 @@ public static <T> CommandParameter single(String name, Class<T> type, boolean re
         if (type.isArray()) {
             throw new IllegalArgumentException("The type of a simple CommandParameterDefinition must not be an array!");
         }
-        ParameterAdapterManager parameterAdapterManager = ParameterAdapterManager.createCore(context.get(SolApplication.class));
+        ParameterAdapterManager parameterAdapterManager = context.get(SolApplication.class).getParameterAdapterManager();
         return new CommandParameter(name, type, required, suggester, parameterAdapterManager, context);
     }
 
@@ -112,7 +112,7 @@ public static <T> CommandParameter array(String name, Class<T> childType, Charac
         }
 
         Class<?> type = getArrayClass(childType);
-        ParameterAdapterManager parameterAdapterManager = ParameterAdapterManager.createCore(context.get(SolApplication.class));
+        ParameterAdapterManager parameterAdapterManager = context.get(SolApplication.class).getParameterAdapterManager();
         return new CommandParameter(name, type, required, suggester, parameterAdapterManager, context);
     }