Attachment #153417 for bug #94153

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 11-13 Link Here

(-)fragment-carbon.properties (+3 lines)
11		11
12	providerName=Eclipse.org	12	providerName=Eclipse.org
13	fragmentName=Eclipse UI MacOS X Enhancements	13	fragmentName=Eclipse UI MacOS X Enhancements
		14
		15	command.closeDialog.name=Close Dialog
		16	command.closeDialog.desc=Closes the active Dialog




            class="org.eclipse.ui.internal.carbon.CarbonUIEnhancer">
      </startup>
   </extension>

   <extension
         point="org.eclipse.ui.commands">
      <command
            categoryId="org.eclipse.ui.category.dialogs"
            description="%command.closeDialog.desc"
            id="org.eclipse.ui.carbon.closeDialog"
            name="%command.closeDialog.name">
      </command>
   </extension>
   <extension
         point="org.eclipse.ui.handlers">
      <handler
            class="org.eclipse.ui.internal.carbon.CloseDialogHandler"
            commandId="org.eclipse.ui.carbon.closeDialog">
      </handler>
   </extension>
   <extension
         point="org.eclipse.ui.bindings">
      <key
            commandId="org.eclipse.ui.carbon.closeDialog"
            contextId="org.eclipse.ui.contexts.dialog"
            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
            sequence="M1+W">
      </key>
   </extension>
   
</fragment>




/*******************************************************************************
 * Copyright (c) 2009 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.ui.internal.carbon;

import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.IHandler;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;

/**
 * 
 * @author Prakash G.R. (grprakash@gmail.com)
 * @since 3.6 
 *
 */
public class CloseDialogHandler extends AbstractHandler implements IHandler {

	public Object execute(ExecutionEvent event) {
		
		Shell activeShell = Display.getDefault().getActiveShell();
		// perform only if close is enabled
		if((activeShell.getStyle() & SWT.CLOSE) != 0) {
			activeShell.close();
		}
		
		return null;
	}

}

Lines 12-14 Link Here

(-)fragment-cocoa.properties (+3 lines)
12		12
13	providerName=Eclipse.org	13	providerName=Eclipse.org
14	fragmentName=Eclipse UI MacOS X Enhancements	14	fragmentName=Eclipse UI MacOS X Enhancements
		15
		16	command.closeDialog.name=Close Dialog
		17	command.closeDialog.desc=Closes the active Dialog




            class="org.eclipse.ui.internal.cocoa.CocoaUIEnhancer">
      </startup>
   </extension>
   <extension
         point="org.eclipse.ui.commands">
      <command
            categoryId="org.eclipse.ui.category.dialogs"
            description="%command.closeDialog.desc"
            id="org.eclipse.ui.cocoa.closeDialog"
            name="%command.closeDialog.name">
      </command>
   </extension>
   <extension
         point="org.eclipse.ui.handlers">
      <handler
            class="org.eclipse.ui.internal.cocoa.CloseDialogHandler"
            commandId="org.eclipse.ui.cocoa.closeDialog">
      </handler>
   </extension>
   <extension
         point="org.eclipse.ui.bindings">
      <key
            commandId="org.eclipse.ui.cocoa.closeDialog"
            contextId="org.eclipse.ui.contexts.dialog"
            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
            sequence="M1+W">
      </key>
   </extension>
   
</fragment>




/*******************************************************************************
 * Copyright (c) 2009 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.ui.internal.cocoa;

import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IHandler;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;

/**
 * 
 * @author Prakash G.R. (grprakash@gmail.com)
 * @since 3.6 
 *
 */
public class CloseDialogHandler extends AbstractHandler implements IHandler {

	public Object execute(ExecutionEvent event) throws ExecutionException {
		
		Shell activeShell = Display.getDefault().getActiveShell();
		// perform only if close is enabled
		if((activeShell.getStyle() & SWT.CLOSE) != 0) {
			activeShell.close();
		}
		
		activeShell.close();
		return null;
	}

}

Return to bug 94153

Lines 8-12 Link Here

(-)fragment.xml (+26 lines)
8	class="org.eclipse.ui.internal.carbon.CarbonUIEnhancer">	8	class="org.eclipse.ui.internal.carbon.CarbonUIEnhancer">
9	</startup>	9	</startup>
10	</extension>	10	</extension>
		11
		12	<extension
		13	point="org.eclipse.ui.commands">
		14	<command
		15	categoryId="org.eclipse.ui.category.dialogs"
		16	description="%command.closeDialog.desc"
		17	id="org.eclipse.ui.carbon.closeDialog"
		18	name="%command.closeDialog.name">
		19	</command>
		20	</extension>
		21	<extension
		22	point="org.eclipse.ui.handlers">
		23	<handler
		24	class="org.eclipse.ui.internal.carbon.CloseDialogHandler"
		25	commandId="org.eclipse.ui.carbon.closeDialog">
		26	</handler>
		27	</extension>
		28	<extension
		29	point="org.eclipse.ui.bindings">
		30	<key
		31	commandId="org.eclipse.ui.carbon.closeDialog"
		32	contextId="org.eclipse.ui.contexts.dialog"
		33	schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
		34	sequence="M1+W">
		35	</key>
		36	</extension>
11		37
12	</fragment>	38	</fragment>

Added Link Here

(-)src/org/eclipse/ui/internal/carbon/CloseDialogHandler.java (+39 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.ui.internal.carbon;
12
13	import org.eclipse.core.commands.AbstractHandler;
14	import org.eclipse.core.commands.ExecutionEvent;
15	import org.eclipse.core.commands.IHandler;
16	import org.eclipse.swt.SWT;
17	import org.eclipse.swt.widgets.Display;
18	import org.eclipse.swt.widgets.Shell;
19
20	/**
21	*
22	* @author Prakash G.R. (grprakash@gmail.com)
23	* @since 3.6
24	*
25	*/
26	public class CloseDialogHandler extends AbstractHandler implements IHandler {
27
28	public Object execute(ExecutionEvent event) {
29
30	Shell activeShell = Display.getDefault().getActiveShell();
31	// perform only if close is enabled
32	if((activeShell.getStyle() & SWT.CLOSE) != 0) {
33	activeShell.close();
34	}
35
36	return null;
37	}
38
39	}

Lines 8-12 Link Here

(-)fragment.xml (+25 lines)
8	class="org.eclipse.ui.internal.cocoa.CocoaUIEnhancer">	8	class="org.eclipse.ui.internal.cocoa.CocoaUIEnhancer">
9	</startup>	9	</startup>
10	</extension>	10	</extension>
		11	<extension
		12	point="org.eclipse.ui.commands">
		13	<command
		14	categoryId="org.eclipse.ui.category.dialogs"
		15	description="%command.closeDialog.desc"
		16	id="org.eclipse.ui.cocoa.closeDialog"
		17	name="%command.closeDialog.name">
		18	</command>
		19	</extension>
		20	<extension
		21	point="org.eclipse.ui.handlers">
		22	<handler
		23	class="org.eclipse.ui.internal.cocoa.CloseDialogHandler"
		24	commandId="org.eclipse.ui.cocoa.closeDialog">
		25	</handler>
		26	</extension>
		27	<extension
		28	point="org.eclipse.ui.bindings">
		29	<key
		30	commandId="org.eclipse.ui.cocoa.closeDialog"
		31	contextId="org.eclipse.ui.contexts.dialog"
		32	schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
		33	sequence="M1+W">
		34	</key>
		35	</extension>
11		36
12	</fragment>	37	</fragment>

Added Link Here

(-)src/org/eclipse/ui/internal/cocoa/CloseDialogHandler.java (+41 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.ui.internal.cocoa;
12
13	import org.eclipse.core.commands.AbstractHandler;
14	import org.eclipse.core.commands.ExecutionEvent;
15	import org.eclipse.core.commands.ExecutionException;
16	import org.eclipse.core.commands.IHandler;
17	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.widgets.Display;
19	import org.eclipse.swt.widgets.Shell;
20
21	/**
22	*
23	* @author Prakash G.R. (grprakash@gmail.com)
24	* @since 3.6
25	*
26	*/
27	public class CloseDialogHandler extends AbstractHandler implements IHandler {
28
29	public Object execute(ExecutionEvent event) throws ExecutionException {
30
31	Shell activeShell = Display.getDefault().getActiveShell();
32	// perform only if close is enabled
33	if((activeShell.getStyle() & SWT.CLOSE) != 0) {
34	activeShell.close();
35	}
36
37	activeShell.close();
38	return null;
39	}
40
41	}