Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ics-software
phoebus
Commits
e46d68a3
Unverified
Commit
e46d68a3
authored
Jun 07, 2022
by
Georg Weiss
Committed by
GitHub
Jun 07, 2022
Browse files
Merge pull request #2288 from ControlSystemStudio/CSSTUDIO-1701
Bug fix rules dialog, probably due to JavaFX 18
parents
b60c82b2
ef2eacd7
Pipeline
#114115
passed with stage
in 11 minutes and 30 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
app/display/editor/src/main/java/org/csstudio/display/builder/editor/properties/RulesDialog.java
View file @
e46d68a3
...
...
@@ -81,7 +81,7 @@ import javafx.scene.layout.VBox;
public
class
RulesDialog
extends
Dialog
<
List
<
RuleInfo
>>
{
/** Expression info as property-based item for table */
pr
ivate
abstract
static
class
ExprItem
<
T
>
pr
otected
abstract
static
class
ExprItem
<
T
>
{
final
protected
StringProperty
boolExp
=
new
SimpleStringProperty
();
final
protected
SimpleObjectProperty
<
Node
>
field
=
new
SimpleObjectProperty
<>();
...
...
@@ -223,7 +223,7 @@ public class RulesDialog extends Dialog<List<RuleInfo>>
}
/** Modifiable RuleInfo */
pr
ivate
static
class
RuleItem
pr
otected
static
class
RuleItem
{
public
List
<
ExprItem
<?>>
expressions
;
public
List
<
PVTableItem
>
pvs
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment