# HG changeset patch
# User Andrew Krasny <akrasny@netbeans.org>
# Date 1277744586 -14400
# Node ID 9d4860f6ba24512887227b9ad13e95814fcc07d6
# Parent  33c82be64182ce79bd6ab6bcd7b0d4a43f2d3b04
Bug 188086 - Progress bar indicating process is started is not always removed on process termination [6.9.1 fix]

diff -r 33c82be64182 -r 9d4860f6ba24 cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/DefaultProjectActionHandler.java
--- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/DefaultProjectActionHandler.java	Mon Jun 28 16:25:59 2010 +0200
+++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/DefaultProjectActionHandler.java	Mon Jun 28 21:03:06 2010 +0400
@@ -459,10 +459,10 @@
                             StringBuilder res = new StringBuilder();
                             res.append(MessageFormat.format(getString("TERMINATED"), actionName.toUpperCase())); // NOI18N
                             res.append(" ("); // NOI18N
-                            if (process.exitValue() != 0) {
-                                res.append(MessageFormat.format(getString("EXIT_VALUE"), process.exitValue())); // NOI18N
-                                res.append(' ');
-                            }
+//                            if (process.exitValue() != 0) {
+//                                res.append(MessageFormat.format(getString("EXIT_VALUE"), process.exitValue())); // NOI18N
+//                                res.append(' ');
+//                            }
                             res.append(MessageFormat.format(getString("TOTAL_TIME"), formatTime(System.currentTimeMillis() - startTimeMillis))); // NOI18N
                             res.append(')');
 
@@ -471,7 +471,7 @@
                             closeIO();
 
                             if (listener != null) {
-                                listener.executionFinished(process.exitValue());
+                                listener.executionFinished(-1);
                             }
                             
                             StatusDisplayer.getDefault().setStatusText(MessageFormat.format(getString("MSG_TERMINATED"), actionName)); // NOI18N
diff -r 33c82be64182 -r 9d4860f6ba24 cnd.testrunner/src/org/netbeans/modules/cnd/testrunner/TestRunnerActionHandler.java
--- a/cnd.testrunner/src/org/netbeans/modules/cnd/testrunner/TestRunnerActionHandler.java	Mon Jun 28 16:25:59 2010 +0200
+++ b/cnd.testrunner/src/org/netbeans/modules/cnd/testrunner/TestRunnerActionHandler.java	Mon Jun 28 21:03:06 2010 +0400
@@ -441,10 +441,10 @@
                                 StringBuilder res = new StringBuilder();
                                 res.append(MessageFormat.format(getString("TERMINATED"), actionName.toUpperCase())); // NOI18N
                                 res.append(" ("); // NOI18N
-                                if (process.exitValue() != 0) {
-                                    res.append(MessageFormat.format(getString("EXIT_VALUE"), process.exitValue())); // NOI18N
-                                    res.append(' ');
-                                }
+//                                if (process.exitValue() != 0) {
+//                                    res.append(MessageFormat.format(getString("EXIT_VALUE"), process.exitValue())); // NOI18N
+//                                    res.append(' ');
+//                                }
                                 res.append(MessageFormat.format(getString("TOTAL_TIME"), formatTime(System.currentTimeMillis() - startTimeMillis))); // NOI18N
                                 res.append(')');
 
@@ -454,7 +454,7 @@
                             }
 
                             if (listener != null) {
-                                listener.executionFinished(process.exitValue());
+                                listener.executionFinished(-1);
                             }
 
                             StatusDisplayer.getDefault().setStatusText(MessageFormat.format("MSG_TERMINATED", actionName)); // NOI18N
diff -r 33c82be64182 -r 9d4860f6ba24 cnd/src/org/netbeans/modules/cnd/actions/AbstractExecutorRunAction.java
--- a/cnd/src/org/netbeans/modules/cnd/actions/AbstractExecutorRunAction.java	Mon Jun 28 16:25:59 2010 +0200
+++ b/cnd/src/org/netbeans/modules/cnd/actions/AbstractExecutorRunAction.java	Mon Jun 28 21:03:06 2010 +0400
@@ -598,7 +598,7 @@
                 {
                     closeOutputListener();
                     if (listener != null) {
-                        listener.executionFinished(process.exitValue());
+                        listener.executionFinished(-1);
                     }
                     shutdownSyncWorker();
                     postRunnable = new Runnable() {