Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2007-05-15 13:55:26 +0000
committerMichael Valenta2007-05-15 13:55:26 +0000
commita8a9bfefc07a47b06943c8cfd0bb61fabbb58b47 (patch)
treee11720c22334bdedd928196cd5d289ca262f0133 /bundles/org.eclipse.compare
parent9e29625ed87099dfad2eb66f5a08ed1c95853cb5 (diff)
downloadeclipse.platform.team-a8a9bfefc07a47b06943c8cfd0bb61fabbb58b47.tar.gz
eclipse.platform.team-a8a9bfefc07a47b06943c8cfd0bb61fabbb58b47.tar.xz
eclipse.platform.team-a8a9bfefc07a47b06943c8cfd0bb61fabbb58b47.zip
Bug 186908 TVT33:TCT166: ar: 13.001370 Text needs to be right aligned
Diffstat (limited to 'bundles/org.eclipse.compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java14
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java14
2 files changed, 16 insertions, 12 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index e880d9a78..6765d8f10 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -23,6 +23,8 @@ import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.window.Window;
+import org.eclipse.osgi.util.TextProcessor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.*;
@@ -751,16 +753,16 @@ public abstract class ContentMergeViewer extends ContentViewer
fComposite.setLayout(new ContentMergeViewerLayout());
int style= SWT.SHADOW_OUT;
- fAncestorLabel= new CLabel(fComposite, style);
+ fAncestorLabel= new CLabel(fComposite, style | Window.getDefaultOrientation());
- fLeftLabel= new CLabel(fComposite, style);
+ fLeftLabel= new CLabel(fComposite, style | Window.getDefaultOrientation());
new Resizer(fLeftLabel, VERTICAL);
fDirectionLabel= new CLabel(fComposite, style);
fDirectionLabel.setAlignment(SWT.CENTER);
new Resizer(fDirectionLabel, HORIZONTAL | VERTICAL);
- fRightLabel= new CLabel(fComposite, style);
+ fRightLabel= new CLabel(fComposite, style | Window.getDefaultOrientation());
new Resizer(fRightLabel, VERTICAL);
if (fCenter == null || fCenter.isDisposed())
@@ -1008,7 +1010,7 @@ public abstract class ContentMergeViewer extends ContentViewer
fAncestorLabel.setImage(ancestorImage);
String ancestorLabel = content.getAncestorLabel(input);
if (ancestorLabel != null)
- fAncestorLabel.setText(ancestorLabel);
+ fAncestorLabel.setText(TextProcessor.process(ancestorLabel));
}
if (fLeftLabel != null) {
Image leftImage = content.getLeftImage(input);
@@ -1016,7 +1018,7 @@ public abstract class ContentMergeViewer extends ContentViewer
fLeftLabel.setImage(leftImage);
String leftLabel = content.getLeftLabel(input);
if (leftLabel != null)
- fLeftLabel.setText(leftLabel);
+ fLeftLabel.setText(TextProcessor.process(leftLabel));
}
if (fRightLabel != null) {
Image rightImage = content.getRightImage(input);
@@ -1024,7 +1026,7 @@ public abstract class ContentMergeViewer extends ContentViewer
fRightLabel.setImage(rightImage);
String rightLabel = content.getRightLabel(input);
if (rightLabel != null)
- fRightLabel.setText(rightLabel);
+ fRightLabel.setText(TextProcessor.process(rightLabel));
}
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index e880d9a78..6765d8f10 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -23,6 +23,8 @@ import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.window.Window;
+import org.eclipse.osgi.util.TextProcessor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.*;
@@ -751,16 +753,16 @@ public abstract class ContentMergeViewer extends ContentViewer
fComposite.setLayout(new ContentMergeViewerLayout());
int style= SWT.SHADOW_OUT;
- fAncestorLabel= new CLabel(fComposite, style);
+ fAncestorLabel= new CLabel(fComposite, style | Window.getDefaultOrientation());
- fLeftLabel= new CLabel(fComposite, style);
+ fLeftLabel= new CLabel(fComposite, style | Window.getDefaultOrientation());
new Resizer(fLeftLabel, VERTICAL);
fDirectionLabel= new CLabel(fComposite, style);
fDirectionLabel.setAlignment(SWT.CENTER);
new Resizer(fDirectionLabel, HORIZONTAL | VERTICAL);
- fRightLabel= new CLabel(fComposite, style);
+ fRightLabel= new CLabel(fComposite, style | Window.getDefaultOrientation());
new Resizer(fRightLabel, VERTICAL);
if (fCenter == null || fCenter.isDisposed())
@@ -1008,7 +1010,7 @@ public abstract class ContentMergeViewer extends ContentViewer
fAncestorLabel.setImage(ancestorImage);
String ancestorLabel = content.getAncestorLabel(input);
if (ancestorLabel != null)
- fAncestorLabel.setText(ancestorLabel);
+ fAncestorLabel.setText(TextProcessor.process(ancestorLabel));
}
if (fLeftLabel != null) {
Image leftImage = content.getLeftImage(input);
@@ -1016,7 +1018,7 @@ public abstract class ContentMergeViewer extends ContentViewer
fLeftLabel.setImage(leftImage);
String leftLabel = content.getLeftLabel(input);
if (leftLabel != null)
- fLeftLabel.setText(leftLabel);
+ fLeftLabel.setText(TextProcessor.process(leftLabel));
}
if (fRightLabel != null) {
Image rightImage = content.getRightImage(input);
@@ -1024,7 +1026,7 @@ public abstract class ContentMergeViewer extends ContentViewer
fRightLabel.setImage(rightImage);
String rightLabel = content.getRightLabel(input);
if (rightLabel != null)
- fRightLabel.setText(rightLabel);
+ fRightLabel.setText(TextProcessor.process(rightLabel));
}
}

Back to the top