From 478eabb6f1bb9742fef34625d4c2707e22c2ac2d Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Tue, 24 Aug 2021 15:31:20 -0400 Subject: [PATCH] Allow passing style to StyledTextEditor. Add border to tags editor. --- .../boot/dash/views/properties/TagsPropertyControl.java | 7 ++++--- .../boot/dash/views/sections/StyledTextCellEditor.java | 4 ++-- .../boot/dash/views/sections/StyledTextEditor.java | 8 ++++---- .../boot/dash/views/sections/TagEditingSupport.java | 5 +++-- .../eclipse/boot/dash/views/sections/TagsCellEditor.java | 6 +++--- .../ide/eclipse/boot/dash/views/sections/TagsEditor.java | 8 ++++---- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/properties/TagsPropertyControl.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/properties/TagsPropertyControl.java index 749475ffa..f1739868f 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/properties/TagsPropertyControl.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/properties/TagsPropertyControl.java @@ -15,6 +15,7 @@ import java.util.LinkedHashSet; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.viewers.ICellEditorListener; +import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; import org.springframework.ide.eclipse.boot.dash.BootDashActivator; @@ -39,7 +40,7 @@ public class TagsPropertyControl extends AbstractBdePropertyControl { public void createControl(Composite composite, TabbedPropertySheetPage page) { super.createControl(composite, page); page.getWidgetFactory().createLabel(composite, "Tags:").setLayoutData(GridDataFactory.fillDefaults().create()); //$NON-NLS-1$ - tags = new TagsEditor(composite, getStylers(), new TagContentProposalProvider(BootDashActivator.getDefault().getModel()), UIUtils.CTRL_SPACE, UIUtils.TAG_CA_AUTO_ACTIVATION_CHARS); + tags = new TagsEditor(composite, SWT.SINGLE | SWT.BORDER, getStylers(), new TagContentProposalProvider(BootDashActivator.getDefault().getModel()), UIUtils.CTRL_SPACE, UIUtils.TAG_CA_AUTO_ACTIVATION_CHARS); tags.getControl().setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create()); tags.addListener(new ICellEditorListener() { @Override @@ -47,8 +48,8 @@ public class TagsPropertyControl extends AbstractBdePropertyControl { String str = (String) tags.getValue(); BootDashElement element = getBootDashElement(); if (element != null) { - LinkedHashSet tagsSet = str.isEmpty() ? new LinkedHashSet() - : new LinkedHashSet(Arrays.asList(TagUtils.parseTags(str))); + LinkedHashSet tagsSet = str.isEmpty() ? new LinkedHashSet<>() + : new LinkedHashSet<>(Arrays.asList(TagUtils.parseTags(str))); if (!tagsSet.equals(element.getTags())) { element.setTags(tagsSet); } diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/StyledTextCellEditor.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/StyledTextCellEditor.java index 2b3b2d8dd..448890348 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/StyledTextCellEditor.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/StyledTextCellEditor.java @@ -99,9 +99,9 @@ public abstract class StyledTextCellEditor extends CellEditor { super(parent, style); } - public StyledTextCellEditor(Composite parent, IContentProposalProvider contentProposalProvider, + public StyledTextCellEditor(Composite parent, int style, IContentProposalProvider contentProposalProvider, KeyStroke keyStroke, char[] autoActivationCharacters) { - this(parent); + this(parent, style); enableContentProposal(contentProposalProvider, keyStroke, autoActivationCharacters); } diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/StyledTextEditor.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/StyledTextEditor.java index 4c9c46425..a227bec39 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/StyledTextEditor.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/StyledTextEditor.java @@ -25,13 +25,13 @@ import org.eclipse.swt.widgets.Composite; */ public abstract class StyledTextEditor extends StyledTextCellEditor { - public StyledTextEditor(Composite parent) { - super(parent); + public StyledTextEditor(Composite parent, int style) { + super(parent, style); } - public StyledTextEditor(Composite parent, IContentProposalProvider contentProposalProvider, + public StyledTextEditor(Composite parent, int style, IContentProposalProvider contentProposalProvider, KeyStroke keyStroke, char[] autoActivationCharacters) { - super(parent, contentProposalProvider, keyStroke, autoActivationCharacters); + super(parent, style, contentProposalProvider, keyStroke, autoActivationCharacters); setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE); } diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagEditingSupport.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagEditingSupport.java index 2ca49c49a..6bced7233 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagEditingSupport.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagEditingSupport.java @@ -17,6 +17,7 @@ import org.eclipse.jface.fieldassist.IContentProposalProvider; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.EditingSupport; import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.swt.SWT; import org.springframework.ide.eclipse.boot.dash.model.BootDashElement; import org.springframework.ide.eclipse.boot.dash.model.BootDashViewModel; import org.springframework.ide.eclipse.boot.dash.model.TagUtils; @@ -36,13 +37,13 @@ public class TagEditingSupport extends EditingSupport { public TagEditingSupport(TableViewer viewer, LiveExpression selection, Stylers stylers) { super(viewer); - this.editor = new TagsCellEditor(viewer.getTable(), stylers); + this.editor = new TagsCellEditor(viewer.getTable(), SWT.SINGLE, stylers); } public TagEditingSupport(TableViewer viewer, LiveExpression selection, BootDashViewModel model, Stylers stylers) { super(viewer); IContentProposalProvider proposalProvider = new TagContentProposalProvider(model); - this.editor = new TagsCellEditor(viewer.getTable(), stylers, proposalProvider, UIUtils.CTRL_SPACE, + this.editor = new TagsCellEditor(viewer.getTable(), SWT.SINGLE, stylers, proposalProvider, UIUtils.CTRL_SPACE, UIUtils.TAG_CA_AUTO_ACTIVATION_CHARS); } diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagsCellEditor.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagsCellEditor.java index 417f28551..64faf5c81 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagsCellEditor.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagsCellEditor.java @@ -29,14 +29,14 @@ public class TagsCellEditor extends StyledTextCellEditor { private Stylers stylers; - public TagsCellEditor(Composite parent, Stylers stylers) { + public TagsCellEditor(Composite parent, int style, Stylers stylers) { super(parent); this.stylers = stylers; } - public TagsCellEditor(Composite parent, Stylers stylers, IContentProposalProvider contentProposalProvider, + public TagsCellEditor(Composite parent, int style, Stylers stylers, IContentProposalProvider contentProposalProvider, KeyStroke keyStroke, char[] autoActivationCharacters) { - super(parent, contentProposalProvider, keyStroke, autoActivationCharacters); + super(parent, style, contentProposalProvider, keyStroke, autoActivationCharacters); setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE); this.stylers = stylers; } diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagsEditor.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagsEditor.java index dff617a34..f3e03825e 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagsEditor.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/views/sections/TagsEditor.java @@ -29,14 +29,14 @@ public class TagsEditor extends StyledTextEditor { private Stylers stylers; - public TagsEditor(Composite parent, Stylers stylers) { - super(parent); + public TagsEditor(Composite parent, int style, Stylers stylers) { + super(parent, style); this.stylers = stylers; } - public TagsEditor(Composite parent, Stylers stylers, IContentProposalProvider contentProposalProvider, + public TagsEditor(Composite parent, int style, Stylers stylers, IContentProposalProvider contentProposalProvider, KeyStroke keyStroke, char[] autoActivationCharacters) { - super(parent, contentProposalProvider, keyStroke, autoActivationCharacters); + super(parent, style, contentProposalProvider, keyStroke, autoActivationCharacters); setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE); this.stylers = stylers; }