Refactor LangCore_Actual

plugin_ide.core.tests/src-lang/melnorme/lang/ide/core/project_model/BundleModelManagerTest.java

@@ -1,36 +1,36 @@
-/*******************************************************************************
- * Copyright (c) 2015 Bruno Medeiros and other Contributors.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Bruno Medeiros - initial API and implementation
- *******************************************************************************/
-package melnorme.lang.ide.core.project_model;
-
-import org.junit.Test;
-
-import melnorme.lang.ide.core.LangCore_Actual;
-import melnorme.lang.ide.core.tests.CommonCoreTest;
-import melnorme.utilbox.concurrency.LatchRunnable;
-
-public class BundleModelManagerTest extends CommonCoreTest {
-
-	@Test
-	public void testShutdown() throws Exception { testShutdown$(); }
-	public void testShutdown$() throws Exception {
-		BundleModelManager<?> bundleMgr = LangCore_Actual.createBundleModelManager();
-		bundleMgr.startManager();
-
-		final LatchRunnable latchRunnable = new LatchRunnable();
-		bundleMgr.getModelAgent().submit(latchRunnable);
-
-		latchRunnable.awaitTaskEntry();
-
-		// Test that shutdown happens successfully even with pending task, and no log entries are made.
-		bundleMgr.shutdownManager(); 
-	}
-
+/*******************************************************************************
+ * Copyright (c) 2015 Bruno Medeiros and other Contributors.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Bruno Medeiros - initial API and implementation
+ *******************************************************************************/
+package melnorme.lang.ide.core.project_model;
+
+import org.junit.Test;
+
+import melnorme.lang.ide.core.LangCore_Actual;
+import melnorme.lang.ide.core.tests.CommonCoreTest;
+import melnorme.utilbox.concurrency.LatchRunnable;
+
+public class BundleModelManagerTest extends CommonCoreTest {
+
+	@Test
+	public void testShutdown() throws Exception { testShutdown$(); }
+	public void testShutdown$() throws Exception {
+		BundleModelManager<?> bundleMgr = LangCore_Actual.createBundleModelManager();
+		bundleMgr.startManager();
+
+		final LatchRunnable latchRunnable = new LatchRunnable();
+		bundleMgr.getModelAgent().submit(latchRunnable);
+
+		latchRunnable.awaitTaskEntry();
+
+		// Test that shutdown happens successfully even with pending task, and no log entries are made.
+		bundleMgr.shutdownManager(); 
+	}
+
 }

plugin_ide.core/src-lang/melnorme/lang/ide/core/LangCore.java

@@ -10,6 +10,8 @@
  *******************************************************************************/
 package melnorme.lang.ide.core;
 
+import static melnorme.utilbox.core.Assert.AssertNamespace.assertTrue;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
@@ -40,27 +42,24 @@ public static LangCore getInstance() {
 		return pluginInstance;
 	}
 
-	/* ----------------- Owned singletons: ----------------- */
+	protected LangCore2 langCore;
 
-	protected static final AbstractToolManager toolManager = LangCore_Actual.createToolManagerSingleton();
-	protected static final SourceModelManager sourceModelManager = LangCore_Actual.createSourceModelManager();
-	protected static final BundleModelManager<?> bundleManager = LangCore_Actual.createBundleModelManager();
-	protected static final BuildManager buildManager = LangCore_Actual.createBuildManager();
+	/* ----------------- Owned singletons: ----------------- */
 
 	public static AbstractToolManager getToolManager() {
-		return toolManager;
+		return pluginInstance.langCore.toolManager;
 	}
 	public static SourceModelManager getSourceModelManager() {
-		return sourceModelManager;
+		return pluginInstance.langCore.sourceModelManager;
 	}
 	public static BundleModelManager<?> getBundleModelManager() {
-		return bundleManager;
+		return pluginInstance.langCore.bundleManager;
 	}
 	public static LangBundleModel getBundleModel() {
-		return bundleManager.getModel();
+		return pluginInstance.langCore.bundleManager.getModel();
 	}
 	public static BuildManager getBuildManager() {
-		return buildManager;
+		return pluginInstance.langCore.buildManager;
 	}
 
 	/* -----------------  ----------------- */
@@ -70,6 +69,8 @@ public static BuildManager getBuildManager() {
 	@Override
 	public final void start(BundleContext context) throws Exception {
 		pluginInstance = this;
+		LangCore2 langCore2 = new LangCore2();
+		assertTrue(this.langCore == langCore2);
 		super.start(context);
 		doCustomStart(context);
 	}
@@ -88,25 +89,15 @@ public final void initializeAfterUIStart() {
 		} else {
 			initializedAfterUI = true;
 
-			startAgentsAfterUIStart();
+			langCore.startAgentsAfterUIStart(this);
 		}
 	}
 
-	/** 
-	 * Start core agents, and do other initizaliation after UI is started.
-	 */
-	public void startAgentsAfterUIStart() {
-		bundleManager.startManager();
-	}
-
 	@Override
 	public final void stop(BundleContext context) throws Exception {
 		doCustomStop(context);
 
-		buildManager.dispose();
-		bundleManager.shutdownManager();
-		sourceModelManager.dispose();
-		toolManager.shutdownNow();
+		langCore.shutdown();
 
 		super.stop(context);
 		pluginInstance = null;

plugin_ide.core/src-lang/melnorme/lang/ide/core/LangCore2.java

@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Bruno Medeiros and other Contributors.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Bruno Medeiros - initial API and implementation
+ *******************************************************************************/
+package melnorme.lang.ide.core;
+
+public class LangCore2 extends LangCore_Actual {
+
+	public LangCore2() {
+	}
+
+	protected void shutdown() {
+		buildManager.dispose();
+		bundleManager.shutdownManager();
+		sourceModelManager.dispose();
+		toolManager.shutdownNow();
+	}
+
+	/** 
+	 * Start core agents, and do other initizaliation after UI is started.
+	 * @param langCore TODO
+	 */
+	public void startAgentsAfterUIStart(LangCore langCore) {
+		bundleManager.startManager();
+	}
+
+}

plugin_ide.core/src/melnorme/lang/ide/core/LangCore_Actual.java

@@ -4,6 +4,7 @@
 import LANG_PROJECT_ID.ide.core.engine.LANGUAGE_SourceModelManager;
 import LANG_PROJECT_ID.ide.core.operations.LANGUAGE_BuildManager;
 import LANG_PROJECT_ID.ide.core.operations.LANGUAGE_ToolManager;
+import melnorme.lang.ide.core.operations.AbstractToolManager;
 import melnorme.lang.ide.core.operations.build.BuildManager;
 import melnorme.lang.ide.core.project_model.LangBundleModel;
 
@@ -18,25 +19,47 @@ public class LangCore_Actual {
 
 	public static final String LANGUAGE_NAME = "Lang";
 
-	public static LANGUAGE_ToolManager createToolManagerSingleton() {
-		return new LANGUAGE_ToolManager();
+
+	public static LangCore2 instance;
+
+	/* ----------------- Owned singletons: ----------------- */
+
+	protected final AbstractToolManager toolManager;
+	protected final LANGUAGE_BundleModelManager bundleManager;
+	protected final BuildManager buildManager;
+	protected final LANGUAGE_SourceModelManager sourceModelManager;
+
+	public LangCore_Actual() {
+		instance = (LangCore2) this;
+		LangCore.pluginInstance.langCore = instance;
+
+		toolManager = createToolManagerSingleton();
+		bundleManager = createBundleModelManager();
+		buildManager = createBuildManager(bundleManager.getModel());
+		sourceModelManager = createSourceModelManager();
 	}
 
-	public static LANGUAGE_SourceModelManager createSourceModelManager() {
-		return new LANGUAGE_SourceModelManager();
+	public static LANGUAGE_ToolManager createToolManagerSingleton() {
+		return new LANGUAGE_ToolManager();
 	}
 
 	public static LANGUAGE_BundleModelManager createBundleModelManager() {
 		return new LANGUAGE_BundleModelManager();
 	}
-	public static LANGUAGE_BundleModel getBundleModel() {
-		return (LANGUAGE_BundleModel) LangCore.getBundleModel();
+	public static BuildManager createBuildManager(LangBundleModel bundleModel) {
+		return new LANGUAGE_BuildManager(bundleModel);
 	}
-	public static BuildManager createBuildManager() {
-		return new LANGUAGE_BuildManager(getBundleModel());
+
+	public static LANGUAGE_SourceModelManager createSourceModelManager() {
+		return new LANGUAGE_SourceModelManager();
 	}
 
 
+	/* -----------------  ----------------- */
+
+	public static LANGUAGE_BundleModel getBundleModel() {
+		return instance.bundleManager.getModel();
+	}
 	public static class LANGUAGE_BundleModel extends LangBundleModel {
 
 	}