[jbosstools-commits] JBoss Tools SVN: r42673 - branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process.

[jbosstools-commits at lists.jboss.org]

Author: koen.aers at jboss.com
Date: 2012-07-23 08:18:23 -0400 (Mon, 23 Jul 2012)
New Revision: 42673

Modified:
   branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java
Log:
JBIDE-11217: present verbose mode functionality in Forge JBT/JBDS Tooling

Modified: branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java
===================================================================
--- branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java	2012-07-23 11:57:37 UTC (rev 42672)
+++ branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java	2012-07-23 12:18:23 UTC (rev 42673)
@@ -25,7 +25,7 @@
 	private IProcess process = null;
 	private String state = STATE_NOT_RUNNING;	
 	private final TerminateListener terminateListener = new TerminateListener();	
-	private MasterOutputListener masterOutputListener = new MasterOutputListener();
+	private MasterStreamListener masterStreamListener = new MasterStreamListener();
 	private CommandResultListener commandResultListener = new CommandResultListener();
 	private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
 	private List<ForgeOutputListener> outputListeners = new ArrayList<ForgeOutputListener>();
@@ -56,8 +56,12 @@
 					IStreamMonitor streamMonitor = streamsProxy.getOutputStreamMonitor();
 					if (streamMonitor != null) {
 						streamMonitor.addListener(startupListener);
-						streamMonitor.addListener(masterOutputListener);
+						streamMonitor.addListener(masterStreamListener);
 					}
+					IStreamMonitor errorStreamMonitor = streamsProxy.getErrorStreamMonitor();
+					if (errorStreamMonitor != null) {
+						errorStreamMonitor.addListener(masterStreamListener);
+					}
 				}
 			}
 			progressMonitor.worked(1);
@@ -96,7 +100,7 @@
 				IStreamMonitor streamMonitor = streamsProxy.getOutputStreamMonitor();
 				if (streamMonitor != null) {
 					commandResultListener.command = str + '\n';
-					streamMonitor.removeListener(masterOutputListener);
+					streamMonitor.removeListener(masterStreamListener);
 					streamMonitor.addListener(commandResultListener);
 					try {
 						streamsProxy.write(new Character((char)31).toString() + str + '\n');
@@ -113,7 +117,7 @@
 					commandResultListener.result = null;
 					commandResultListener.command = null;
 					streamMonitor.removeListener(commandResultListener);
-					streamMonitor.addListener(masterOutputListener);
+					streamMonitor.addListener(masterStreamListener);
 				}
 			}
 		}
@@ -152,8 +156,12 @@
 				if (streamsProxy != null) {
 					IStreamMonitor streamMonitor = streamsProxy.getOutputStreamMonitor();
 					if (streamMonitor != null) {
-						streamMonitor.removeListener(masterOutputListener);
+						streamMonitor.removeListener(masterStreamListener);
 					}
+					IStreamMonitor errorStreamMonitor = streamsProxy.getErrorStreamMonitor();
+					if (errorStreamMonitor != null) {
+						errorStreamMonitor.removeListener(masterStreamListener);
+					}
 				}
 				process.terminate();
 				ForgeCorePlugin.removeForgeProcess(process);
@@ -193,7 +201,7 @@
 		}		
 	}
 	
-	private class MasterOutputListener implements IStreamListener {
+	private class MasterStreamListener implements IStreamListener {
 		@Override
 		public void streamAppended(String text, IStreamMonitor monitor) {
 			for (ForgeOutputListener listener : outputListeners) {