Modified: shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/SelectBuilderRule.java URL: http://svn.apache.org/viewvc/shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/SelectBuilderRule.java?rev=419765&r1=419764&r2=419765&view=diff ============================================================================== --- shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/SelectBuilderRule.java (original) +++ shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/SelectBuilderRule.java Thu Jul 6 18:56:34 2006 @@ -39,7 +39,7 @@ * An array of target [EMAIL PROTECTED] org.apache.shale.clay.parser.builder.Builder}s. * </p> */ - private static final Builder[] builders = { new SelectOneMenuBuilder(), + private static final Builder[] BUILDERS = { new SelectOneMenuBuilder(), new SelectManyMenuBuilder() }; /** @@ -57,10 +57,10 @@ && node.getName().equalsIgnoreCase("select")) { if (!node.getAttributes().containsKey("multiple")) { - builderRuleContext.setBuilder(builders[0]); + builderRuleContext.setBuilder(BUILDERS[0]); isFinal = true; } else { - builderRuleContext.setBuilder(builders[1]); + builderRuleContext.setBuilder(BUILDERS[1]); isFinal = true; }
Modified: shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/SpanBuilderRule.java URL: http://svn.apache.org/viewvc/shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/SpanBuilderRule.java?rev=419765&r1=419764&r2=419765&view=diff ============================================================================== --- shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/SpanBuilderRule.java (original) +++ shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/SpanBuilderRule.java Thu Jul 6 18:56:34 2006 @@ -41,7 +41,7 @@ * component. * </p> */ - private static final Builder builder = new MorphBuilder(); + private static final Builder BUILDER = new MorphBuilder(); /** * <p> @@ -59,7 +59,7 @@ && node.getName().equals("span") && node.getAttributes().containsKey("jsfid")) { - builderRuleContext.setBuilder(builder); + builderRuleContext.setBuilder(BUILDER); isFinal = true; } Modified: shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/TextareaBuilderRule.java URL: http://svn.apache.org/viewvc/shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/TextareaBuilderRule.java?rev=419765&r1=419764&r2=419765&view=diff ============================================================================== --- shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/TextareaBuilderRule.java (original) +++ shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/parser/builder/chain/TextareaBuilderRule.java Thu Jul 6 18:56:34 2006 @@ -39,7 +39,7 @@ * [EMAIL PROTECTED] org.apache.shale.clay.parser.builder.InputTextareaBuilder}. * </p> */ - private static final Builder builder = new InputTextareaBuilder(); + private static final Builder BUILDER = new InputTextareaBuilder(); /** * <p> @@ -57,7 +57,7 @@ if (!node.isComment() && node.getName() != null && node.getName().equalsIgnoreCase("textarea")) { - builderRuleContext.setBuilder(builder); + builderRuleContext.setBuilder(BUILDER); isFinal = true; } Modified: shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/taglib/SymbolTag.java URL: http://svn.apache.org/viewvc/shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/taglib/SymbolTag.java?rev=419765&r1=419764&r2=419765&view=diff ============================================================================== --- shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/taglib/SymbolTag.java (original) +++ shale/trunk/shale-clay/src/main/java/org/apache/shale/clay/taglib/SymbolTag.java Thu Jul 6 18:56:34 2006 @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * $Id$ */ package org.apache.shale.clay.taglib; @@ -27,98 +27,106 @@ import org.apache.shale.util.Messages; /** - * <p>This Tag is used to add replacement symbols to the [EMAIL PROTECTED] Clay} component. - * Replacement symbols are substituted within the meta-data used to build the subtree - * under the Clay component. This tag is similar to the standard JSF attribute tag. - * The <code>name</code> attribute will be prepended with an '@' character. + * <p>This Tag is used to add replacement symbols to the [EMAIL PROTECTED] Clay} component. + * Replacement symbols are substituted within the meta-data used to build the subtree + * under the Clay component. This tag is similar to the standard JSF attribute tag. + * The <code>name</code> attribute will be prepended with an '@' character. * The "at" character is the symbol identifier.</p> */ public class SymbolTag extends TagSupport { + /** + * <p>Unique id used by the <code>Serializable</code> interface.</p> + */ private static final long serialVersionUID = 3977021747121698357L; /** * <p>Message resources for this class.</p> */ private static Messages messages = new Messages( - "org.apache.shale.clay.Bundle", Clay.class.getClassLoader()); - + "org.apache.shale.clay.Bundle", SymbolTag.class.getClassLoader()); + /** * <p>The <code>name</code> of the symbol.</p> */ private String name = null; - + /** * <p>The <code>value</code> of the symbol.</p> */ private String value = null; - + /** * <p>Returns the name of the symbol.</p> + * + * @return name of the symbol */ public String getName() { return name; } - /** * <p>Sets the <code>name</code> of the symbol.</p> + * + * @param name of the symbol */ public void setName(String name) { this.name = name; } - /** * <p>Returns the value for the symbol.</p> + * + * @return value of the symbol */ public String getValue() { return value; } - /** * <p>Sets the <code>value</code> for the symbol.</p> + * + * @param value of the symbol */ public void setValue(String value) { this.value = value; } - /** - * <p>Finds the parent component and adds the symbol to the + * <p>Finds the parent component and adds the symbol to the * Clay component's symbol table. The parent has to be a [EMAIL PROTECTED] Clay} component. * </p> + * + * @return next transition + * @exception JspException */ public int doStartTag() throws JspException { UIComponentTag parentTag = UIComponentTag.getParentUIComponentTag(pageContext); if (parentTag == null) { - throw new JspException(messages.getMessage("clayparent.notfound")); + throw new JspException(messages.getMessage("clayparent.notfound")); } - + UIComponent parentComponent = parentTag.getComponentInstance(); if (parentComponent == null) { - throw new JspException(messages.getMessage("clayparent.notfound")); - } - + throw new JspException(messages.getMessage("clayparent.notfound")); + } + if (!(parentComponent instanceof Clay)) { - throw new JspException(messages.getMessage("clayparent.notfound")); + throw new JspException(messages.getMessage("clayparent.notfound")); } Clay clayParent = (Clay) parentComponent; StringBuffer tmp = new StringBuffer(name); - if (tmp.charAt(0) != '@') + if (tmp.charAt(0) != '@') { tmp.insert(0, '@'); - + } SymbolBean symbol = new SymbolBean(); symbol.setName(tmp.toString()); symbol.setValue(value); - clayParent.getSymbols().put(symbol.getName(), symbol); - + clayParent.getSymbols().put(symbol.getName(), symbol); + return super.doStartTag(); - } - }
