You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2025/05/22 07:05:50 UTC
(empire-db) branch master updated: EMPIREDB-465 InputControl: setInputStyleClass changed order of parameters
This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new 68e804ad EMPIREDB-465 InputControl: setInputStyleClass changed order of parameters
68e804ad is described below
commit 68e804ad11a88160872190be4e0733f8da3d2e3c
Author: Rainer Döbele <do...@apache.org>
AuthorDate: Thu May 22 09:05:46 2025 +0200
EMPIREDB-465
InputControl: setInputStyleClass changed order of parameters
---
.../org/apache/empire/jakarta/custom/controls/FileInputControl.java | 6 ++++--
.../org/apache/empire/jsf2/custom/controls/FileInputControl.java | 6 ++++--
.../org/apache/empire/jakarta/controls/CheckboxInputControl.java | 2 +-
.../main/java/org/apache/empire/jakarta/controls/InputControl.java | 2 +-
.../java/org/apache/empire/jakarta/controls/RadioInputControl.java | 4 ++--
.../java/org/apache/empire/jakarta/controls/SelectInputControl.java | 4 ++--
.../org/apache/empire/jakarta/controls/TextAreaInputControl.java | 2 +-
.../java/org/apache/empire/jakarta/controls/TextInputControl.java | 2 +-
.../java/org/apache/empire/jsf2/controls/CheckboxInputControl.java | 2 +-
.../src/main/java/org/apache/empire/jsf2/controls/InputControl.java | 2 +-
.../java/org/apache/empire/jsf2/controls/RadioInputControl.java | 4 ++--
.../java/org/apache/empire/jsf2/controls/SelectInputControl.java | 4 ++--
.../java/org/apache/empire/jsf2/controls/TextAreaInputControl.java | 2 +-
.../main/java/org/apache/empire/jsf2/controls/TextInputControl.java | 2 +-
14 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/empire-db-examples/empire-db-example-jakarta-faces/src/main/java/org/apache/empire/jakarta/custom/controls/FileInputControl.java b/empire-db-examples/empire-db-example-jakarta-faces/src/main/java/org/apache/empire/jakarta/custom/controls/FileInputControl.java
index 42286a81..5101d243 100644
--- a/empire-db-examples/empire-db-example-jakarta-faces/src/main/java/org/apache/empire/jakarta/custom/controls/FileInputControl.java
+++ b/empire-db-examples/empire-db-example-jakarta-faces/src/main/java/org/apache/empire/jakarta/custom/controls/FileInputControl.java
@@ -65,7 +65,7 @@ public class FileInputControl extends InputControl
}
compList.add(input);
// update
- updateInputState(compList, ii, context, context.getCurrentPhaseId());
+ updateInputState(compList, ii, context, PhaseId.RENDER_RESPONSE);
}
@Override
@@ -81,7 +81,9 @@ public class FileInputControl extends InputControl
input.setDisabled(ii.isDisabled());
// set value
if (phaseId==PhaseId.RENDER_RESPONSE)
- { // set value
+ { // set styles
+ setInputStyleClass(input, ii);
+ // set value
setInputValue(input, ii);
}
}
diff --git a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/custom/controls/FileInputControl.java b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/custom/controls/FileInputControl.java
index aef7ecb8..6da07ac3 100644
--- a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/custom/controls/FileInputControl.java
+++ b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/custom/controls/FileInputControl.java
@@ -65,7 +65,7 @@ public class FileInputControl extends InputControl
}
compList.add(input);
// update
- updateInputState(compList, ii, context, context.getCurrentPhaseId());
+ updateInputState(compList, ii, context, PhaseId.RENDER_RESPONSE);
}
@Override
@@ -81,7 +81,9 @@ public class FileInputControl extends InputControl
input.setDisabled(ii.isDisabled());
// set value
if (phaseId==PhaseId.RENDER_RESPONSE)
- { // set value
+ { // set styles
+ setInputStyleClass(input, ii);
+ // set value
setInputValue(input, ii);
}
}
diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/CheckboxInputControl.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/CheckboxInputControl.java
index f3723e4a..6aceb412 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/CheckboxInputControl.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/CheckboxInputControl.java
@@ -101,7 +101,7 @@ public class CheckboxInputControl extends InputControl
// check phase
if (phaseId==PhaseId.RENDER_RESPONSE)
{ // style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// set value
setInputValue(input, ii);
}
diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/InputControl.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/InputControl.java
index 39ca9b68..90f1466e 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/InputControl.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/InputControl.java
@@ -680,7 +680,7 @@ public abstract class InputControl
input.getAttributes().put(InputControl.CSS_STYLE_CLASS, cssStyleClass);
}
- protected final void setInputStyleClass(InputInfo ii, UIInput input)
+ protected void setInputStyleClass(UIInput input, InputInfo ii)
{
String addlStyles = null;
if (ii.isRequired())
diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/RadioInputControl.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/RadioInputControl.java
index 3cc434ac..d04a9f30 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/RadioInputControl.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/RadioInputControl.java
@@ -131,7 +131,7 @@ public class RadioInputControl extends InputControl
// add
compList.add(input);
// style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// Set Value
setInputValue(input, ii);
}
@@ -158,7 +158,7 @@ public class RadioInputControl extends InputControl
}
if (phaseId==PhaseId.RENDER_RESPONSE)
{ // style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// set value
setInputValue(input, ii);
}
diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/SelectInputControl.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/SelectInputControl.java
index 412b22e8..181a8267 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/SelectInputControl.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/SelectInputControl.java
@@ -120,7 +120,7 @@ public class SelectInputControl extends InputControl
// add
compList.add(input);
// style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// Set Value
setInputValue(input, ii);
}
@@ -143,7 +143,7 @@ public class SelectInputControl extends InputControl
}
if (phaseId==PhaseId.RENDER_RESPONSE)
{ // style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// set value
setInputValue(input, ii);
}
diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextAreaInputControl.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextAreaInputControl.java
index 0506046b..63a3c257 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextAreaInputControl.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextAreaInputControl.java
@@ -117,7 +117,7 @@ public class TextAreaInputControl extends InputControl
// Set Value
if (phaseId==PhaseId.RENDER_RESPONSE)
{ // style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// set value
setInputValue(input, ii);
}
diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextInputControl.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextInputControl.java
index 9e51f5c7..89502b8f 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextInputControl.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextInputControl.java
@@ -242,7 +242,7 @@ public class TextInputControl extends InputControl
// set value
if (phaseId==PhaseId.RENDER_RESPONSE)
{ // style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// set value
setInputValue(input, ii);
}
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/CheckboxInputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/CheckboxInputControl.java
index 3bd2a171..9fa4d97e 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/CheckboxInputControl.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/CheckboxInputControl.java
@@ -101,7 +101,7 @@ public class CheckboxInputControl extends InputControl
// check phase
if (phaseId==PhaseId.RENDER_RESPONSE)
{ // style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// set value
setInputValue(input, ii);
}
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java
index 12cf1fb3..55f6d3c0 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java
@@ -680,7 +680,7 @@ public abstract class InputControl
input.getAttributes().put(InputControl.CSS_STYLE_CLASS, cssStyleClass);
}
- protected void setInputStyleClass(InputInfo ii, UIInput input)
+ protected void setInputStyleClass(UIInput input, InputInfo ii)
{
String addlStyles = null;
if (ii.isRequired())
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/RadioInputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/RadioInputControl.java
index 4921db37..4c302ca5 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/RadioInputControl.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/RadioInputControl.java
@@ -131,7 +131,7 @@ public class RadioInputControl extends InputControl
// add
compList.add(input);
// style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// Set Value
setInputValue(input, ii);
}
@@ -158,7 +158,7 @@ public class RadioInputControl extends InputControl
}
if (phaseId==PhaseId.RENDER_RESPONSE)
{ // style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// set value
setInputValue(input, ii);
}
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
index 6ea7b82a..6da1c16e 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
@@ -120,7 +120,7 @@ public class SelectInputControl extends InputControl
// add
compList.add(input);
// style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// Set Value
setInputValue(input, ii);
}
@@ -143,7 +143,7 @@ public class SelectInputControl extends InputControl
}
if (phaseId==PhaseId.RENDER_RESPONSE)
{ // style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// set value
setInputValue(input, ii);
}
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextAreaInputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextAreaInputControl.java
index 7e2e73c8..88fdceea 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextAreaInputControl.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextAreaInputControl.java
@@ -117,7 +117,7 @@ public class TextAreaInputControl extends InputControl
// Set Value
if (phaseId==PhaseId.RENDER_RESPONSE)
{ // style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// set value
setInputValue(input, ii);
}
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java
index 8e457b0d..86723727 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java
@@ -242,7 +242,7 @@ public class TextInputControl extends InputControl
// set value
if (phaseId==PhaseId.RENDER_RESPONSE)
{ // style
- setInputStyleClass(ii, input);
+ setInputStyleClass(input, ii);
// set value
setInputValue(input, ii);
}