3m9 compatible;

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / actions / AddBlockCommentAction.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/AddBlockCommentAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/AddBlockCommentAction.java
index b5d959a..2da463d 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/AddBlockCommentAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/AddBlockCommentAction.java
@@ -53,7 +53,7 @@ public class AddBlockCommentAction extends BlockCommentAction {
                int selectionOffset= selection.getOffset();
                int selectionEndOffset= selectionOffset + selection.getLength();
                List edits= new LinkedList();
-               ITypedRegion partition= docExtension.getPartition(IPHPPartitions.PHP_PARTITIONING, selectionOffset);
+               ITypedRegion partition= docExtension.getPartition(IPHPPartitions.PHP_PARTITIONING, selectionOffset, false);
 
                handleFirstPartition(partition, edits, factory, selectionOffset);
 
@@ -112,7 +112,7 @@ public class AddBlockCommentAction extends BlockCommentAction {
                
                boolean wasJavadoc= false; // true if the previous partition is javadoc
                
-               if (partType == IPHPPartitions.PHP_MULTILINE_COMMENT) {
+               if (partType == IPHPPartitions.PHP_PHPDOC_COMMENT) {
                        
                        wasJavadoc= true;
                        
@@ -124,7 +124,7 @@ public class AddBlockCommentAction extends BlockCommentAction {
                }
 
                // advance to next partition
-               partition= docExtension.getPartition(IPHPPartitions.PHP_PARTITIONING, partEndOffset);
+               partition= docExtension.getPartition(IPHPPartitions.PHP_PARTITIONING, partEndOffset, false);
                partType= partition.getType();
 
                // start of next partition
@@ -138,7 +138,7 @@ public class AddBlockCommentAction extends BlockCommentAction {
                        
                } else { // !wasJavadoc
                
-                       if (partType == IPHPPartitions.PHP_MULTILINE_COMMENT) {
+                       if (partType == IPHPPartitions.PHP_PHPDOC_COMMENT) {
                                // if next is javadoc, end block comment before
                                edits.add(factory.createEdit(partition.getOffset(), 0, getCommentEnd()));
 //                     } else if (partType == IJavaPartitions.JAVA_MULTI_LINE_COMMENT) {
@@ -182,7 +182,7 @@ public class AddBlockCommentAction extends BlockCommentAction {
        private boolean isSpecialPartition(String partType) {
                return// partType == IPHPPartitions.PHP_CHARACTER
                                //|| 
-                               partType == IPHPPartitions.PHP_STRING;
+                               partType == IPHPPartitions.PHP_STRING_DQ;
                                //|| partType == IPHPPartitions.PHP_SINGLE_LINE_COMMENT;
        }