JBIDE-17897: Fixed update of part's controls

jbosstools · Jul 23, 2014 · 9f9275a · 9f9275a
1 parent c8ad417
commit 9f9275a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/...ins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/furnace/FurnaceRuntime.java b/...ins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/furnace/FurnaceRuntime.java
@@ -50,14 +50,7 @@ public ForgeRuntimeType getType() {
 
 	@Override
 	public ForgeRuntimeState getState() {
-		if (FurnaceService.INSTANCE.getContainerStatus().isStarted()) {
-			return ForgeRuntimeState.RUNNING;
-		} else if (FurnaceService.INSTANCE.getContainerStatus().isStarting()) {
-			return ForgeRuntimeState.STARTING;
-		} else if (FurnaceService.INSTANCE.getContainerStatus().isStopped()) {
-			return ForgeRuntimeState.STOPPED;
-		}
-		return null;
+		return state;
 	}
 
 	@Override

diff --git a/...ins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/furnace/FurnaceService.java b/...ins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/furnace/FurnaceService.java
@@ -50,8 +50,10 @@ public List<AddonRepository> getRepositories() {
 	}
 
 	public void stop() {
-		furnace.stop();
-		furnace = null;
+		if (furnace != null) {
+			furnace.stop();
+			furnace = null;
+		}
 	}
 
 	public void waitUntilContainerIsStarted() throws InterruptedException {

diff --git a/...org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/internal/part/ForgeConsolePage.java b/...org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/internal/part/ForgeConsolePage.java
@@ -107,7 +107,7 @@ private void updateActionBars() {
 			public void run() {
 				// without calls to deactivate and activate the actionBars
 				// do not update properly
-				actionBars.deactivate();;
+				actionBars.deactivate();
 				actionBars.updateActionBars();
 				actionBars.activate();
 				actionBars.updateActionBars();