? monitor/.nbintdb
Index: monitor/src/org/netbeans/modules/web/monitor/client/Bundle.properties
===================================================================
RCS file: /cvs/monitor/src/org/netbeans/modules/web/monitor/client/Bundle.properties,v
retrieving revision 1.11
diff -u -r1.11 Bundle.properties
--- monitor/src/org/netbeans/modules/web/monitor/client/Bundle.properties	17 Mar 2003 15:40:55 -0000	1.11
+++ monitor/src/org/netbeans/modules/web/monitor/client/Bundle.properties	24 Oct 2003 12:39:59 -0000
@@ -25,7 +25,7 @@
 MON_Delete_current_10=Delete current records
 MON_Delete_saved_11=Delete saved records
 MON_Display_12=Display
-MON_HTTP_Transaction_13=HTTP &Monitor
+MON_HTTP_Transaction_13=&HTTP Monitor
 MON_OK=OK
 MON_OK_Mnemonic=O
 MON_Order_transactions_14=Sort records alphabetically
Index: monitor/src/org/netbeans/modules/web/monitor/client/MonitorAction.java
===================================================================
RCS file: /cvs/monitor/src/org/netbeans/modules/web/monitor/client/MonitorAction.java,v
retrieving revision 1.6
diff -u -r1.6 MonitorAction.java
--- monitor/src/org/netbeans/modules/web/monitor/client/MonitorAction.java	27 Feb 2003 23:39:42 -0000	1.6
+++ monitor/src/org/netbeans/modules/web/monitor/client/MonitorAction.java	24 Oct 2003 12:39:59 -0000
@@ -26,7 +26,9 @@
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
+import org.openide.windows.Mode;
 import org.openide.windows.Workspace;
+import org.openide.windows.WindowManager;
 
 
 public class MonitorAction extends CallableSystemAction {
@@ -74,7 +76,7 @@
 		log("Transaction view was created by: " + //NOI18N
 				   "performAction"); //NOI18N
 	} 
-	tv.open(); 
+        openTransactionView(tv);
     }
     
 
@@ -86,7 +88,7 @@
 	if(debug) log("runMonitor()"); //NOI18N
 	if (tv == null) 
 	    tv = new TransactionView(getController());
-	tv.open(); 
+	openTransactionView(tv);
     }  
 
     /**
@@ -98,8 +100,22 @@
 		      workspace.toString());
 	if (tv == null) 
 	    tv = new TransactionView(getController());
-	tv.open(workspace); 
+	openTransactionView(tv);
     }  
+    
+    private static void openTransactionView(TransactionView tv) {
+        WindowManager wm = WindowManager.getDefault();
+        Mode mode = wm.findMode(tv);
+        
+        if(mode == null) {
+            mode = wm.findMode("debugger"); // NOI18N
+            if(mode != null) {
+                mode.dockInto(tv);
+            }
+        }
+        
+        tv.open();
+    }
 
     /**
      * This method is used by the executor to set the hostname and the
Index: monitor/src/org/netbeans/modules/web/monitor/resources/layer.xml
===================================================================
RCS file: /cvs/monitor/src/org/netbeans/modules/web/monitor/resources/layer.xml,v
retrieving revision 1.8
diff -u -r1.8 layer.xml
--- monitor/src/org/netbeans/modules/web/monitor/resources/layer.xml	13 Mar 2003 22:37:54 -0000	1.8
+++ monitor/src/org/netbeans/modules/web/monitor/resources/layer.xml	24 Oct 2003 12:39:59 -0000
@@ -23,11 +23,17 @@
        <file name="org-netbeans-modules-web-monitor-client-MonitorAction.instance"/>
     </folder>
 
-    <folder name="View">
+    <!--<folder name="View">
         <attr name="org-netbeans-modules-form-actions-FormEditorAction.instance/org-netbeans-modules-web-monitor-client-MonitorAction.instance" boolvalue="true" />
        <file name="org-netbeans-modules-web-monitor-client-MonitorAction.instance"/>
        <attr name="org-netbeans-modules-web-monitor-client-MonitorAction.instance/Separator2.instance" boolvalue="true" />
-   </folder>
+   </folder>-->
+    <folder name="Window">
+        <attr name="org-netbeans-core-output-OutputWindowAction.instance/org-netbeans-modules-web-monitor-client-MonitorAction.instance" boolvalue="true" />
+        <file name="org-netbeans-modules-web-monitor-client-MonitorAction.instance"/>
+        <attr name="org-netbeans-modules-web-monitor-client-MonitorAction.instance/Form" boolvalue="true" />
+    </folder>
+
 
    <folder name="Help">
       <folder name="HelpShortcuts">
@@ -61,6 +67,13 @@
     </folder>
   </folder>
 
+    <folder name="Shortcuts">
+        <file name="C-7.instance">
+            <attr name="instanceClass" stringvalue="org.netbeans.modules.web.monitor.client.MonitorAction" />
+        </file>
+    </folder>
+
+  
   <folder name="Services">
     
     <folder name="JavaHelp">