diff options
3 files changed, 11 insertions, 11 deletions
diff --git a/org.eclipse.jface.text/META-INF/MANIFEST.MF b/org.eclipse.jface.text/META-INF/MANIFEST.MF index c5796a11f44..dd6f22cd7e8 100644 --- a/org.eclipse.jface.text/META-INF/MANIFEST.MF +++ b/org.eclipse.jface.text/META-INF/MANIFEST.MF @@ -32,7 +32,7 @@ Export-Package: Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.text;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, - org.eclipse.swt;bundle-version="[3.6.0,4.0.0)", + org.eclipse.swt;bundle-version="[3.103.0,4.0.0)", org.eclipse.jface;bundle-version="[3.5.0,4.0.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.4 Import-Package: com.ibm.icu.text diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java index 90b92d84f42..a0b465b37a8 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 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 @@ -1418,7 +1418,7 @@ public class TextViewer extends Viewer implements * @see KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent) */ public void keyReleased(KeyEvent e) { - if (fTextWidget.getSelectionCount() == 0) { + if (!fTextWidget.isTextSelected()) { fLastSentSelectionChange= null; queuePostSelectionChanged(e.character == SWT.DEL); } @@ -1440,7 +1440,7 @@ public class TextViewer extends Viewer implements * @see MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) */ public void mouseUp(MouseEvent event) { - if (fTextWidget.getSelectionCount() == 0) + if (!fTextWidget.isTextSelected()) queuePostSelectionChanged(false); } } @@ -3947,9 +3947,9 @@ public class TextViewer extends Viewer implements switch (operation) { case CUT: - return isEditable() &&(fTextWidget.getSelectionCount() > 0 || !isMarkedRegionEmpty()); + return isEditable() && (fTextWidget.isTextSelected() || !isMarkedRegionEmpty()); case COPY: - return fTextWidget.getSelectionCount() > 0 || !isMarkedRegionEmpty(); + return fTextWidget.isTextSelected() || !isMarkedRegionEmpty(); case DELETE: case PASTE: return isEditable(); @@ -4001,7 +4001,7 @@ public class TextViewer extends Viewer implements } break; case CUT: - if (fTextWidget.getSelectionCount() == 0) + if (!fTextWidget.isTextSelected()) copyMarkedRegion(true); else wrapCompoundChange(new Runnable() { @@ -4015,7 +4015,7 @@ public class TextViewer extends Viewer implements break; case COPY: - if (fTextWidget.getSelectionCount() == 0) + if (!fTextWidget.isTextSelected()) copyMarkedRegion(false); else fTextWidget.copy(); diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java index f858f8d84ff..cb644299c52 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 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 @@ -408,7 +408,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M return; } - if (text.getSelectionCount() != 0) { + if (text.isTextSelected()) { deactivate(); return; } @@ -461,7 +461,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M return; } - if ((event.stateMask & SWT.BUTTON1) != 0 && text.getSelectionCount() != 0) { + if ((event.stateMask & SWT.BUTTON1) != 0 && text.isTextSelected()) { deactivate(); return; } |