Attachment #11959 for bug #36119

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 36119
Collapse All | Expand All

Lines 25-31 Link Here

(-)monitor/src/org/netbeans/modules/web/monitor/client/Bundle.properties (-1 / +1 lines)
25	MON_Delete_current_10=Delete current records	25	MON_Delete_current_10=Delete current records
26	MON_Delete_saved_11=Delete saved records	26	MON_Delete_saved_11=Delete saved records
27	MON_Display_12=Display	27	MON_Display_12=Display
28	MON_HTTP_Transaction_13=HTTP &Monitor	28	MON_HTTP_Transaction_13=&HTTP Monitor
29	MON_OK=OK	29	MON_OK=OK
30	MON_OK_Mnemonic=O	30	MON_OK_Mnemonic=O
31	MON_Order_transactions_14=Sort records alphabetically	31	MON_Order_transactions_14=Sort records alphabetically




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 {

		log("Transaction view was created by: " + //NOI18N
				   "performAction"); //NOI18N
	} 
        openTransactionView(tv);
    }
    


	if(debug) log("runMonitor()"); //NOI18N
	if (tv == null) 
	    tv = new TransactionView(getController());
	openTransactionView(tv);
    }  

    /**

		      workspace.toString());
	if (tv == null) 
	    tv = new TransactionView(getController());
	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

Lines 23-33 Link Here

(-)monitor/src/org/netbeans/modules/web/monitor/resources/layer.xml (-2 / +15 lines)
23	<file name="org-netbeans-modules-web-monitor-client-MonitorAction.instance"/>	23	<file name="org-netbeans-modules-web-monitor-client-MonitorAction.instance"/>
24	</folder>	24	</folder>
25		25
26	<folder name="View">	26	<!--<folder name="View">
27	<attr name="org-netbeans-modules-form-actions-FormEditorAction.instance/org-netbeans-modules-web-monitor-client-MonitorAction.instance" boolvalue="true" />	27	<attr name="org-netbeans-modules-form-actions-FormEditorAction.instance/org-netbeans-modules-web-monitor-client-MonitorAction.instance" boolvalue="true" />
28	<file name="org-netbeans-modules-web-monitor-client-MonitorAction.instance"/>	28	<file name="org-netbeans-modules-web-monitor-client-MonitorAction.instance"/>
29	<attr name="org-netbeans-modules-web-monitor-client-MonitorAction.instance/Separator2.instance" boolvalue="true" />	29	<attr name="org-netbeans-modules-web-monitor-client-MonitorAction.instance/Separator2.instance" boolvalue="true" />
30	</folder>	30	</folder>-->
		31	<folder name="Window">
		32	<attr name="org-netbeans-core-output-OutputWindowAction.instance/org-netbeans-modules-web-monitor-client-MonitorAction.instance" boolvalue="true" />
		33	<file name="org-netbeans-modules-web-monitor-client-MonitorAction.instance"/>
		34	<attr name="org-netbeans-modules-web-monitor-client-MonitorAction.instance/Form" boolvalue="true" />
		35	</folder>
		36
31		37
32	<folder name="Help">	38	<folder name="Help">
33	<folder name="HelpShortcuts">	39	<folder name="HelpShortcuts">
Lines 61-66 Link Here
61	</folder>	67	</folder>
62	</folder>	68	</folder>
63		69
		70	<folder name="Shortcuts">
		71	<file name="C-7.instance">
		72	<attr name="instanceClass" stringvalue="org.netbeans.modules.web.monitor.client.MonitorAction" />
		73	</file>
		74	</folder>
		75
		76
64	<folder name="Services">	77	<folder name="Services">
65		78
66	<folder name="JavaHelp">	79	<folder name="JavaHelp">

Return to bug 36119

Lines 26-32 Link Here

(-)monitor/src/org/netbeans/modules/web/monitor/client/MonitorAction.java (-3 / +19 lines)
26	import org.openide.util.actions.CallableSystemAction;	26	import org.openide.util.actions.CallableSystemAction;
27	import org.openide.util.HelpCtx;	27	import org.openide.util.HelpCtx;
28	import org.openide.util.NbBundle;	28	import org.openide.util.NbBundle;
		29	import org.openide.windows.Mode;
29	import org.openide.windows.Workspace;	30	import org.openide.windows.Workspace;
		31	import org.openide.windows.WindowManager;
30		32
31		33
32	public class MonitorAction extends CallableSystemAction {	34	public class MonitorAction extends CallableSystemAction {
Lines 74-80 Link Here
74	log("Transaction view was created by: " + //NOI18N	76	log("Transaction view was created by: " + //NOI18N
75	"performAction"); //NOI18N	77	"performAction"); //NOI18N
76	}	78	}
77	tv.open();	79	openTransactionView(tv);
78	}	80	}
79		81
80		82
Lines 86-92 Link Here
86	if(debug) log("runMonitor()"); //NOI18N	88	if(debug) log("runMonitor()"); //NOI18N
87	if (tv == null)	89	if (tv == null)
88	tv = new TransactionView(getController());	90	tv = new TransactionView(getController());
89	tv.open();	91	openTransactionView(tv);
90	}	92	}
91		93
92	/**	94	/**
Lines 98-105 Link Here
98	workspace.toString());	100	workspace.toString());
99	if (tv == null)	101	if (tv == null)
100	tv = new TransactionView(getController());	102	tv = new TransactionView(getController());
101	tv.open(workspace);	103	openTransactionView(tv);
102	}	104	}
		105
		106	private static void openTransactionView(TransactionView tv) {
		107	WindowManager wm = WindowManager.getDefault();
		108	Mode mode = wm.findMode(tv);
		109
		110	if(mode == null) {
		111	mode = wm.findMode("debugger"); // NOI18N
		112	if(mode != null) {
		113	mode.dockInto(tv);
		114	}
		115	}
		116
		117	tv.open();
		118	}
103		119
104	/**	120	/**
105	* This method is used by the executor to set the hostname and the	121	* This method is used by the executor to set the hostname and the