diff options
author | Markus Keller | 2014-08-17 14:51:47 +0000 |
---|---|---|
committer | Dani Megert | 2014-08-17 14:51:47 +0000 |
commit | cc01466b9daed5feaa42ca40b0e068dfa32501ac (patch) | |
tree | 478dbf18b34698af0928f4ba191068cd0ec71b2a | |
parent | 542b462a004f3e213f478259139433063f2435d5 (diff) | |
download | eclipse.pde.ui-cc01466b9daed5feaa42ca40b0e068dfa32501ac.tar.gz eclipse.pde.ui-cc01466b9daed5feaa42ca40b0e068dfa32501ac.tar.xz eclipse.pde.ui-cc01466b9daed5feaa42ca40b0e068dfa32501ac.zip |
Fixed bug 441883: [bidi] Compare editors for MANIFEST.MF and plugin.xml must enforce LTRM20140820-1200M20140820-0800
Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>
2 files changed, 6 insertions, 4 deletions
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestContentMergeViewer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestContentMergeViewer.java index f136415c26..82a2e10485 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestContentMergeViewer.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestContentMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2009 IBM Corporation and others. + * Copyright (c) 2005, 2014 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 @@ -19,6 +19,7 @@ import org.eclipse.jface.text.rules.FastPartitioner; import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.pde.internal.ui.PDEUIMessages; import org.eclipse.pde.internal.ui.editor.text.*; +import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Composite; @@ -28,7 +29,7 @@ public class ManifestContentMergeViewer extends TextMergeViewer { private IColorManager fColorManager; public ManifestContentMergeViewer(Composite parent, CompareConfiguration configuration) { - super(parent, configuration); + super(parent, SWT.LEFT_TO_RIGHT, configuration); } protected void configureTextViewer(TextViewer textViewer) { diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/PluginContentMergeViewer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/PluginContentMergeViewer.java index 130fef8a27..aa6d77d5bd 100644 --- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/PluginContentMergeViewer.java +++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/PluginContentMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2014 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 @@ -25,6 +25,7 @@ import org.eclipse.pde.internal.ui.PDEPlugin; import org.eclipse.pde.internal.ui.PDEUIMessages; import org.eclipse.pde.internal.ui.editor.context.XMLDocumentSetupParticpant; import org.eclipse.pde.internal.ui.editor.text.*; +import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.graphics.Font; @@ -36,7 +37,7 @@ public class PluginContentMergeViewer extends TextMergeViewer { private ArrayList<IPropertyChangeListener> fPropertyChangedListeners; public PluginContentMergeViewer(Composite parent, CompareConfiguration config) { - super(parent, config); + super(parent, SWT.LEFT_TO_RIGHT, config); } protected void configureTextViewer(final TextViewer textViewer) { |