From 6d7c717c374d87f2d9d0350c71a262bf6b67fb0f Mon Sep 17 00:00:00 2001 From: SHARMA Parveen Date: Tue, 8 Aug 2023 16:33:51 +0800 Subject: [PATCH 1/4] Updated private fields to protected --- .../formsfx/view/controls/SimpleComboBoxControl.java | 6 +++--- .../formsfx/view/controls/SimpleListViewControl.java | 4 ++-- .../formsfx/view/controls/SimpleNumberControl.java | 4 ++-- .../formsfx/view/controls/SimpleTextControl.java | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleComboBoxControl.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleComboBoxControl.java index adfbc360..1bf53f91 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleComboBoxControl.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleComboBoxControl.java @@ -47,9 +47,9 @@ public class SimpleComboBoxControl extends SimpleControl comboBox; - private Label readOnlyLabel; + protected Label fieldLabel; + protected ComboBox comboBox; + protected Label readOnlyLabel; /** * Constructs a SimpleComboBoxControl of {@link SimpleComboBoxControl} type, with visibility condition. diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleListViewControl.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleListViewControl.java index aa9f738e..ccd144ab 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleListViewControl.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleListViewControl.java @@ -44,12 +44,12 @@ public class SimpleListViewControl * the field. * - The node is the container that displays list values. */ - private Label fieldLabel; + protected Label fieldLabel; /** * The flag used for setting the selection properly. */ - private boolean preventUpdate; + protected boolean preventUpdate; /** * Constructs a SimpleListViewControl of {@link SimpleListViewControl} type, with visibility condition. diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleNumberControl.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleNumberControl.java index afa746d9..8d37c08e 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleNumberControl.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleNumberControl.java @@ -44,9 +44,9 @@ public abstract class SimpleNumberControl * - The editableSpinner is a Spinner for setting numerical values. * - The readOnlyLabel is the label to put over editableSpinner. */ - private Label fieldLabel; + protected Label fieldLabel; protected Spinner editableSpinner; - private Label readOnlyLabel; + protected Label readOnlyLabel; /** * {@inheritDoc} diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleTextControl.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleTextControl.java index 16cf3538..6d329977 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleTextControl.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleTextControl.java @@ -46,10 +46,10 @@ public class SimpleTextControl extends SimpleControl { * - The editableField allows users to modify the field's value. * - The readOnlyLabel displays the field's value if it is not editable. */ - private TextField editableField; - private TextArea editableArea; - private Label readOnlyLabel; - private Label fieldLabel; + protected TextField editableField; + protected TextArea editableArea; + protected Label readOnlyLabel; + protected Label fieldLabel; /** * Constructs a SimpleTextControl of {@link SimpleTextControl} type, with visibility condition. From 9c378b08130de72a6ee4d975e8ef34fcfb006fc8 Mon Sep 17 00:00:00 2001 From: SHARMA Parveen Date: Tue, 8 Aug 2023 16:58:52 +0800 Subject: [PATCH 2/4] Updated private methods to protected --- .../formsfx/view/controls/SimpleCheckBoxControl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleCheckBoxControl.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleCheckBoxControl.java index 4fa6fe21..c26f5e66 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleCheckBoxControl.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleCheckBoxControl.java @@ -43,7 +43,7 @@ public class SimpleCheckBoxControl extends SimpleControl checkboxes = new ArrayList<>(); + public final List checkboxes = new ArrayList<>(); /** * Constructs a SimpleCheckBoxControl of {@link SimpleCheckBoxControl} type, with visibility condition. @@ -137,7 +137,7 @@ public void setupEventHandlers() { * This method creates node and adds them to checkboxes and is * used when the itemsProperty on the field changes. */ - private void createCheckboxes() { + public void createCheckboxes() { node.getChildren().clear(); checkboxes.clear(); @@ -156,7 +156,7 @@ private void createCheckboxes() { /** * Sets up bindings for all checkboxes. */ - private void setupCheckboxBindings() { + public void setupCheckboxBindings() { for (CheckBox checkbox : checkboxes) { checkbox.disableProperty().bind(field.editableProperty().not()); } @@ -165,7 +165,7 @@ private void setupCheckboxBindings() { /** * Sets up event handlers for all checkboxes. */ - private void setupCheckboxEventHandlers() { + public void setupCheckboxEventHandlers() { for (int i = 0; i < checkboxes.size(); i++) { final int j = i; From cec7ba199d2d225cb768449b42f73e38d17c7650 Mon Sep 17 00:00:00 2001 From: SHARMA Parveen Date: Tue, 8 Aug 2023 17:04:12 +0800 Subject: [PATCH 3/4] Updated private methods to protected --- .../formsfx/view/controls/SimpleCheckBoxControl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleCheckBoxControl.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleCheckBoxControl.java index c26f5e66..70a7a2d2 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleCheckBoxControl.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleCheckBoxControl.java @@ -43,7 +43,7 @@ public class SimpleCheckBoxControl extends SimpleControl checkboxes = new ArrayList<>(); + protected final List checkboxes = new ArrayList<>(); /** * Constructs a SimpleCheckBoxControl of {@link SimpleCheckBoxControl} type, with visibility condition. @@ -137,7 +137,7 @@ public void setupEventHandlers() { * This method creates node and adds them to checkboxes and is * used when the itemsProperty on the field changes. */ - public void createCheckboxes() { + protected void createCheckboxes() { node.getChildren().clear(); checkboxes.clear(); @@ -156,7 +156,7 @@ public void createCheckboxes() { /** * Sets up bindings for all checkboxes. */ - public void setupCheckboxBindings() { + protected void setupCheckboxBindings() { for (CheckBox checkbox : checkboxes) { checkbox.disableProperty().bind(field.editableProperty().not()); } @@ -165,7 +165,7 @@ public void setupCheckboxBindings() { /** * Sets up event handlers for all checkboxes. */ - public void setupCheckboxEventHandlers() { + protected void setupCheckboxEventHandlers() { for (int i = 0; i < checkboxes.size(); i++) { final int j = i; From 9853c928ea3fbdc9af6c8b4fb76e65114d633334 Mon Sep 17 00:00:00 2001 From: SHARMA Parveen Date: Wed, 9 Aug 2023 11:41:23 +0800 Subject: [PATCH 4/4] Updated private modifiers to protected --- .../formsfx/view/controls/DoubleSliderControl.java | 4 ++-- .../formsfx/view/controls/IntegerSliderControl.java | 6 +++--- .../formsfx/view/controls/SimpleChooserControl.java | 8 ++++---- .../formsfx/view/controls/SimpleColorPickerControl.java | 2 +- .../formsfx/view/controls/SimpleRadioButtonControl.java | 6 +++--- .../formsfx/view/renderer/PreferencesFxFormRenderer.java | 4 ++-- .../formsfx/view/renderer/PreferencesFxGroup.java | 2 +- .../formsfx/view/renderer/PreferencesFxGroupRenderer.java | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/DoubleSliderControl.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/DoubleSliderControl.java index fe35d3e1..51c2a8b2 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/DoubleSliderControl.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/DoubleSliderControl.java @@ -26,8 +26,8 @@ public class DoubleSliderControl extends SimpleControl { * - slider is the control to change the value. * - node holds the control so that it can be styled properly. */ - private Slider slider; - private Label valueLabel; + protected Slider slider; + protected Label valueLabel; private double min; private double max; private int precision; diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/IntegerSliderControl.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/IntegerSliderControl.java index 4699d09a..1bcfba16 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/IntegerSliderControl.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/IntegerSliderControl.java @@ -23,9 +23,9 @@ public class IntegerSliderControl extends SimpleControl { * - slider is the control to change the value. * - container holds the control so that it can be styled properly. */ - private Label fieldLabel; - private Slider slider; - private Label valueLabel; + protected Label fieldLabel; + protected Slider slider; + protected Label valueLabel; private int min; private int max; diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleChooserControl.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleChooserControl.java index dee718b3..ef9f68a2 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleChooserControl.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleChooserControl.java @@ -55,10 +55,10 @@ public class SimpleChooserControl extends SimpleControl * editableField allows users to modify the field's value. - The readOnlyLabel displays the * field's value if it is not editable. */ - private TextField editableField; - private TextArea editableArea; - private Label readOnlyLabel; - private Label fieldLabel; + protected TextField editableField; + protected TextArea editableArea; + protected Label readOnlyLabel; + protected Label fieldLabel; private Button chooserButton = new Button(); private HBox contentBox = new HBox(); private String buttonText; diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleColorPickerControl.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleColorPickerControl.java index d77f07ea..44c8db39 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleColorPickerControl.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleColorPickerControl.java @@ -45,7 +45,7 @@ public class SimpleColorPickerControl extends SimpleControl extends SimpleControl radioButtons = new ArrayList<>(); - private ToggleGroup toggleGroup; + protected final List radioButtons = new ArrayList<>(); + protected ToggleGroup toggleGroup; - private Label fieldLabel; + protected Label fieldLabel; /** * Constructs a SimpleRadioButtonControl of {@link SimpleRadioButtonControl} type, with visibility condition. diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxFormRenderer.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxFormRenderer.java index c0d31091..ebc8cf70 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxFormRenderer.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxFormRenderer.java @@ -23,8 +23,8 @@ public class PreferencesFxFormRenderer extends GridPane implements ViewMixin { */ public static final double SPACING = 5; - private final Form form; - private List groups = new ArrayList<>(); + protected final Form form; + protected List groups = new ArrayList<>(); /** * This is the constructor to pass over data. diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxGroup.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxGroup.java index ccab980c..060beb55 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxGroup.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxGroup.java @@ -55,7 +55,7 @@ public class PreferencesFxGroup extends Group { /** * {@inheritDoc} */ - private PreferencesFxGroup(Element... elements) { + protected PreferencesFxGroup(Element... elements) { super(elements); // Whenever the title's key changes, update the displayed value based diff --git a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxGroupRenderer.java b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxGroupRenderer.java index de5f74c8..fa68b7fe 100644 --- a/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxGroupRenderer.java +++ b/preferencesfx/src/main/java/com/dlsc/preferencesfx/formsfx/view/renderer/PreferencesFxGroupRenderer.java @@ -41,7 +41,7 @@ public class PreferencesFxGroupRenderer { * * @param preferencesGroup The PreferencesGroup which gets rendered. */ - PreferencesFxGroupRenderer(PreferencesFxGroup preferencesGroup, GridPane grid) { + protected PreferencesFxGroupRenderer(PreferencesFxGroup preferencesGroup, GridPane grid) { this.preferencesGroup = preferencesGroup; this.grid = grid; preferencesGroup.setRenderer(this);