Changeset 642

Timestamp:

04/17/08 07:30:14 (8 months ago)

Author:

markd

Message:

Mark ocurrances Listeneer... I forgot to submit this patch

Location:

org.cfeclipse.cfml/trunk/src/org/cfeclipse/cfml/editors/dnd

Files:

• MarkOccurrencesListener.java (added)
• SelectionCursorListener.java (modified) (6 diffs)

org.cfeclipse.cfml/trunk/src/org/cfeclipse/cfml/editors/dnd/SelectionCursorListener.java

@@ -289 +289 @@
     }
     
-
+    public void mouseDoubleClick(MouseEvent e) {        
+        //see comment below
+    }
+/*
+ * 
+ * Commented for now because denny is using doubleClick in MarkOccurrencesListener
+ * 
     /**
      * Sent when a mouse button is pressed twice within the 
@@ -297 +303 @@
      *
      * @see org.eclipse.swt.widgets.Display#getDoubleClickTime()
-     */
+     *//*
     public void mouseDoubleClick(MouseEvent e) {
         
@@ -352 +358 @@
 
             startpos = this.fViewer.getSelectedRange().x;
-            selectWord(startpos);
-        }
-        
-
-    }
-
-    
-    protected boolean selectWord(int caretPos) 
-        {
+            selectWord(startpos, e);
+        }
+        
+
+    }
+
+    
+        protected boolean selectWord(int caretPos, MouseEvent e) {
 
                 IDocument doc = this.fViewer.getDocument();
                 int startPos, endPos;
-                
-                try 
-                {
+                String normalWordChars = "-";
+                String breakWordChars = "_";
+                String wordChars = normalWordChars;
+                String altWordChars = "-.";
+                String shiftWordChars = "-_";
+                try {
+                        if ((e.stateMask == SWT.ALT || e.stateMask == SWT.SHIFT + SWT.ALT)) {
+                                wordChars = wordChars + altWordChars;
+                        }
+                        if ((e.stateMask == SWT.SHIFT || e.stateMask == SWT.SHIFT + SWT.ALT)) {
+                                wordChars = wordChars + shiftWordChars;
+                                breakWordChars = "";
+                        }
+
                         int pos = caretPos;
                         char c;
 
-                        while (pos >= 0)
-                        {
+                        while (pos >= 0) {
                                 c = doc.getChar(pos);
-                                if(!Character.isJavaIdentifierPart(c) && c != '-')
+                                if (breakWordChars.indexOf(c) >= 0 || !Character.isJavaIdentifierPart(c) && wordChars.indexOf(c) < 0)
                                         break;
                                 --pos;
@@ -383 +398 @@
                         int length = doc.getLength();
 
-                        while (pos < length) 
-                        {
+                        while (pos < length) {
                                 c = doc.getChar(pos);
-                                if(!Character.isJavaIdentifierPart(c) && c != '-')
+                                if (breakWordChars.indexOf(c) >= 0 || !Character.isJavaIdentifierPart(c) && wordChars.indexOf(c) < 0)
                                         break;
                                 ++pos;
@@ -395 +409 @@
                         return true;
 
-                } 
-                catch (BadLocationException x) 
-                {
-                        //?
+                } catch (BadLocationException x) {
+                        // ?
                 }
 
                 return false;
         }
+
 
         private void selectRange(int startPos, int stopPos) 
@@ -412 +425 @@
 
     
-    
+*/