Bug 68832 - double click in display view selects whole linev20120305-1601

2 files changed, 9 insertions, 27 deletions

diff --git a/org.eclipse.jdt.debug.ui/.settings/.api_filters b/org.eclipse.jdt.debug.ui/.settings/.api_filters
index 62fc7dc74..f23a01ba1 100644
--- a/org.eclipse.jdt.debug.ui/.settings/.api_filters
+++ b/org.eclipse.jdt.debug.ui/.settings/.api_filters
@@ -24,6 +24,14 @@
             </message_arguments>

         </filter>

     </resource>

+    <resource path="ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewerConfiguration.java" type="org.eclipse.jdt.internal.debug.ui.display.DisplayViewerConfiguration">

+        <filter id="571473929">

+            <message_arguments>

+                <message_argument value="JavaSourceViewerConfiguration"/>

+                <message_argument value="DisplayViewerConfiguration"/>

+            </message_arguments>

+        </filter>

+    </resource>

     <resource path="ui/org/eclipse/jdt/internal/debug/ui/launcher/AppletSelectionDialog.java" type="org.eclipse.jdt.internal.debug.ui.launcher.AppletSelectionDialog$PackageRenderer">

         <filter comment="known API usage" id="571473929">

             <message_arguments>

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewerConfiguration.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewerConfiguration.java
index 8e8960b5a..a48aa3cc1 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewerConfiguration.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewerConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 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
@@ -18,10 +18,7 @@ import org.eclipse.jdt.internal.debug.ui.contentassist.JavaDebugContentAssistPro
 import org.eclipse.jdt.ui.PreferenceConstants;
 import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.contentassist.ContentAssistant;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.text.contentassist.IContentAssistant;
@@ -74,27 +71,4 @@ public class DisplayViewerConfiguration extends JavaSourceViewerConfiguration {
 
 		return assistant;
 	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getDoubleClickStrategy(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
-	 */
-	@Override
-	public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) {
-		ITextDoubleClickStrategy clickStrat = new ITextDoubleClickStrategy() {
-			// Highlight the whole line when double clicked. See Bug#45481 
-			public void doubleClicked(ITextViewer viewer) {
-				try {
-					IDocument doc = viewer.getDocument();
-					int caretOffset = viewer.getSelectedRange().x;
-					int lineNum = doc.getLineOfOffset(caretOffset);
-					int start = doc.getLineOffset(lineNum);
-					int length = doc.getLineLength(lineNum);
-					viewer.setSelectedRange(start, length);
-				} catch (BadLocationException e) {
-					JDIDebugUIPlugin.log(e);
-				}
-			}
-		};
-		return clickStrat;
-	}	
 }