Update of
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler
In directory james.mmbase.org:/tmp/cvs-serv4991
Modified Files:
AbstractTypeHandler.java BinaryHandler.java NodeHandler.java
StringHandler.java
Log Message:
generics
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler
Index: AbstractTypeHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/AbstractTypeHandler.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- AbstractTypeHandler.java 8 Apr 2009 13:57:21 -0000 1.73
+++ AbstractTypeHandler.java 28 Apr 2009 08:48:08 -0000 1.74
@@ -29,7 +29,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: AbstractTypeHandler.java,v 1.73 2009/04/08 13:57:21 michiel
Exp $
+ * @version $Id: AbstractTypeHandler.java,v 1.74 2009/04/28 08:48:08 michiel
Exp $
*/
public abstract class AbstractTypeHandler implements TypeHandler {
@@ -56,7 +56,7 @@
protected EnumHandler getEnumHandler(Node node, Field field) throws
JspTagException {
if (gotEnumHandler) return eh;
gotEnumHandler = true;
- DataType dt = field.getDataType();
+ DataType<?> dt = field.getDataType();
if (dt.getEnumerationValues(tag.getLocale(), tag.getCloudVar(), node,
field) != null) {
return new EnumHandler(tag, node, field);
@@ -71,6 +71,7 @@
if ((long) max - min < 200L) {
return new EnumHandler(tag, node, field) {
int i = min;
+ @Override
protected Iterator<Entry<Integer, Integer>>
getIterator(Node node, Field field) {
return new Iterator<Entry<Integer, Integer>>() {
public boolean hasNext() {
@@ -95,6 +96,7 @@
if ((double) max - min < 200.0) {
return new EnumHandler(tag, node, field) {
long i = min;
+ @Override
protected Iterator<Entry<Long, Long>> getIterator(Node
node, Field field) {
return new Iterator<Entry<Long, Long>>() {
public boolean hasNext() {
@@ -223,7 +225,7 @@
return eh.checkHtmlInput(node, field, errors);
}
Object fieldValue = getFieldValue(node, field);
- final DataType<Object> dt = field.getDataType();
+ final DataType<?> dt = field.getDataType();
if (fieldValue == null) {
log.debug("Field value not found in context, using existing value
");
fieldValue = getFieldValue(node, field, node == null);
@@ -234,7 +236,7 @@
if (log.isDebugEnabled()) {
log.debug("Value for field " + field + ": " + fieldValue + " and
node " + node);
}
- Collection<LocalizedString> col = dt.validate(fieldValue, node, field);
+ Collection<LocalizedString> col = dt.castAndValidate(fieldValue, node,
field);
if (col.size() == 0) {
// do actually set the field, because some datatypes need
cross-field checking
// also in an mm:form, you can simply commit.
Index: BinaryHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/BinaryHandler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- BinaryHandler.java 24 Apr 2009 19:58:44 -0000 1.16
+++ BinaryHandler.java 28 Apr 2009 08:48:08 -0000 1.17
@@ -33,7 +33,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.8 (was named ByteHandler previously)
- * @version $Id: BinaryHandler.java,v 1.16 2009/04/24 19:58:44 michiel Exp $
+ * @version $Id: BinaryHandler.java,v 1.17 2009/04/28 08:48:08 michiel Exp $
*/
public class BinaryHandler extends AbstractTypeHandler {
@@ -52,7 +52,7 @@
@Override public String htmlInput(Node node, Field field, boolean search)
throws JspTagException {
StringBuilder show = new StringBuilder();
if (node != null) {
- Function gui = node.getFunction("gui");
+ Function<?> gui = node.getFunction("gui");
Parameters args = gui.createParameters();
args.set("field", field.getName());
args.set(Parameter.LANGUAGE, tag.getLocale().getLanguage());
Index: NodeHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/NodeHandler.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- NodeHandler.java 17 Feb 2009 11:07:37 -0000 1.41
+++ NodeHandler.java 28 Apr 2009 08:48:08 -0000 1.42
@@ -33,7 +33,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: NodeHandler.java,v 1.41 2009/02/17 11:07:37 michiel Exp $
+ * @version $Id: NodeHandler.java,v 1.42 2009/04/28 08:48:08 michiel Exp $
*/
public class NodeHandler extends AbstractTypeHandler {
@@ -79,7 +79,8 @@
/**
* @see TypeHandler#htmlInput(Node, Field, boolean)
*/
- @Override public String htmlInput(Node node, Field field, boolean search)
throws JspTagException {
+ @Override
+ public String htmlInput(Node node, Field field, boolean search) throws
JspTagException {
// if the gui was a builder(maybe query in future) then show a drop
down for this thing, listing the nodes..
if(useLegacy(node, field) &&
Index: StringHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/StringHandler.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- StringHandler.java 7 Apr 2009 09:09:04 -0000 1.72
+++ StringHandler.java 28 Apr 2009 08:48:08 -0000 1.73
@@ -29,7 +29,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: StringHandler.java,v 1.72 2009/04/07 09:09:04 michiel Exp $
+ * @version $Id: StringHandler.java,v 1.73 2009/04/28 08:48:08 michiel Exp $
*/
public class StringHandler extends AbstractTypeHandler {
@@ -119,7 +119,7 @@
buffer.append("\" />");
}
} catch (ClassCastException cce) {
- DataType<Object> dt = field.getDataType();
+ DataType<?> dt = field.getDataType();
log.error("Expected StringDataType for field " + field + " but
found " + dt.getClass().getName() + ":"+ dt);
throw cce;
}
@@ -143,12 +143,13 @@
* @see TypeHandler#useHtmlInput(Node, Field)
*/
@Override public boolean useHtmlInput(Node node, Field field) throws
JspTagException {
+ @SuppressWarnings("deprecation")
String guiType = field.getGUIType();
if (guiType.indexOf('.') > 0) {
- EnumHandler eh = new EnumHandler(tag, node, field);
- if (eh.isAvailable()) {
- return eh.useHtmlInput(node, field);
+ EnumHandler e = new EnumHandler(tag, node, field);
+ if (e.isAvailable()) {
+ return e.useHtmlInput(node, field);
}
}
String fieldValue = (String) getFieldValue(node, field);
@@ -189,9 +190,9 @@
* @see TypeHandler#whereHtmlInput(Field)
*/
@Override public String whereHtmlInput(Field field) throws JspTagException
{
- EnumHandler eh = getEnumHandler(null, field);
- if (eh != null) {
- return eh.whereHtmlInput(field);
+ EnumHandler e = getEnumHandler(null, field);
+ if (e != null) {
+ return e.whereHtmlInput(field);
}
String search = findString(field);
if (search == null) return null;
@@ -211,9 +212,9 @@
@Override public Constraint whereHtmlInput(Field field, Query query)
throws JspTagException {
- EnumHandler eh = getEnumHandler(null, field);
- if (eh != null) {
- return eh.whereHtmlInput(field, query);
+ EnumHandler e = getEnumHandler(null, field);
+ if (e != null) {
+ return e.whereHtmlInput(field, query);
}
Constraint cons = super.whereHtmlInput(field, query);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
