Author: koen.aers(a)jboss.com Date: 2011-07-07 09:26:33 -0400 (Thu, 07 Jul 2011) New Revision: 32707 Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java Removed: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleView.java Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StartDelegate.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StopDelegate.java Log: move ConsoleView to org.jboss.tools.forge.ui.part Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-07-07 13:17:26 UTC (rev 32706) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-07-07 13:26:33 UTC (rev 32707) @@ -9,7 +9,7 @@ </category> <view category="org.jboss.tools.forge" - class="org.jboss.tools.forge.view.ConsoleView" + class="org.jboss.tools.forge.ui.part.ConsoleView" id="org.jboss.tools.forge.console" name="Forge Console" restorable="true"> Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StartDelegate.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StartDelegate.java 2011-07-07 13:17:26 UTC (rev 32706) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StartDelegate.java 2011-07-07 13:26:33 UTC (rev 32707) @@ -4,7 +4,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; -import org.jboss.tools.forge.view.ConsoleView; +import org.jboss.tools.forge.ui.part.ConsoleView; public class StartDelegate implements IViewActionDelegate { Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StopDelegate.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StopDelegate.java 2011-07-07 13:17:26 UTC (rev 32706) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StopDelegate.java 2011-07-07 13:26:33 UTC (rev 32707) @@ -4,7 +4,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; -import org.jboss.tools.forge.view.ConsoleView; +import org.jboss.tools.forge.ui.part.ConsoleView; public class StopDelegate implements IViewActionDelegate { Copied: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java (from rev 32694, trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleView.java) =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java 2011-07-07 13:26:33 UTC (rev 32707) @@ -0,0 +1,157 @@ +package org.jboss.tools.forge.ui.part; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.part.MessagePage; +import org.eclipse.ui.part.PageBook; +import org.eclipse.ui.part.PageSite; +import org.eclipse.ui.part.ViewPart; +import org.jboss.tools.forge.console.Console; +import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences; +import org.jboss.tools.forge.core.process.ForgeRuntime; +import org.jboss.tools.forge.view.ConsolePage; + +public class ConsoleView extends ViewPart implements PropertyChangeListener { + + public static ConsoleView INSTANCE; + + private PageBook pageBook = null; + private Control notRunning; + private Control starting; + private Control running; + private ConsolePage forgeIsRunningPage; + + private ForgeRuntime runtime; + + public ConsoleView() { + if (INSTANCE == null) { + INSTANCE = this; + } + } + + @Override + public void createPartControl(Composite parent) { + pageBook = new PageBook(parent, SWT.NONE); + createNotRunningPage(parent); + createStartingPage(parent); + showPage(notRunning); + } + + private void createNotRunningPage(Composite parent) { + MessagePage page = new MessagePage(); + page.createControl(pageBook); + page.init(new PageSite(getViewSite())); + page.setMessage("Forge is not running."); + notRunning = page.getControl(); + } + + private void createStartingPage(Composite parent) { + MessagePage page = new MessagePage(); + page.createControl(pageBook); + page.init(new PageSite(getViewSite())); + page.setMessage("Please wait while Forge is starting"); + starting = page.getControl(); + } + + @Override + public void setFocus() { + if (runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) { + forgeIsRunningPage.setFocus(); + } + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (ForgeRuntime.STATE_STARTING.equals(evt.getNewValue())) { + handleStateStarting(); + } else if (ForgeRuntime.STATE_RUNNING.equals(evt.getNewValue())) { + handleStateRunning(); + } else if (ForgeRuntime.STATE_NOT_RUNNING.equals(evt.getNewValue())) { + handleStateNotRunning(); + } + } + + private void handleStateStarting() { + showPage(starting); + createRunningPage(); + } + + private void handleStateRunning() { + showPage(running); + } + + private void handleStateNotRunning() { + if (runtime != null) { + runtime.removePropertyChangeListener(INSTANCE); + runtime = null; + } + showPage(notRunning); + } + + private void showPage(final Control control) { + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + pageBook.showPage(control); + } + }); + } + + private void createRunningPage() { + Control oldForgeIsRunning = running; + ConsolePage oldForgeIsRunningPage = forgeIsRunningPage; + forgeIsRunningPage = new ConsolePage(runtime.getProcess()); + forgeIsRunningPage.createControl(pageBook); + forgeIsRunningPage.init(new PageSite(getViewSite())); + running = forgeIsRunningPage.getControl(); + if (oldForgeIsRunningPage != null) { + Console oldConsole = oldForgeIsRunningPage.getConsole(); + if (oldConsole != null) { + DebugPlugin.getDefault().removeDebugEventListener(oldConsole); + oldConsole.dispose(); + } + oldForgeIsRunningPage.dispose(); + } + if (oldForgeIsRunning != null) { + oldForgeIsRunning.dispose(); + } + } + + public void dispose() { + if (runtime != null) { + runtime.stop(null); + runtime = null; + } + super.dispose(); + } + + public void startForge() { + if (runtime != null) return; + runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); + runtime.addPropertyChangeListener(INSTANCE); + final IProgressMonitor progressMonitor = getViewSite().getActionBars().getStatusLineManager().getProgressMonitor(); + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + runtime.start(progressMonitor); + if (progressMonitor.isCanceled()) { + handleStateNotRunning(); + } + } + }); + } + + public void stopForge() { + if (runtime == null) return; + final IProgressMonitor progressMonitor = getViewSite().getActionBars().getStatusLineManager().getProgressMonitor(); + runtime.stop(progressMonitor); + } + +} Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleView.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleView.java 2011-07-07 13:17:26 UTC (rev 32706) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleView.java 2011-07-07 13:26:33 UTC (rev 32707) @@ -1,156 +0,0 @@ -package org.jboss.tools.forge.view; - -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.part.MessagePage; -import org.eclipse.ui.part.PageBook; -import org.eclipse.ui.part.PageSite; -import org.eclipse.ui.part.ViewPart; -import org.jboss.tools.forge.console.Console; -import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences; -import org.jboss.tools.forge.core.process.ForgeRuntime; - -public class ConsoleView extends ViewPart implements PropertyChangeListener { - - public static ConsoleView INSTANCE; - - private PageBook pageBook = null; - private Control notRunning; - private Control starting; - private Control running; - private ConsolePage forgeIsRunningPage; - - private ForgeRuntime runtime; - - public ConsoleView() { - if (INSTANCE == null) { - INSTANCE = this; - } - } - - @Override - public void createPartControl(Composite parent) { - pageBook = new PageBook(parent, SWT.NONE); - createNotRunningPage(parent); - createStartingPage(parent); - showPage(notRunning); - } - - private void createNotRunningPage(Composite parent) { - MessagePage page = new MessagePage(); - page.createControl(pageBook); - page.init(new PageSite(getViewSite())); - page.setMessage("Forge is not running."); - notRunning = page.getControl(); - } - - private void createStartingPage(Composite parent) { - MessagePage page = new MessagePage(); - page.createControl(pageBook); - page.init(new PageSite(getViewSite())); - page.setMessage("Please wait while Forge is starting"); - starting = page.getControl(); - } - - @Override - public void setFocus() { - if (runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) { - forgeIsRunningPage.setFocus(); - } - } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (ForgeRuntime.STATE_STARTING.equals(evt.getNewValue())) { - handleStateStarting(); - } else if (ForgeRuntime.STATE_RUNNING.equals(evt.getNewValue())) { - handleStateRunning(); - } else if (ForgeRuntime.STATE_NOT_RUNNING.equals(evt.getNewValue())) { - handleStateNotRunning(); - } - } - - private void handleStateStarting() { - showPage(starting); - createRunningPage(); - } - - private void handleStateRunning() { - showPage(running); - } - - private void handleStateNotRunning() { - if (runtime != null) { - runtime.removePropertyChangeListener(INSTANCE); - runtime = null; - } - showPage(notRunning); - } - - private void showPage(final Control control) { - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - pageBook.showPage(control); - } - }); - } - - private void createRunningPage() { - Control oldForgeIsRunning = running; - ConsolePage oldForgeIsRunningPage = forgeIsRunningPage; - forgeIsRunningPage = new ConsolePage(runtime.getProcess()); - forgeIsRunningPage.createControl(pageBook); - forgeIsRunningPage.init(new PageSite(getViewSite())); - running = forgeIsRunningPage.getControl(); - if (oldForgeIsRunningPage != null) { - Console oldConsole = oldForgeIsRunningPage.getConsole(); - if (oldConsole != null) { - DebugPlugin.getDefault().removeDebugEventListener(oldConsole); - oldConsole.dispose(); - } - oldForgeIsRunningPage.dispose(); - } - if (oldForgeIsRunning != null) { - oldForgeIsRunning.dispose(); - } - } - - public void dispose() { - if (runtime != null) { - runtime.stop(null); - runtime = null; - } - super.dispose(); - } - - public void startForge() { - if (runtime != null) return; - runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); - runtime.addPropertyChangeListener(INSTANCE); - final IProgressMonitor progressMonitor = getViewSite().getActionBars().getStatusLineManager().getProgressMonitor(); - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - runtime.start(progressMonitor); - if (progressMonitor.isCanceled()) { - handleStateNotRunning(); - } - } - }); - } - - public void stopForge() { - if (runtime == null) return; - final IProgressMonitor progressMonitor = getViewSite().getActionBars().getStatusLineManager().getProgressMonitor(); - runtime.stop(progressMonitor); - } - -}