TRINIDAD-2483 -- fix other usages where getValue is passed null so that j2ee7 containers do not throw exceptions
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java
index c87712a..2f9a90d 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java
@@ -46,7 +46,7 @@
{
_is12 = is12;
}
-
+
protected boolean is12()
{
return _is12;
@@ -63,6 +63,8 @@
imports.add("javax.el.ValueExpression");
}
+ imports.add("javax.faces.context.FacesContext");
+
Iterator properties = component.properties();
properties = new FilteredIterator(properties, new TagAttributeFilter());
@@ -285,7 +287,7 @@
{
String propName = property.getPropertyName();
String propVar = "_" + propName;
-
+
out.println("if (" + propVar + " != null) ");
out.println("{");
out.indent();
@@ -471,7 +473,7 @@
out.println("else");
out.println("{");
out.indent();
- out.println("Object val = " + propVar + ".getValue(null);");
+ out.println("Object val = " + propVar + ".getValue(FacesContext.getCurrentInstance().getELContext());");
out.println("if (val != null)");
out.indent();
out.println("bean.setProperty(" + componentClass + "." + propKey + ",");
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesConverterTagGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesConverterTagGenerator.java
index ae47d7d..d44ba6e 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesConverterTagGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesConverterTagGenerator.java
@@ -103,7 +103,7 @@
out.println("{");
}
- out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ".getValue(null));");
+ out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ".getValue(FacesContext.getCurrentInstance().getELContext()));");
String setMethod = Util.getPrefixedPropertyName("set", propName);
out.println("converter." + setMethod + "(value);");
if ("StringArray".equals(propType))
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesValidatorTagGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesValidatorTagGenerator.java
index 647b18e..7dc07cc 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesValidatorTagGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/MyFacesValidatorTagGenerator.java
@@ -98,7 +98,7 @@
out.println("{");
}
- out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ".getValue(null));");
+ out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ".getValue(FacesContext.getCurrentInstance().getELContext()));");
String setMethod = Util.getPrefixedPropertyName("set", propName);
out.println("validator." + setMethod + "(value);");
if ("StringArray".equals(propType))
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java
index 2ee12fb..9b76d7e 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java
@@ -125,9 +125,9 @@
{
out.println(propClass + " value = Enum.valueOf(" + propClass + ".class, " + propVar + ".getExpressionString());");
}
- else
+ else
{
- out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ".getValue(null));");
+ out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ".getValue(FacesContext.getCurrentInstance().getELContext()));");
}
String setMethod = Util.getPrefixedPropertyName("set", propName);
out.println("converter." + setMethod + "(value);");
@@ -166,7 +166,7 @@
out.println("try");
out.println("{");
}
-
+
if ("Enum".equals (propType))
{
out.println(propClass + " value = Enum.valueOf(" + propClass + ".class, " + propVar + ");");
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java
index 34cb212..a6c360f 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java
@@ -66,7 +66,7 @@
addImportsFromPropertes(validator, imports);
return imports;
}
-
+
@Override
protected void writeClass(PrettyWriter out, AbstractTagBean abstractTag)
{
@@ -106,13 +106,13 @@
out.unindent();
out.println("}");
String propType = null;
- if ("Date".equals (propClass))
+ if ("Date".equals (propClass))
{
- propType = resolveDateType(propFullClass, property.getUseMaxTime());
+ propType = resolveDateType(propFullClass, property.getUseMaxTime());
}
- else
+ else
{
- propType = resolveType(propFullClass);
+ propType = resolveType(propFullClass);
}
if (propType != null)
{
@@ -125,7 +125,7 @@
out.println("{");
}
- out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ".getValue(null));");
+ out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ".getValue(FacesContext.getCurrentInstance().getELContext()));");
String setMethod = Util.getPrefixedPropertyName("set", propName);
out.println("validator." + setMethod + "(value);");
if ("StringArray".equals(propType))
@@ -153,13 +153,13 @@
out.unindent();
out.println("}");
String propType = null;
- if ("Date".equals (propClass))
+ if ("Date".equals (propClass))
{
- propType = resolveDateType(propFullClass, property.getUseMaxTime());
+ propType = resolveDateType(propFullClass, property.getUseMaxTime());
}
- else
+ else
{
- propType = resolveType(propFullClass);
+ propType = resolveType(propFullClass);
}
if (propType != null)
{
