keep track of ForgeRuntime in F1 StartAction

jbosstools · May 6, 2014 · 10c2fd6 · 10c2fd6
1 parent f74d4a0
commit 10c2fd6
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/...rg.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/internal/actions/f1/StartAction.java b/...rg.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/internal/actions/f1/StartAction.java
@@ -4,24 +4,29 @@
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.jboss.tools.forge.core.runtime.ForgeRuntime;
+import org.jboss.tools.forge.core.runtime.ForgeRuntimeState;
 import org.jboss.tools.forge.ui.internal.ForgeUIPlugin;
 import org.jboss.tools.forge.ui.util.ForgeHelper;
 
 public class StartAction extends Action {
+
+	ForgeRuntime runtime;
 
-	public StartAction() {
+	public StartAction(ForgeRuntime runtime) {
 		super();
+		this.runtime = runtime;
 		setImageDescriptor(createImageDescriptor());
 	}
 
 	@Override
 	public void run() {
-		ForgeHelper.startForge();
+		ForgeHelper.start(runtime);
 	}
 
 	@Override
 	public boolean isEnabled() {
-		return !ForgeHelper.isForgeRunning();
+		return ForgeRuntimeState.STOPPED.equals(runtime.getState());
 	}
 
 	private ImageDescriptor createImageDescriptor() {

diff --git a/...oss.tools.forge.ui/src/org/jboss/tools/forge/ui/internal/console/f1/ForgeConsoleImpl.java b/...oss.tools.forge.ui/src/org/jboss/tools/forge/ui/internal/console/f1/ForgeConsoleImpl.java
@@ -38,7 +38,7 @@ public Control createControl(Composite parent) {
 	@Override
 	public IAction[] createActions() {
 		return new IAction[] { 
-				new StartAction(),
+				new StartAction(getRuntime()),
 				new StopAction(),
 				new GoToAction(),
 				new LinkAction()
@@ -53,6 +53,10 @@ public ForgeRuntime getRuntime() {
 	@Override
 	public void propertyChange(PropertyChangeEvent evt) {
 		if (!ForgeRuntime.PROPERTY_STATE.equals(evt.getPropertyName())) return;
+		if (ForgeRuntimeState.STOPPED.equals(evt.getOldValue()) 
+				&& ForgeRuntimeState.STARTING.equals(evt.getNewValue())) {
+			forgeTextViewer.startConsole();
+		}
 		if (ForgeRuntimeState.STOPPED.equals(evt.getNewValue())) {
 			forgeTextViewer.stopConsole();
 		}

diff --git a/.../org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/internal/part/ForgeTextViewer.java b/.../org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/internal/part/ForgeTextViewer.java
@@ -171,4 +171,14 @@ public void run() {
     	});
     }
 
+    public void startConsole() {
+    	Display.getDefault().syncExec(new Runnable() {
+			@Override
+			public void run() {
+				forgeDocument.connect(getRuntime());
+		    	setDocument(forgeDocument);
+			}   		
+    	});
+    }
+
 }
diff --git a/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java b/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/util/ForgeHelper.java
@@ -10,9 +10,14 @@
 import org.jboss.tools.forge.core.runtime.ForgeRuntime;
 import org.jboss.tools.forge.core.runtime.ForgeRuntimeState;
 import org.jboss.tools.forge.ui.internal.document.ForgeDocument;
+import org.jboss.tools.forge.ui.internal.ext.util.FurnaceHelper;
 
 public class ForgeHelper {
 
+	public static void start(ForgeRuntime runtime) {
+		FurnaceHelper.createStartRuntimeJob(runtime).schedule();
+	}
+
 	public static void startForge() {
 		final ForgeRuntime runtime = ForgeCorePreferences.INSTANCE.getDefaultRuntime();
 		if (runtime == null || ForgeRuntimeState.RUNNING.equals(runtime.getState())) return;