X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/RemoveBlockCommentAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/RemoveBlockCommentAction.java
index 2af8550..f1709fc 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/RemoveBlockCommentAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/RemoveBlockCommentAction.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- *
+ * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
@@ -23,7 +23,6 @@ import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.text.ITypedRegion;
 import org.eclipse.ui.texteditor.ITextEditor;
 
-
 /**
  * Action that removes the enclosing comment marks from a Java block comment.
  * 
@@ -34,52 +33,64 @@ public class RemoveBlockCommentAction extends BlockCommentAction {
 	/**
 	 * Creates a new instance.
 	 * 
-	 * @param bundle the resource bundle
-	 * @param prefix a prefix to be prepended to the various resource keys
-	 *   (described in <code>ResourceAction</code> constructor), or 
-	 *   <code>null</code> if none
-	 * @param editor the text editor
+	 * @param bundle
+	 *            the resource bundle
+	 * @param prefix
+	 *            a prefix to be prepended to the various resource keys
+	 *            (described in <code>ResourceAction</code> constructor), or
+	 *            <code>null</code> if none
+	 * @param editor
+	 *            the text editor
 	 */
-	public RemoveBlockCommentAction(ResourceBundle bundle, String prefix, ITextEditor editor) {
+	public RemoveBlockCommentAction(ResourceBundle bundle, String prefix,
+			ITextEditor editor) {
 		super(bundle, prefix, editor);
 	}
-	
+
 	/*
-	 * @see org.eclipse.jdt.internal.ui.actions.AddBlockCommentAction#runInternal(org.eclipse.jface.text.ITextSelection, org.eclipse.jface.text.IDocumentExtension3, org.eclipse.jdt.internal.ui.actions.AddBlockCommentAction.Edit.EditFactory)
+	 * @see net.sourceforge.phpdt.internal.ui.actions.AddBlockCommentAction#runInternal(org.eclipse.jface.text.ITextSelection,
+	 *      org.eclipse.jface.text.IDocumentExtension3,
+	 *      net.sourceforge.phpdt.internal.ui.actions.AddBlockCommentAction.Edit.EditFactory)
 	 */
-	protected void runInternal(ITextSelection selection, IDocumentExtension3 docExtension, Edit.EditFactory factory) throws BadPartitioningException, BadLocationException {
-		List edits= new LinkedList();
-		int tokenLength= getCommentStart().length();
-		
-		int offset= selection.getOffset();
-		int endOffset= offset + selection.getLength();
+	protected void runInternal(ITextSelection selection,
+			IDocumentExtension3 docExtension, Edit.EditFactory factory)
+			throws BadPartitioningException, BadLocationException {
+		List edits = new LinkedList();
+		int tokenLength = getCommentStart().length();
+
+		int offset = selection.getOffset();
+		int endOffset = offset + selection.getLength();
+
+		ITypedRegion partition = docExtension.getPartition(
+				IPHPPartitions.PHP_PARTITIONING, offset, false);
+		int partOffset = partition.getOffset();
+		int partEndOffset = partOffset + partition.getLength();
 
-		ITypedRegion partition= docExtension.getPartition(IPHPPartitions.PHP_PARTITIONING, offset, false);
-		int partOffset= partition.getOffset();
-		int partEndOffset= partOffset + partition.getLength();
-		
 		while (partEndOffset < endOffset) {
-			
-			if (partition.getType() == IPHPPartitions.PHP_PHPDOC_COMMENT) {
+
+			if (partition.getType() == IPHPPartitions.PHP_MULTILINE_COMMENT) {
 				edits.add(factory.createEdit(partOffset, tokenLength, "")); //$NON-NLS-1$
-				edits.add(factory.createEdit(partEndOffset - tokenLength, tokenLength, "")); //$NON-NLS-1$
+				edits.add(factory.createEdit(partEndOffset - tokenLength,
+						tokenLength, "")); //$NON-NLS-1$
 			}
-			
-			partition= docExtension.getPartition(IPHPPartitions.PHP_PARTITIONING, partEndOffset, false);
-			partOffset= partition.getOffset();
-			partEndOffset= partOffset + partition.getLength();
+
+			partition = docExtension.getPartition(
+					IPHPPartitions.PHP_PARTITIONING, partEndOffset, false);
+			partOffset = partition.getOffset();
+			partEndOffset = partOffset + partition.getLength();
 		}
 
-		if (partition.getType() == IPHPPartitions.PHP_PHPDOC_COMMENT) {
+		if (partition.getType() == IPHPPartitions.PHP_MULTILINE_COMMENT) {
 			edits.add(factory.createEdit(partOffset, tokenLength, "")); //$NON-NLS-1$
-			edits.add(factory.createEdit(partEndOffset - tokenLength, tokenLength, "")); //$NON-NLS-1$
+			edits.add(factory.createEdit(partEndOffset - tokenLength,
+					tokenLength, "")); //$NON-NLS-1$
 		}
 
 		executeEdits(edits);
 	}
 
 	/*
-	 * @see org.eclipse.jdt.internal.ui.actions.AddBlockCommentAction#validSelection(org.eclipse.jface.text.ITextSelection)
+	 * @see net.sourceforge.phpdt.internal.ui.actions.AddBlockCommentAction#validSelection(org.eclipse.jface.text.ITextSelection)
 	 */
 	protected boolean isValidSelection(ITextSelection selection) {
 		return selection != null && !selection.isEmpty();