From 09fcd6ef44356f103f07c9b7dd59c2873be3ee00 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Sun, 21 Aug 2005 03:30:49 +0000 Subject: [PATCH] 2005-08-20 Alain Magloire Fix PR 105613: Preview label duplicated * src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java --- core/org.eclipse.cdt.ui/ChangeLog | 4 ++++ .../internal/ui/preferences/CTemplatePreferencePage.java | 9 +-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index dc0ed6e4224..f9e268d4e12 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,7 @@ +2005-08-20 Alain Magloire + Fix PR 105613: Preview label duplicated + * src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java + 2005-08-20 Alain Magloire Fix for PR 106540: Link with editor did not work correctly for non C resources. * src/org/eclipse/cdt/internal/ui/cview/CView.java diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java index 1ba26adfc10..2efe742967b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java @@ -26,7 +26,6 @@ import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.templates.TemplatePreferencePage; @@ -69,12 +68,6 @@ public class CTemplatePreferencePage extends TemplatePreferencePage { * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#createViewer(org.eclipse.swt.widgets.Composite) */ protected SourceViewer createViewer(Composite parent) { - Label label= new Label(parent, SWT.NONE); - label.setText(PreferencesMessages.getString("TemplatePreferencePage.Viewer.preview")); //$NON-NLS-1$ - GridData data= new GridData(); - data.horizontalSpan= 2; - label.setLayoutData(data); - SourceViewer viewer= new SourceViewer(parent, null, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); CTextTools tools= CUIPlugin.getDefault().getTextTools(); viewer.configure(new CSourceViewerConfiguration(tools, null)); @@ -86,7 +79,7 @@ public class CTemplatePreferencePage extends TemplatePreferencePage { viewer.getTextWidget().setFont(font); Control control= viewer.getControl(); - data= new GridData(GridData.FILL_BOTH); + GridData data= new GridData(GridData.FILL_BOTH); data.heightHint= convertHeightInCharsToPixels(5); control.setLayoutData(data);