Index: ui/AbstractOutputTab.java
===================================================================
RCS file: /cvs/core/output2/src/org/netbeans/core/output2/ui/AbstractOutputTab.java,v
retrieving revision 1.3
diff -w -b -u -r1.3 AbstractOutputTab.java
--- ui/AbstractOutputTab.java	25 Aug 2004 00:07:22 -0000	1.3
+++ ui/AbstractOutputTab.java	11 Jan 2005 12:48:23 -0000
@@ -91,7 +91,10 @@
         actions = new Action[a.length];
         JButton[] jb = new JButton[a.length];
         for (int i=0; i < jb.length; i++) {
-            actions[i] = new WeakAction(a[i]);
+            actions[i] = a[i];
+            // mkleint - ignore the WeakAction referencing as it introduces
+            // additional non obvious contract to using the the toolbar actions.
+//            actions[i] = new WeakAction(a[i]);
             installKeyboardAction (a[i]);
             jb[i] = new JButton(actions[i]);
             jb[i].setBorderPainted(false);
Index: NbIOProvider.java
===================================================================
RCS file: /cvs/core/output2/src/org/netbeans/core/output2/NbIOProvider.java,v
retrieving revision 1.6
diff -w -b -u -r1.6 NbIOProvider.java
--- NbIOProvider.java	24 Aug 2004 13:29:09 -0000	1.6
+++ NbIOProvider.java	11 Jan 2005 12:48:23 -0000
@@ -57,11 +57,14 @@
     
     
     public InputOutput getIO(String name, boolean newIO) {
-        return getIO (name, newIO, null);
+        return getIO (name, newIO, new Action[0]);
     }
     
+    public InputOutput getIO(String name, Action[] toolbarActions) {
+        return getIO (name, true, toolbarActions);
+    }
     
-    public InputOutput getIO(String name, boolean newIO, Action[] toolbarActions) {
+    private InputOutput getIO(String name, boolean newIO, Action[] toolbarActions) {
         if (Controller.log) {
             Controller.log("GETIO: " + name + " new:" + newIO);
         }
@@ -71,6 +74,9 @@
             result = new NbIO(name, toolbarActions);
             namesToIos.add (name, result);
             Controller.ensureViewInDefault (result, newIO);
+        } else {
+            // mkleint ignore actions if reuse of tabs.
+//            result.setToolbarActions(toolbarActions);
         }
         return result;
     }
Index: NbIO.java
===================================================================
RCS file: /cvs/core/output2/src/org/netbeans/core/output2/NbIO.java,v
retrieving revision 1.7
diff -w -b -u -r1.7 NbIO.java
--- NbIO.java	22 Sep 2004 22:22:59 -0000	1.7
+++ NbIO.java	11 Jan 2005 12:48:23 -0000
@@ -19,6 +19,7 @@
 package org.netbeans.core.output2;
 
 import org.openide.ErrorManager;
+import org.openide.windows.InputOutput;
 import org.openide.windows.OutputWriter;
 
 import javax.swing.*;
@@ -34,7 +35,7 @@
  *
  * @author  Tim Boudreau
  */
-class NbIO implements CallbackInputOutput {
+class NbIO implements InputOutput {
 
     private Boolean focusTaken = null;
     private Boolean closed = null;