clean up and organize
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package p.studio;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import p.packer.Packer;
|
||||
import p.studio.events.StudioEventBus;
|
||||
import p.studio.events.StudioPackerEventAdapter;
|
||||
import p.studio.utilities.ThemeService;
|
||||
@@ -16,7 +17,7 @@ public final class AppContainer implements Container {
|
||||
private final ThemeService themeService;
|
||||
private final StudioEventBus studioEventBus;
|
||||
private final ObjectMapper mapper;
|
||||
private final Packer packer;
|
||||
private final EmbeddedPacker embeddedPacker;
|
||||
private final StudioBackgroundTasks backgroundTasks;
|
||||
|
||||
public AppContainer() {
|
||||
@@ -26,8 +27,8 @@ public final class AppContainer implements Container {
|
||||
this.mapper = new ObjectMapper();
|
||||
final ExecutorService backgroundExecutor = Executors.newFixedThreadPool(2, new StudioWorkerThreadFactory());
|
||||
this.backgroundTasks = new StudioBackgroundTasks(backgroundExecutor);
|
||||
final p.packer.Packer embeddedPacker = p.packer.Packer.bootstrap(new StudioPackerEventAdapter(studioEventBus));
|
||||
this.packer = new Packer(embeddedPacker.workspaceService(), embeddedPacker::close);
|
||||
final Packer packer = Packer.bootstrap(Container.mapper(), new StudioPackerEventAdapter(studioEventBus));
|
||||
this.embeddedPacker = new EmbeddedPacker(packer.workspaceService(), packer::close);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -51,8 +52,8 @@ public final class AppContainer implements Container {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Packer getPacker() {
|
||||
return packer;
|
||||
public EmbeddedPacker getPacker() {
|
||||
return embeddedPacker;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -62,7 +63,7 @@ public final class AppContainer implements Container {
|
||||
|
||||
@Override
|
||||
public void shutdownContainer() {
|
||||
packer.shutdown();
|
||||
embeddedPacker.shutdown();
|
||||
backgroundTasks.shutdown();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user