EMPIREDB-282
Allow overrides
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
index 91afd9f..8c94cf7 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
@@ -100,7 +100,7 @@
if (field==null || field.length()==0 || field.charAt(0)<'A' || field.charAt(0)>'Z')
return null;
// try to find field
- int index = ((Record)base).getFieldIndex(field);
+ int index = ((RecordData)base).getFieldIndex(field);
if (index<0)
{ // not a field, it may be a property
log.warn("ELResolver warning: field '{}' not found in record .", field);
@@ -109,7 +109,7 @@
}
// Found! Return field value.
context.setPropertyResolved(true);
- return ((Record)base).getValue(index);
+ return ((RecordData)base).getValue(index);
}
else if (base==null)
{ // LookupDatabase
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 1b67060..935a555 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
@@ -551,6 +551,16 @@
return inp;
}
+ protected String getInputStyleClass(InputInfo ii, String additonalStyle)
+ {
+ return ii.getStyleClass(additonalStyle);
+ }
+
+ protected void setInputStyleClass(UIInput input, String cssStyleClass)
+ {
+ input.getAttributes().put("styleClass", cssStyleClass);
+ }
+
protected void copyAttributes(UIComponent parent, InputInfo ii, UIInput input, String additonalStyle)
{
String inputId = ii.getInputId();
@@ -559,9 +569,11 @@
input.getAttributes().put("id", inputId);
}
- String styleClass = ii.getStyleClass(additonalStyle);
- input.getAttributes().put("styleClass", styleClass);
+ // set style class
+ String styleClass = getInputStyleClass(ii, additonalStyle);
+ setInputStyleClass(input, styleClass);
+ // copy standard attributes
copyAttribute(ii, input, "style");
copyAttribute(ii, input, "tabindex");
copyAttribute(ii, input, "onchange");
@@ -630,7 +642,7 @@
else
styleClass = styleClass.replace(styleName, "");
// add Style
- input.getAttributes().put("styleClass", styleClass);
+ setInputStyleClass(input, styleClass);
}
/**
