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 3b90b4c EMPIREDB-317 Code cleanup
3b90b4c is described below
commit 3b90b4c42b3c30e9a90ae9ac3e74be0e68af3a59
Author: Rainer Döbele <[email protected]>
AuthorDate: Tue Nov 5 19:52:03 2019 +0100
EMPIREDB-317
Code cleanup
---
.../org/apache/empire/jsf2/components/ControlTag.java | 4 +++-
.../org/apache/empire/jsf2/components/InputTag.java | 4 +++-
.../org/apache/empire/jsf2/components/LinkTag.java | 1 +
.../org/apache/empire/jsf2/components/ValueTag.java | 1 -
.../apache/empire/jsf2/utils/TagEncodingHelper.java | 19 ++++++++++---------
5 files changed, 17 insertions(+), 12 deletions(-)
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 eaef04b..752b8d9 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
@@ -261,6 +261,7 @@ public class ControlTag extends UIInput implements
NamingContainer
return false;
}
// control = ;
+ helper.prepareData();
this.control = helper.getInputControl();
this.inpInfo = helper.getInputInfo(context);
return (this.control != null && this.inpInfo != null);
@@ -302,7 +303,6 @@ public class ControlTag extends UIInput implements
NamingContainer
// init
helper.encodeBegin();
this.control = helper.getInputControl();
-
boolean isCustomInput = isCustomInput();
// LabelSeparatorComponent
@@ -426,6 +426,8 @@ public class ControlTag extends UIInput implements
NamingContainer
// give control chance to update
if (hasChanged && log.isDebugEnabled())
log.debug("Changing UIInput readOnly state for {} to {}",
helper.getColumnName(), readOnly);
+ // check record
+ helper.prepareData();
if (this.control==null)
this.control = helper.getInputControl();
if (this.inpInfo==null)
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
index 2e6fe6a..d4708d7 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
@@ -101,6 +101,7 @@ public class InputTag extends UIInput implements
NamingContainer
return false;
}
// Init Control and inputInfo;
+ helper.prepareData();
control = helper.getInputControl();
inpInfo = helper.getInputInfo(context);
return (control != null && inpInfo != null);
@@ -141,7 +142,6 @@ public class InputTag extends UIInput implements
NamingContainer
// get Control (before checking visible)
helper.encodeBegin();
- this.control = helper.getInputControl();
// Check visibility
if (helper.isVisible() == false)
@@ -168,6 +168,7 @@ public class InputTag extends UIInput implements
NamingContainer
}
// render
+ this.control = helper.getInputControl();
this.inpInfo = helper.getInputInfo(context);
// set required
if (hasRequiredFlagSet == false)
@@ -231,6 +232,7 @@ public class InputTag extends UIInput implements
NamingContainer
boolean readOnly = helper.isRecordReadOnly();
setRenderInput(!readOnly);
// get control
+ helper.prepareData();
if (control==null)
control = helper.getInputControl();
if (inpInfo==null)
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LinkTag.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LinkTag.java
index a14732c..53312f7 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LinkTag.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LinkTag.java
@@ -227,6 +227,7 @@ public class LinkTag extends UIOutput // implements
NamingContainer
// Is a column provided?
if (hasColumn)
{
+ helper.prepareData();
InputControl control = helper.getInputControl();
InputControl.ValueInfo vi =
helper.getValueInfo(FacesContext.getCurrentInstance());
// render value
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ValueTag.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ValueTag.java
index 78c15d9..15b20ee 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ValueTag.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ValueTag.java
@@ -55,7 +55,6 @@ public class ValueTag extends UIOutput // implements
NamingContainer
public void encodeBegin(FacesContext context)
throws IOException
{
-
// add label and input components when the view is loaded for the
first time
super.encodeBegin(context);
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
index 0459c47..c28bb2e 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
@@ -440,15 +440,22 @@ public class TagEncodingHelper implements NamingContainer
}
*/
}
+ // check record
+ checkRecord();
+ }
+
+ public void prepareData()
+ {
+ checkRecord();
}
- protected static final String PH_COLUMN_NAME = "{column}"; // placeholder
for column name
- protected static final String PH_COLUMN_FULL = "{COLUMN}"; // placeholder
for column full name including table
+ protected static final String PH_COLUMN_NAME = "@"; // placeholder for
column name
+ protected static final String PH_COLUMN_FULL = "&"; // placeholder for
column full name including table
public String completeInputTagId(String id)
{
// EmptyString or AT
- if (StringUtils.isEmpty(id) || "@".equals(id))
+ if (StringUtils.isEmpty(id) || PH_COLUMN_NAME.equals(id))
return getColumnName();
// replace placeholder
if (id.indexOf(PH_COLUMN_NAME)>=0)
@@ -472,11 +479,6 @@ public class TagEncodingHelper implements NamingContainer
public InputControl getInputControl()
{
- if (control != null)
- { // Must check record!
- checkRecord();
- return control;
- }
// Create
if (getColumn() == null)
throw new NotSupportedException(this, "getInputControl");
@@ -494,7 +496,6 @@ public class TagEncodingHelper implements NamingContainer
// detect Control
control = detectInputControl(controlType, column.getDataType(),
column.getOptions()!=null);
// check record
- checkRecord();
return control;
}
