use a label for ForgeConsole and display it in the status line

jbosstools · Feb 6, 2014 · 98c7050 · 98c7050
1 parent e6c36d3
commit 98c7050
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/...g.jboss.tools.forge.ui.ext/src/org/jboss/tools/forge/ui/ext/console/ForgeConsoleImpl.java b/...g.jboss.tools.forge.ui.ext/src/org/jboss/tools/forge/ui/ext/console/ForgeConsoleImpl.java
@@ -11,6 +11,12 @@
 import org.jboss.tools.forge.ui.ext.actions.StopF2Action;
 
 public class ForgeConsoleImpl implements ForgeConsole {
+
+	private String label = null;
+
+	public ForgeConsoleImpl() {
+		label = "Forge " + getRuntime().getVersion() + " - " + getRuntime().getType();		
+	}
 
 	@Override
 	public Control createControl(Composite parent) {
@@ -30,4 +36,9 @@ public ForgeRuntime getRuntime() {
 		return FurnaceRuntime.INSTANCE;
 	}
 
+	@Override
+	public String getLabel() {
+		return label;
+	}
+
 }
diff --git a/...org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/actions/ForgeConsoleShowAction.java b/...org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/actions/ForgeConsoleShowAction.java
@@ -4,7 +4,6 @@
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.jboss.tools.forge.core.process.ForgeRuntime;
 import org.jboss.tools.forge.ui.ForgeUIPlugin;
 import org.jboss.tools.forge.ui.console.ForgeConsole;
 import org.jboss.tools.forge.ui.part.ForgeConsoleView;
@@ -15,21 +14,12 @@ public class ForgeConsoleShowAction extends Action {
 	private ForgeConsole forgeConsole = null;
 
 	public ForgeConsoleShowAction(ForgeConsoleView forgeConsoleView, ForgeConsole forgeConsole) {
-		super(createLabel(forgeConsole), AS_RADIO_BUTTON);
+		super(forgeConsole.getLabel(), AS_RADIO_BUTTON);
 		this.forgeConsoleView = forgeConsoleView;
 		this.forgeConsole = forgeConsole;
 		setImageDescriptor(createImageDescriptor());
 	}
 
-	private static String createLabel(ForgeConsole forgeConsole) {
-		String result = "Unnamed Forge Runtime";
-		ForgeRuntime runtime = forgeConsole.getRuntime();
-		if (runtime != null) {
-			result = runtime.getName();
-		}
-		return result;
-	}
-
 	@Override
 	public void run() {
 		forgeConsoleView.showForgeConsole(forgeConsole);

diff --git a/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeConsole.java b/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeConsole.java
@@ -7,6 +7,7 @@
 
 public interface ForgeConsole {
 
+	String getLabel();
 	Control createControl(Composite parent);
 	IAction[] createActions();
 	ForgeRuntime getRuntime();

diff --git a/...ns/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/f1/ForgeConsoleImpl.java b/...ns/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/f1/ForgeConsoleImpl.java
@@ -21,9 +21,11 @@ public class ForgeConsoleImpl implements ForgeConsole, PropertyChangeListener {
 
 	private ForgeTextViewer forgeTextViewer = null;
 	private ForgeRuntime forgeRuntime = ForgeRuntimesPreferences.INSTANCE.getDefaultRuntime();
-
+	private String label = null;
+
 	public ForgeConsoleImpl() {
 		getRuntime().addPropertyChangeListener(this);
+		label = "Forge " + getRuntime().getVersion() + " - " + getRuntime().getType();
 	}
 
 	@Override
@@ -66,4 +68,9 @@ public void run() {
 		});
 	}
 
+	@Override
+	public String getLabel() {
+		return label;
+	}
+
 }
diff --git a/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeConsolePage.java b/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeConsolePage.java
@@ -23,7 +23,6 @@ public class ForgeConsolePage implements IPage, PropertyChangeListener {
 	private Control control = null;
 	private IPageSite pageSite = null;
 	private SubActionBars actionBars = null;
-	private String baseStatusMessage = null;
 
 	public ForgeConsolePage(ForgeConsolePageBook forgeConsolePageBook, ForgeConsole forgeConsole) {
 		this.forgeConsolePageBook = forgeConsolePageBook;
@@ -95,16 +94,8 @@ void show() {
 		forgeConsolePageBook.updateStatusMessage(getStatusMessage());
 	}
 
-	private void initBaseStatusMessage() {
-		ForgeRuntime runtime = forgeConsole.getRuntime();
-		baseStatusMessage = "Forge " + runtime.getVersion() + " - " + runtime.getType();
-	}
-
 	String getStatusMessage() {
-		if (baseStatusMessage == null) {
-			initBaseStatusMessage();
-		}
-		return baseStatusMessage;
+		return forgeConsole.getLabel();
 	}
 
 	private void updateActionBars() {