You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2001/10/04 22:43:48 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model StringKeyField.java FieldFactory.java
jmcnally 01/10/04 13:43:48
Modified: src/java/org/apache/turbine/services/intake/model
FieldFactory.java
Added: src/java/org/apache/turbine/services/intake/model
StringKeyField.java
Log:
fixed an NPE and added a StringKeyField type
Revision Changes Path
1.2 +18 -4 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FieldFactory.java
Index: FieldFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FieldFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FieldFactory.java 2001/08/16 05:08:56 1.1
+++ FieldFactory.java 2001/10/04 20:43:48 1.2
@@ -63,7 +63,7 @@
* Creates Field objects.
*
* @author <a href="mailto:jmcnally@collab.net>John McNally</a>
- * @version $Id: FieldFactory.java,v 1.1 2001/08/16 05:08:56 jvanzyl Exp $
+ * @version $Id: FieldFactory.java,v 1.2 2001/10/04 20:43:48 jmcnally Exp $
*/
public abstract class FieldFactory
{
@@ -127,6 +127,15 @@
}
}
);
+ fieldCtors.put("StringKey", new FieldFactory.FieldCtor()
+ {
+ public Field getInstance(XmlField f, Group g)
+ throws Exception
+ {
+ return new StringKeyField(f, g);
+ }
+ }
+ );
fieldCtors.put("FileItem", new FieldFactory.FieldCtor()
{
public Field getInstance(XmlField f, Group g)
@@ -157,15 +166,20 @@
public static final Field getInstance(XmlField f, Group g)
throws Exception
{
+ FieldCtor fieldCtor = null;
Field field = null;
String type = f.getType();
- field = ((FieldCtor)fieldCtors.get(type)).getInstance(f, g);
- if ( field == null)
+ fieldCtor = (FieldCtor)fieldCtors.get(type);
+ if ( fieldCtor == null)
{
throw new TurbineException("Unsupported type: " + type);
}
-
+ else
+ {
+ field = fieldCtor.getInstance(f, g);
+ }
+
return field;
}
}
1.1 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringKeyField.java
Index: StringKeyField.java
===================================================================
package org.apache.turbine.services.intake.model;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import org.apache.turbine.om.StringKey;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
/** */
public class StringKeyField extends Field
{
public StringKeyField(XmlField field, Group group)
throws Exception
{
super(field, group);
}
/**
* A suitable validator.
*
* @return "DefaultValidator"
*/
protected String getDefaultValidator()
{
return
"org.apache.fulcrum.intake.validator.DefaultValidator";
}
/**
* converts the parameter to the correct Object.
*/
protected void doSetValue(ParameterParser pp)
{
if ( isMultiValued )
{
String[] ss = pp.getStrings(getKey());
StringKey[] ival = new StringKey[ss.length];
for (int i=0; i<ss.length; i++)
{
ival[i] = new StringKey(ss[i]);
}
setTestValue(ival);
}
else
{
setTestValue( new StringKey(pp.getString(getKey())) );
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org