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 aa3fc847 EMPIREDB-439 ControlTag small improvment
aa3fc847 is described below
commit aa3fc847dcd796c058258d860374fa57e4c1f0f5
Author: Rainer Döbele <[email protected]>
AuthorDate: Sun Oct 13 20:25:46 2024 +0200
EMPIREDB-439
ControlTag small improvment
---
.../org/apache/empire/jakarta/components/ControlTag.java | 16 ++++++++--------
.../org/apache/empire/jsf2/components/ControlTag.java | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/ControlTag.java
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/ControlTag.java
index 710fa64f..020379fb 100644
---
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/ControlTag.java
+++
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/ControlTag.java
@@ -51,13 +51,13 @@ public class ControlTag extends UIInput implements
NamingContainer
*/
public static abstract class ControlSeparatorComponent extends
UIComponentBase
{
- private ControlTag control = null;
+ protected ControlTag control = null;
protected String tagName = null;
protected abstract String getTagName(ControlRenderInfo renderInfo);
- protected abstract void writeAttributes(ResponseWriter writer,
ControlRenderInfo renderInfo, TagEncodingHelper helper)
+ protected abstract void writeAttributes(ResponseWriter writer)
throws IOException;
@Override
@@ -94,7 +94,7 @@ public class ControlTag extends UIInput implements
NamingContainer
{ // render tag
ResponseWriter writer = context.getResponseWriter();
writer.startElement(tagName, this);
- writeAttributes(writer, this.control.renderInfo,
this.control.helper);
+ writeAttributes(writer);
}
}
@@ -128,11 +128,11 @@ public class ControlTag extends UIInput implements
NamingContainer
}
@Override
- protected void writeAttributes(ResponseWriter writer,
ControlRenderInfo renderInfo, TagEncodingHelper helper)
+ protected void writeAttributes(ResponseWriter writer)
throws IOException
{
// forward to renderInfo
- renderInfo.writeLabelWrapperAttributes(writer, helper);
+ control.renderInfo.writeLabelWrapperAttributes(writer,
control.helper);
}
@Override
@@ -160,11 +160,11 @@ public class ControlTag extends UIInput implements
NamingContainer
}
@Override
- protected void writeAttributes(ResponseWriter writer,
ControlRenderInfo renderInfo, TagEncodingHelper helper)
+ protected void writeAttributes(ResponseWriter writer)
throws IOException
{
// forward to renderInfo
- renderInfo.writeInputWrapperAttributes(writer, helper);
+ control.renderInfo.writeInputWrapperAttributes(writer,
control.helper);
}
@Override
@@ -172,7 +172,7 @@ public class ControlTag extends UIInput implements
NamingContainer
throws IOException
{
// encode input components
- getControl().renderInput(context, this);
+ control.renderInput(context, this);
// don't call super.encodeChildren()!
}
}
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
index 54505037..58f2e86f 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
@@ -51,13 +51,13 @@ public class ControlTag extends UIInput implements
NamingContainer
*/
public static abstract class ControlSeparatorComponent extends
UIComponentBase
{
- private ControlTag control = null;
+ protected ControlTag control = null;
protected String tagName = null;
protected abstract String getTagName(ControlRenderInfo renderInfo);
- protected abstract void writeAttributes(ResponseWriter writer,
ControlRenderInfo renderInfo, TagEncodingHelper helper)
+ protected abstract void writeAttributes(ResponseWriter writer)
throws IOException;
@Override
@@ -94,7 +94,7 @@ public class ControlTag extends UIInput implements
NamingContainer
{ // render tag
ResponseWriter writer = context.getResponseWriter();
writer.startElement(tagName, this);
- writeAttributes(writer, this.control.renderInfo,
this.control.helper);
+ writeAttributes(writer);
}
}
@@ -128,11 +128,11 @@ public class ControlTag extends UIInput implements
NamingContainer
}
@Override
- protected void writeAttributes(ResponseWriter writer,
ControlRenderInfo renderInfo, TagEncodingHelper helper)
+ protected void writeAttributes(ResponseWriter writer)
throws IOException
{
// forward to renderInfo
- renderInfo.writeLabelWrapperAttributes(writer, helper);
+ control.renderInfo.writeLabelWrapperAttributes(writer,
control.helper);
}
@Override
@@ -160,11 +160,11 @@ public class ControlTag extends UIInput implements
NamingContainer
}
@Override
- protected void writeAttributes(ResponseWriter writer,
ControlRenderInfo renderInfo, TagEncodingHelper helper)
+ protected void writeAttributes(ResponseWriter writer)
throws IOException
{
// forward to renderInfo
- renderInfo.writeInputWrapperAttributes(writer, helper);
+ control.renderInfo.writeInputWrapperAttributes(writer,
control.helper);
}
@Override
@@ -172,7 +172,7 @@ public class ControlTag extends UIInput implements
NamingContainer
throws IOException
{
// encode input components
- getControl().renderInput(context, this);
+ control.renderInput(context, this);
// don't call super.encodeChildren()!
}
}
