diff options
| author | Markus Keller | 2015-11-11 16:38:29 +0000 |
|---|---|---|
| committer | Markus Keller | 2015-11-11 16:38:29 +0000 |
| commit | a5c7dfaf05dd6a538b0798d59bb1b05d0c65c5a6 (patch) | |
| tree | cbc7c47d39809bbc4cb5ec47b006d1b20ad22413 | |
| parent | 734c3aebdc9c44a24762092540317de6c8d8555f (diff) | |
| download | eclipse.jdt.ui-a5c7dfaf05dd6a538b0798d59bb1b05d0c65c5a6.tar.gz eclipse.jdt.ui-a5c7dfaf05dd6a538b0798d59bb1b05d0c65c5a6.tar.xz eclipse.jdt.ui-a5c7dfaf05dd6a538b0798d59bb1b05d0c65c5a6.zip | |
Bug 481932: Java compare editor should block Toggle Word Wrap (Alt+Shift+Y) shortcut
| -rw-r--r-- | org.eclipse.jdt.ui/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/org.eclipse.jdt.ui/META-INF/MANIFEST.MF b/org.eclipse.jdt.ui/META-INF/MANIFEST.MF index d6ef347ddd..1469feaf8c 100644 --- a/org.eclipse.jdt.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.ui/META-INF/MANIFEST.MF @@ -128,7 +128,7 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.8.0,4.0.0)", org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.console;bundle-version="[3.4.0,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.8.0,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.views;bundle-version="[3.3.100,4.0.0)", org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)", diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java index e3793bf3f6..adb8b2e7f7 100644 --- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java +++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/JavaMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2014 IBM Corporation and others. + * Copyright (c) 2000, 2015 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 @@ -609,6 +609,10 @@ public class JavaMergeViewer extends TextMergeViewer { return !fEditable; } @Override + protected boolean isWordWrapSupported() { + return false; + } + @Override protected void setActionsActivated(boolean state) { super.setActionsActivated(state); } |