Attachment #109883 for bug #196200

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 196200
Collapse All | Expand All




<!-- ACTUAL CHANGES BEGIN HERE: -->

  <changes>
      
    <change id="stop-dialoge-closing">
        <api name="winsys"/>
        <summary>Added default closing option to do nothing when no option is passed.</summary>
        <version major="2" minor="28"/>
        <date day="4" month="8" year="2011"/>
        <author login="dbeer"/>
        <compatibility addition="yes" deprecation="no" deletion="no"/>
        <description>
            When younow pass no clossing options when you setClosingOptions(new Object[]{}); the dialogue will not close via the ESC key.    
        </description>
        <issue number="196200"/>
    </change>
    
    <change id="reload-save-actions" >
        <api name="winsys"/>
        <summary>Actions to load or save state of windowsystem</summary>

Lines 6-10 Link Here

(-)a/core.windows/manifest.mf (-1 / +1 lines)
6	OpenIDE-Module-Recommends: org.netbeans.core.windows.nativeaccess.NativeWindowSystem	6	OpenIDE-Module-Recommends: org.netbeans.core.windows.nativeaccess.NativeWindowSystem
7	AutoUpdate-Show-In-Client: false	7	AutoUpdate-Show-In-Client: false
8	AutoUpdate-Essential-Module: true	8	AutoUpdate-Essential-Module: true
9	OpenIDE-Module-Specification-Version: 2.27	9	OpenIDE-Module-Specification-Version: 2.28
10		10

Lines 581-586 Link Here

(-)a/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java (-1 / +9 lines)
581	Object[] options = getClosingOptions ();	581	Object[] options = getClosingOptions ();
582		582
583	if (options == null) return ;	583	if (options == null) return ;
		584	if (options.length == 0) {
		585	setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
		586	}
584	for (int i = 0; i < options.length; i++) {	587	for (int i = 0; i < options.length; i++) {
585	modifyListener (options[i], buttonListener, init);	588	modifyListener (options[i], buttonListener, init);
586	}	589	}
Lines 1256-1262 Link Here
1256	MenuElement[] selPath = MenuSelectionManager.defaultManager().getSelectedPath();	1259	MenuElement[] selPath = MenuSelectionManager.defaultManager().getSelectedPath();
1257	// part of #130919 fix - handle ESC key well in dialogs with menus	1260	// part of #130919 fix - handle ESC key well in dialogs with menus
1258	if (selPath == null \|\| selPath.length == 0) {	1261	if (selPath == null \|\| selPath.length == 0) {
1259	pressedOption = NotifyDescriptor.CLOSED_OPTION;	1262	//check if closingOptions is != null && 0
		1263	if (getClosingOptions() != null && getClosingOptions().length == 0) {
		1264	pressedOption = WindowConstants.DO_NOTHING_ON_CLOSE;
		1265	} else {
		1266	pressedOption = NotifyDescriptor.CLOSED_OPTION;
		1267	}
1260	} else {	1268	} else {
1261	MenuSelectionManager.defaultManager().clearSelectedPath();	1269	MenuSelectionManager.defaultManager().clearSelectedPath();
1262	return ;	1270	return ;

Return to bug 196200

Lines 107-113 Link Here

(-)a/core.windows/apichanges.xml (-1 / +14 lines)
107	<!-- ACTUAL CHANGES BEGIN HERE: -->	107	<!-- ACTUAL CHANGES BEGIN HERE: -->
108		108
109	<changes>	109	<changes>
110		110
		111	<change id="stop-dialoge-closing">
		112	<api name="winsys"/>
		113	<summary>Added default closing option to do nothing when no option is passed.</summary>
		114	<version major="2" minor="28"/>
		115	<date day="4" month="8" year="2011"/>
		116	<author login="dbeer"/>
		117	<compatibility addition="yes" deprecation="no" deletion="no"/>
		118	<description>
		119	When younow pass no clossing options when you setClosingOptions(new Object[]{}); the dialogue will not close via the ESC key.
		120	</description>
		121	<issue number="196200"/>
		122	</change>
		123
111	<change id="reload-save-actions" >	124	<change id="reload-save-actions" >
112	<api name="winsys"/>	125	<api name="winsys"/>
113	<summary>Actions to load or save state of windowsystem</summary>	126	<summary>Actions to load or save state of windowsystem</summary>