vgritsenko 2004/01/11 11:27:00
Modified: src/blocks/woody/java/org/apache/cocoon/woody/datatype
ValidationError.java
src/blocks/woody/java/org/apache/cocoon/woody/formmodel
AbstractWidget.java
Log:
Add some braces
Revision Changes Path
1.5 +3 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/ValidationError.java
Index: ValidationError.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/ValidationError.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ValidationError.java 13 Nov 2003 13:19:09 -0000 1.4
+++ ValidationError.java 11 Jan 2004 19:27:00 -0000 1.5
@@ -68,10 +68,11 @@
* @param i18n should the errorMessage be interpreted as an i18n key?
*/
public ValidationError(String errorMessage, boolean i18n) {
- if (i18n)
+ if (i18n) {
saxFragment = new I18nMessage(errorMessage);
- else
+ } else {
saxFragment = new StringMessage(errorMessage);
+ }
}
/**
1.8 +9 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractWidget.java
Index: AbstractWidget.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractWidget.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractWidget.java 29 Dec 2003 06:14:49 -0000 1.7
+++ AbstractWidget.java 11 Jan 2004 19:27:00 -0000 1.8
@@ -116,17 +116,19 @@
}
public String getNamespace() {
- if (getParent() != null && getParent().getNamespace().length() > 0)
+ if (getParent() != null && getParent().getNamespace().length() > 0) {
return getParent().getNamespace() + "." + getId();
- else
+ } else {
return getId();
+ }
}
public String getFullyQualifiedId() {
if (parent != null) {
String namespace = parent.getNamespace();
- if (namespace.length() > 0)
+ if (namespace.length() > 0) {
return namespace + "." + getId();
+ }
}
return getId();
}
@@ -152,15 +154,17 @@
}
public void generateLabel(ContentHandler contentHandler) throws
SAXException {
- if (definition != null)
+ if (definition != null) {
definition.generateDisplayData("label", contentHandler);
+ }
}
public void generateItemSaxFragment(ContentHandler contentHandler,
Locale locale) throws SAXException {
// Do nothing
}
- public void generateSaxFragment(ContentHandler contentHandler, Locale
locale, String element, WidgetDefinition definition) throws SAXException {
+ public void generateSaxFragment(ContentHandler contentHandler, Locale
locale, String element, WidgetDefinition definition)
+ throws SAXException {
AttributesImpl attrs = new AttributesImpl();
attrs.addCDATAAttribute("id", getFullyQualifiedId());
contentHandler.startElement(Constants.WI_NS, element,
Constants.WI_PREFIX_COLON + element, attrs);