Attachment #181533 for bug #321701




/*******************************************************************************
 * Copyright (c) 2007, 2010 David Green 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:
 *     David Green - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.provisional.commons.ui.commands;

import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IHandler;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.ui.texteditor.TextViewerDeleteLineTarget;

/**
 * Abstract command handler that uses {@link TextViewerDeleteLineTarget}. Subclasses can specify the type of delete line
 * and copyToClipboard.
 * 
 * @author David Green
 */
public class AbstractDeleteLineHandler extends AbstractTextViewerHandler implements IHandler {
	protected final int type;

	protected final boolean copyToClipboard;

	protected AbstractDeleteLineHandler(int type, boolean copyToClipboard) {
		this.type = type;
		this.copyToClipboard = copyToClipboard;
	}

	public Object execute(ExecutionEvent event) throws ExecutionException {
		ITextViewer viewer = getTextViewer(event);
		if (viewer != null) {
			TextViewerDeleteLineTarget target = new TextViewerDeleteLineTarget(viewer);

			try {
				target.deleteLine(viewer.getDocument(), (ITextSelection) viewer.getSelectionProvider().getSelection(),
						type, copyToClipboard);
			} catch (BadLocationException e) {
				throw new ExecutionException(e.getMessage(), e);
			}
		}
		return null;
	}

}




/*******************************************************************************
 * Copyright (c) 2007, 2010 David Green 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:
 *     David Green - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.provisional.commons.ui.commands;

import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.ui.handlers.HandlerUtil;

/**
 * Abstract command handler that can get the current text viewer.
 * 
 * @author David Green
 */
public abstract class AbstractTextViewerHandler extends AbstractHandler {

	/**
	 * get the {@link ITextViewer} for the given event. Depends on the <tt>activeFocusControl</tt> event variable being
	 * an instanceof {@link StyledText}. The {@link StyledText#getData(String))} is expected to have a value for one of
	 * <code>ITextViewer.class.getName()</code> or <code>ISourceViewer.class.getName()</code>.
	 * 
	 * @return the text viewer or null if it cannot be found
	 */
	protected ITextViewer getTextViewer(ExecutionEvent event) throws ExecutionException {
		Object activeFocusControl = HandlerUtil.getVariable(event, "activeFocusControl"); //$NON-NLS-1$
		if (activeFocusControl instanceof StyledText) {
			StyledText textWidget = (StyledText) activeFocusControl;
			ITextViewer viewer = (ITextViewer) textWidget.getData(ITextViewer.class.getName());
			if (viewer == null) {
				viewer = (ITextViewer) textWidget.getData(ISourceViewer.class.getName());
			}
			return viewer;
		}
		return null;
	}
}




/*******************************************************************************
 * Copyright (c) 2007, 2010 David Green 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:
 *     David Green - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.provisional.commons.ui.commands;

import org.eclipse.ui.texteditor.DeleteLineAction;

/**
 * Command handler for cut line command (whole)
 * 
 * @author David Green
 */
public class CutLineHandler extends AbstractDeleteLineHandler {
	public CutLineHandler() {
		super(DeleteLineAction.WHOLE, true);
	}
}




/*******************************************************************************
 * Copyright (c) 2007, 2010 David Green 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:
 *     David Green - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.provisional.commons.ui.commands;

import org.eclipse.ui.texteditor.DeleteLineAction;

/**
 * Command handler for cut line command (to beginning)
 * 
 * @author David Green
 */
public class CutLineToBeginningHandler extends AbstractDeleteLineHandler {
	public CutLineToBeginningHandler() {
		super(DeleteLineAction.TO_BEGINNING, true);
	}
}




/*******************************************************************************
 * Copyright (c) 2007, 2010 David Green 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:
 *     David Green - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.provisional.commons.ui.commands;

import org.eclipse.ui.texteditor.DeleteLineAction;

/**
 * Command handler for cut line command (to end)
 * 
 * @author David Green
 */
public class CutLineToEndHandler extends AbstractDeleteLineHandler {
	public CutLineToEndHandler() {
		super(DeleteLineAction.TO_END, true);
	}
}




/*******************************************************************************
 * Copyright (c) 2007, 2010 David Green 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:
 *     David Green - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.provisional.commons.ui.commands;

import org.eclipse.ui.texteditor.DeleteLineAction;

/**
 * Command handler for delete line command (whole)
 * 
 * @author David Green
 */
public class DeleteLineHandler extends AbstractDeleteLineHandler {
	public DeleteLineHandler() {
		super(DeleteLineAction.WHOLE, false);
	}
}




/*******************************************************************************
 * Copyright (c) 2007, 2010 David Green 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:
 *     David Green - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.provisional.commons.ui.commands;

import org.eclipse.ui.texteditor.DeleteLineAction;

/**
 * Command handler for delete line command (to beginning)
 * 
 * @author David Green
 */
public class DeleteLineToBeginningHandler extends AbstractDeleteLineHandler {
	public DeleteLineToBeginningHandler() {
		super(DeleteLineAction.TO_BEGINNING, false);
	}
}




/*******************************************************************************
 * Copyright (c) 2007, 2010 David Green 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:
 *     David Green - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.provisional.commons.ui.commands;

import org.eclipse.ui.texteditor.DeleteLineAction;

/**
 * Command handler for delete line command (to end)
 * 
 * @author David Green
 */
public class DeleteLineToEndHandler extends AbstractDeleteLineHandler {
	public DeleteLineToEndHandler() {
		super(DeleteLineAction.TO_END, false);
	}
}




            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
      	</key>
	</extension>
 <extension
       point="org.eclipse.ui.handlers">
    <handler
          class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.DeleteLineHandler"
          commandId="org.eclipse.ui.edit.text.delete.line">
         <activeWhen>
         	<with variable="activeContexts">
	            <iterate operator="or" ifEmpty="false">
	               <equals
	                     value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
	            </iterate>
         	</with>
		</activeWhen>
    </handler>
    
    <handler
          class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.CutLineHandler"
          commandId="org.eclipse.ui.edit.text.cut.line">
         <activeWhen>
         	<with variable="activeContexts">
	            <iterate operator="or" ifEmpty="false">
	               <equals
	                     value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
	            </iterate>
         	</with>
		</activeWhen>
    </handler>
    
    <handler
          class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.DeleteLineToBeginningHandler"
          commandId="org.eclipse.ui.edit.text.delete.line.to.beginning">
         <activeWhen>
         	<with variable="activeContexts">
	            <iterate operator="or" ifEmpty="false">
	               <equals
	                     value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
	            </iterate>
         	</with>
		</activeWhen>
    </handler>
    
    <handler
          class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.CutLineToBeginningHandler"
          commandId="org.eclipse.ui.edit.text.cut.line.to.beginning">
         <activeWhen>
         	<with variable="activeContexts">
	            <iterate operator="or" ifEmpty="false">
	               <equals
	                     value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
	            </iterate>
         	</with>
		</activeWhen>
    </handler>
    
    
    <handler
          class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.DeleteLineToEndHandler"
          commandId="org.eclipse.ui.edit.text.delete.line.to.end">
         <activeWhen>
         	<with variable="activeContexts">
	            <iterate operator="or" ifEmpty="false">
	               <equals
	                     value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
	            </iterate>
         	</with>
		</activeWhen>
    </handler>
    
    
    <handler
          class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.CutLineToEndHandler"
          commandId="org.eclipse.ui.edit.text.cut.line.to.end">
         <activeWhen>
         	<with variable="activeContexts">
	            <iterate operator="or" ifEmpty="false">
	               <equals
	                     value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
	            </iterate>
         	</with>
		</activeWhen>
    </handler>
    
 </extension>
</plugin>

Return to bug 321701

Lines 224-227 Link Here

(-)plugin.xml (+83 lines)
224	schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">	224	schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
225	</key>	225	</key>
226	</extension>	226	</extension>
		227	<extension
		228	point="org.eclipse.ui.handlers">
		229	<handler
		230	class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.DeleteLineHandler"
		231	commandId="org.eclipse.ui.edit.text.delete.line">
		232	<activeWhen>
		233	<with variable="activeContexts">
		234	<iterate operator="or" ifEmpty="false">
		235	<equals
		236	value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
		237	</iterate>
		238	</with>
		239	</activeWhen>
		240	</handler>
		241
		242	<handler
		243	class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.CutLineHandler"
		244	commandId="org.eclipse.ui.edit.text.cut.line">
		245	<activeWhen>
		246	<with variable="activeContexts">
		247	<iterate operator="or" ifEmpty="false">
		248	<equals
		249	value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
		250	</iterate>
		251	</with>
		252	</activeWhen>
		253	</handler>
		254
		255	<handler
		256	class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.DeleteLineToBeginningHandler"
		257	commandId="org.eclipse.ui.edit.text.delete.line.to.beginning">
		258	<activeWhen>
		259	<with variable="activeContexts">
		260	<iterate operator="or" ifEmpty="false">
		261	<equals
		262	value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
		263	</iterate>
		264	</with>
		265	</activeWhen>
		266	</handler>
		267
		268	<handler
		269	class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.CutLineToBeginningHandler"
		270	commandId="org.eclipse.ui.edit.text.cut.line.to.beginning">
		271	<activeWhen>
		272	<with variable="activeContexts">
		273	<iterate operator="or" ifEmpty="false">
		274	<equals
		275	value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
		276	</iterate>
		277	</with>
		278	</activeWhen>
		279	</handler>
		280
		281
		282	<handler
		283	class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.DeleteLineToEndHandler"
		284	commandId="org.eclipse.ui.edit.text.delete.line.to.end">
		285	<activeWhen>
		286	<with variable="activeContexts">
		287	<iterate operator="or" ifEmpty="false">
		288	<equals
		289	value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
		290	</iterate>
291	</with>
292	</activeWhen>
293	</handler>
294
295
296	<handler
297	class="org.eclipse.mylyn.internal.provisional.commons.ui.commands.CutLineToEndHandler"
298	commandId="org.eclipse.ui.edit.text.cut.line.to.end">
299	<activeWhen>
300	<with variable="activeContexts">
301	<iterate operator="or" ifEmpty="false">
302	<equals
303	value="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"/>
304	</iterate>
305	</with>
306	</activeWhen>
307	</handler>
308
309	</extension>
227	</plugin>	310	</plugin>

Added Link Here

(-)src/org/eclipse/mylyn/internal/provisional/commons/ui/commands/AbstractDeleteLineHandler.java (+53 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007, 2010 David Green 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	* David Green - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylyn.internal.provisional.commons.ui.commands;
13
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.jface.text.BadLocationException;
18	import org.eclipse.jface.text.ITextSelection;
19	import org.eclipse.jface.text.ITextViewer;
20	import org.eclipse.ui.texteditor.TextViewerDeleteLineTarget;
21
22	/**
23	* Abstract command handler that uses {@link TextViewerDeleteLineTarget}. Subclasses can specify the type of delete line
24	* and copyToClipboard.
25	*
26	* @author David Green
27	*/
28	public class AbstractDeleteLineHandler extends AbstractTextViewerHandler implements IHandler {
29	protected final int type;
30
31	protected final boolean copyToClipboard;
32
33	protected AbstractDeleteLineHandler(int type, boolean copyToClipboard) {
34	this.type = type;
35	this.copyToClipboard = copyToClipboard;
36	}
37
38	public Object execute(ExecutionEvent event) throws ExecutionException {
39	ITextViewer viewer = getTextViewer(event);
40	if (viewer != null) {
41	TextViewerDeleteLineTarget target = new TextViewerDeleteLineTarget(viewer);
42
43	try {
44	target.deleteLine(viewer.getDocument(), (ITextSelection) viewer.getSelectionProvider().getSelection(),
45	type, copyToClipboard);
46	} catch (BadLocationException e) {
47	throw new ExecutionException(e.getMessage(), e);
48	}
49	}
50	return null;
51	}
52
53	}