Skip to content

Migrate away from terminally deprecated DecoratedField #1609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptziegler merged 1 commit into from
Sep 12, 2026
Merged

Migrate away from terminally deprecated DecoratedField #1609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...yout/src/org/eclipse/wb/internal/swing/MigLayout/model/ui/CellSpecificationComposite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011 Google, Inc.
* Copyright (c) 2011, 2026 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -60,7 +60,7 @@ public CellSpecificationComposite(Composite parent) {
setLayout(new FillLayout());
// prepare field/widget
m_field = new ErrorMessageTextField(this, SWT.BORDER);
m_textWidget = (Text) m_field.getControl();
m_textWidget = m_field.getControl();
// listen for modification
m_textWidget.addListener(SWT.Modify, m_listener);
}
Expand Down
4 changes: 2 additions & 2 deletions ...src/org/eclipse/wb/internal/swing/MigLayout/model/ui/DimensionSpecificationComposite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011 Google, Inc.
* Copyright (c) 2011, 2026 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -50,7 +50,7 @@ public DimensionSpecificationComposite(Composite parent) {
setLayout(new FillLayout());
// prepare field/widget
m_field = new ErrorMessageTextField(this, SWT.BORDER);
m_textWidget = (Text) m_field.getControl();
m_textWidget = m_field.getControl();
// listen for modification
m_textWidget.addListener(SWT.Modify, m_listener);
}
Expand Down
8 changes: 4 additions & 4 deletions ...gLayout/src/org/eclipse/wb/internal/swing/MigLayout/model/ui/DimensionUnitValueField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011 Google, Inc.
* Copyright (c) 2011, 2026 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -13,10 +13,10 @@
package org.eclipse.wb.internal.swing.MigLayout.model.ui;

import org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils;
import org.eclipse.wb.internal.core.utils.ui.GridDataFactory;
import org.eclipse.wb.internal.swing.MigLayout.model.MigDimensionInfo;

import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
Expand Down Expand Up @@ -83,8 +83,8 @@ public void handleEvent(Event event) {
}
// prepare field/widget
m_field = new ErrorMessageTextField(parent, SWT.BORDER);
GridDataFactory.create(m_field.getLayoutControl()).grabH().fillH();
m_textWidget = (Text) m_field.getControl();
m_textWidget = m_field.getControl();
m_textWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
// listen for modification
m_textWidget.addListener(SWT.Modify, m_modifyListener);
}
Expand Down
49 changes: 18 additions & 31 deletions ...MigLayout/src/org/eclipse/wb/internal/swing/MigLayout/model/ui/ErrorMessageTextField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011 Google, Inc.
* Copyright (c) 2011, 2026 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand All @@ -12,53 +12,45 @@
*******************************************************************************/
package org.eclipse.wb.internal.swing.MigLayout.model.ui;

import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.jface.fieldassist.FieldDecoration;
import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;

/**
* Special {@link org.eclipse.jface.fieldassist.DecoratedField} that can show optional error message
* in top-right corner.
* Special text field that can show optional error message in top-right corner.
*
* @author scheglov_ke
* @coverage swing.MigLayout.ui
*/
@SuppressWarnings("deprecation")
public class ErrorMessageTextField extends org.eclipse.jface.fieldassist.DecoratedField {
private final FieldDecoration m_fieldDecoration;
public class ErrorMessageTextField {
private final ControlDecoration m_controlDecoration;
private final Text m_control;

////////////////////////////////////////////////////////////////////////////
//
// Constructor
//
////////////////////////////////////////////////////////////////////////////
public ErrorMessageTextField(Composite parent, int style) {
super(parent, style, new org.eclipse.jface.fieldassist.TextControlCreator());
m_control = new Text(parent, style);
// prepare decoration
{
FieldDecoration standardDecoration =
FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);
m_fieldDecoration = new FieldDecoration(standardDecoration.getImage(), "");
}
FieldDecoration standardDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR);
m_controlDecoration = new ControlDecoration(m_control, SWT.TOP | SWT.RIGHT);
m_controlDecoration.setImage(standardDecoration.getImage());
m_controlDecoration.hide();
}

////////////////////////////////////////////////////////////////////////////
//
// Access
//
////////////////////////////////////////////////////////////////////////////
@Override
public Control getLayoutControl() {
return super.getLayoutControl();
}

@Override
public Control getControl() {
return super.getControl();
public Text getControl() {
return m_control;
}

/**
Expand All @@ -69,16 +61,11 @@ public Control getControl() {
*/
public void setErrorMessage(String message) {
if (message != null) {
addFieldDecoration(m_fieldDecoration, SWT.TOP | SWT.RIGHT, false);
m_fieldDecoration.setDescription(message);
m_controlDecoration.setDescriptionText(message);
m_controlDecoration.show();
} else {
hideDecoration(m_fieldDecoration);
// note, that we use knowledge about implementation of DecoratedField (that it uses FormLayout)
{
FormData data = (FormData) getControl().getLayoutData();
data.right = new FormAttachment(100, 0);
}
getControl().getParent().layout();
m_controlDecoration.setDescriptionText(null);
m_controlDecoration.hide();
}
}
}
Loading