Skip to content

Update TableWidget editable properties consistently #3817

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

Open
georgweiss wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update TableWidget editable properties consistently #3817

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
082c48a
Make table widget read-only if all columns are read-only
georgweiss Jun 2, 2026
2f09457
Consistent update of TabelWidget editable changes between table and c…
georgweiss Jun 2, 2026
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
25 changes: 24 additions & 1 deletion .../java/org/csstudio/display/builder/representation/javafx/widgets/TableRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;

import org.csstudio.display.builder.model.DirtyFlag;
import org.csstudio.display.builder.model.UntypedWidgetPropertyListener;
Expand Down Expand Up @@ -52,6 +53,7 @@
private final WidgetPropertyListener<List<ColumnProperty>> columnsListener = this::columnsChanged;
private final WidgetPropertyListener<Object> valueListener = this::valueChanged;
private final WidgetPropertyListener<List<List<WidgetColor>>> colorsListener = this::cellColorsChanged;
private final WidgetPropertyListener<Boolean> tableEditableListener = this::tableEditableChanged;

/** Most recent column headers */
private volatile List<String> headers = Collections.emptyList();
Expand All @@ -68,7 +70,6 @@
private volatile boolean updating_table = false;

/** Listener for any changes in any column
*
* Triggers update of headers and column configuration
*/
private final UntypedWidgetPropertyListener column_listener = (WidgetProperty<?> property, Object old_value, Object new_value) ->
Expand All @@ -78,6 +79,12 @@
final List<String> new_headers = new ArrayList<>();
for (ColumnProperty column : model_widget.propColumns().getValue())
new_headers.add(column.name().getValue());

// If all columns are marked as non-editable, then mark the entire table as non-editable
Optional<ColumnProperty> anyColumnEditable = model_widget.propColumns().getValue()
.stream().filter(columnProperty -> columnProperty.editable().getValue()).findFirst();
model_widget.propEditable().setValue(anyColumnEditable.isPresent());

headers = new_headers;
dirty_columns.mark();
toolkit.scheduleUpdate(this);
Expand Down Expand Up @@ -163,6 +170,7 @@
model_widget.propToolbar().addUntypedPropertyListener(styleListener);
model_widget.propRowSelectionMode().addUntypedPropertyListener(styleListener);
model_widget.runtimePropSetSelection().addPropertyListener(selectionListener);
model_widget.propEditable().addPropertyListener(tableEditableListener);

columnsChanged(model_widget.propColumns(), null, model_widget.propColumns().getValue());
model_widget.propColumns().addPropertyListener(columnsListener);
Expand All @@ -182,6 +190,7 @@
model_widget.propToolbar().removePropertyListener(styleListener);
model_widget.propRowSelectionMode().removePropertyListener(styleListener);
model_widget.runtimePropSetSelection().removePropertyListener(selectionListener);
model_widget.propEditable().removePropertyListener(tableEditableListener);

model_widget.propColumns().removePropertyListener(columnsListener);
columnsChanged(model_widget.propColumns(), model_widget.propColumns().getValue(), null);
Expand Down Expand Up @@ -371,4 +380,18 @@
if (dirty_set_selection.checkAndClear())
jfx_node.setSelection(model_widget.runtimePropSetSelection().getValue());
}

/**
* Listener for the Enabled property of the table widget. If user chooses to make the table non-editable,
* then all columns should be marked as non-editable.
* @param property {@link WidgetProperty} for the table
* @param oldValue Previous value
* @param newValue New value
*/
private void tableEditableChanged(final WidgetProperty<Boolean> property, final Boolean oldValue, final Boolean newValue ){
if(!newValue){

Check warning on line 392 in app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/TableRepresentation.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use a primitive boolean expression here. 


See more on https://sonarcloud.io/project/issues?id=ControlSystemStudio_phoebus&issues=AZ6IRBQmgiolgtInDEmt&open=AZ6IRBQmgiolgtInDEmt&pullRequest=3817
model_widget.propColumns().getValue().forEach(column ->
column.editable().setValue(false));
}
}
}
Loading