1.1 --- a/vcscore/src/org/netbeans/modules/vcscore/cmdline/ExecuteCommand.java	Wed Mar 23 15:48:52 2005 +0000
     1.2 +++ b/vcscore/src/org/netbeans/modules/vcscore/cmdline/ExecuteCommand.java	Wed Mar 23 20:02:43 2005 +0000
     1.3 @@ -822,14 +822,18 @@
     1.4      }
     1.5  
     1.6      protected void printDataErrorOutput(String[] data) {
     1.7 -        for (Iterator it = regexErrorListeners.iterator(); it.hasNext(); ) {
     1.8 -            ((RegexOutputListener) it.next()).outputMatchedGroups(data);
     1.9 -        }
    1.10 -        for (Iterator it = dataErrorListeners.iterator(); it.hasNext(); ) {
    1.11 -            ((CommandDataOutputListener) it.next()).outputData(data);
    1.12 -        }
    1.13 -        if (getFileRefreshFromErrOut) {
    1.14 -            collectRefreshInfo(data);
    1.15 +        if (mergeOutputStreams) {
    1.16 +            printDataOutput(data);
    1.17 +        } else {
    1.18 +            for (Iterator it = regexErrorListeners.iterator(); it.hasNext(); ) {
    1.19 +                ((RegexOutputListener) it.next()).outputMatchedGroups(data);
    1.20 +            }
    1.21 +            for (Iterator it = dataErrorListeners.iterator(); it.hasNext(); ) {
    1.22 +                ((CommandDataOutputListener) it.next()).outputData(data);
    1.23 +            }
    1.24 +            if (getFileRefreshFromErrOut) {
    1.25 +                collectRefreshInfo(data);
    1.26 +            }
    1.27          }
    1.28      }
    1.29