You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2006/07/17 08:16:58 UTC
svn commit: r422631 - in
/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms:
formmodel/ util/
Author: antonio
Date: Sun Jul 16 23:16:58 2006
New Revision: 422631
URL: http://svn.apache.org/viewvc?rev=422631&view=rev
Log:
Remove empty spaces.
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinition.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinitionBuilder.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/CalculatedFieldDefinitionBuilder.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/DomHelper.java
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinition.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinition.java?rev=422631&r1=422630&r2=422631&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinition.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinition.java Sun Jul 16 23:16:58 2006
@@ -61,7 +61,7 @@
* a group (paren) from the regular expression and corresponding field id.
*/
private List splitMappings = new ArrayList();
-
+
/**
* Set containing widgets mapped to groups to find out if a specific widget has been mapped already
*/
@@ -77,27 +77,27 @@
*/
public void initializeFrom(WidgetDefinition definition) throws Exception {
super.initializeFrom(definition);
-
+
if(definition instanceof AggregateFieldDefinition) {
AggregateFieldDefinition other = (AggregateFieldDefinition)definition;
-
+
this.combineExpr = other.combineExpr;
this.splitRegexp = other.splitRegexp;
this.splitPattern = other.splitPattern;
this.splitFailMessage = other.splitFailMessage;
-
+
Iterator defs = other.container.getWidgetDefinitions().iterator();
while(defs.hasNext()) {
container.addWidgetDefinition((WidgetDefinition)defs.next());
}
-
+
Collections.copy(this.splitMappings,other.splitMappings);
-
+
Iterator fields = other.mappedFields.iterator();
while(fields.hasNext()) {
this.mappedFields.add(fields.next());
}
-
+
} else {
throw new Exception("Definition to inherit from is not of the right type! (at "+getLocation()+")");
}
@@ -107,25 +107,25 @@
checkMutable();
container.addWidgetDefinition(widgetDefinition);
}
-
+
/**
* checks completeness of this definition
*/
public void checkCompleteness() throws IncompletenessException {
super.checkCompleteness();
-
+
if(this.container.size()==0)
throw new IncompletenessException("AggregateField doesn't have any child widgets!",this);
-
+
if(this.combineExpr==null)
throw new IncompletenessException("AggregateField requires a combine expression!",this);
-
+
if(this.splitPattern==null)
throw new IncompletenessException("AggregateField requires a split regular expression!",this);
-
+
if(this.splitMappings.size()==0)
throw new IncompletenessException("AggregateField requires at least one group to field mapping!",this);
-
+
// now check children's completeness
List defs = container.getWidgetDefinitions();
Iterator it = defs.iterator();
@@ -172,12 +172,12 @@
protected void addSplitMapping(int group, String fieldId) {
checkMutable();
-
+
if(mappedFields.contains(fieldId))
throw new RuntimeException("Field '"+fieldId+"' is already mapped to another group!");
-
+
mappedFields.add(fieldId);
-
+
splitMappings.add(new SplitMapping(group, fieldId));
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinitionBuilder.java?rev=422631&r1=422630&r2=422631&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinitionBuilder.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/AggregateFieldDefinitionBuilder.java Sun Jul 16 23:16:58 2006
@@ -37,9 +37,9 @@
definition.makeImmutable();
return definition;
}
-
+
protected void setupDefinition(Element widgetElement, AggregateFieldDefinition definition) throws Exception {
-
+
// parse the field definition
super.setupDefinition(widgetElement, definition);
@@ -75,7 +75,7 @@
throw new Exception("Unknown widget id \"" + field + "\", at " +
DomHelper.getLocation(mapElements[i]));
}
-
+
try {
definition.addSplitMapping(group, field);
System.out.println("Aggregate: addSplitMapping("+group+","+field+")");
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/CalculatedFieldDefinitionBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/CalculatedFieldDefinitionBuilder.java?rev=422631&r1=422630&r2=422631&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/CalculatedFieldDefinitionBuilder.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/formmodel/CalculatedFieldDefinitionBuilder.java Sun Jul 16 23:16:58 2006
@@ -51,8 +51,7 @@
definition.makeImmutable();
return definition;
}
-
-
+
protected void setupDefinition(Element widgetElement, CalculatedFieldDefinition definition) throws Exception {
super.setupDefinition(widgetElement, definition);
@@ -71,6 +70,4 @@
this.serviceManager.release(builderSelector);
}
}
-
-
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/DomHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/DomHelper.java?rev=422631&r1=422630&r2=422631&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/DomHelper.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/DomHelper.java Sun Jul 16 23:16:58 2006
@@ -23,6 +23,8 @@
import java.util.ListIterator;
import java.util.Map;
+import javax.xml.XMLConstants;
+
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.util.location.Location;
@@ -61,7 +63,7 @@
*/
public class DomHelper {
- public static final String XMLNS_URI = "http://www.w3.org/2000/xmlns/";
+ public static final String XMLNS_URI = XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
public static Location getLocationObject(Element element) {
return LocationAttributes.getLocation(element);