You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/03/11 21:55:35 UTC
svn commit: r385164 [16/32] - in /jakarta/tapestry/trunk: ./ .settings/
annotations/src/java/org/apache/tapestry/annotations/
annotations/src/test/org/apache/tapestry/annotations/ config/
contrib/src/documentation/content/xdocs/tapestry-contrib/Compone...
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/LabeledPropertySelectionModel.java Sat Mar 11 12:54:27 2006
@@ -23,52 +23,6 @@
*/
public class LabeledPropertySelectionModel implements IPropertySelectionModel
{
- /**
- * Empty model implementation. Avoids NullPointerExceptions when default constructor is used.
- */
- private static final IPropertySelectionModel EMPTY_MODEL = new IPropertySelectionModel()
- {
- /**
- * @see org.apache.tapestry.form.IPropertySelectionModel#getOptionCount()
- */
- public int getOptionCount()
- {
- return 0;
- }
-
- /**
- * @see org.apache.tapestry.form.IPropertySelectionModel#getOption(int)
- */
- public Object getOption(int index)
- {
- return null;
- }
-
- /**
- * @see org.apache.tapestry.form.IPropertySelectionModel#getLabel(int)
- */
- public String getLabel(int index)
- {
- return null;
- }
-
- /**
- * @see org.apache.tapestry.form.IPropertySelectionModel#getValue(int)
- */
- public String getValue(int index)
- {
- return null;
- }
-
- /**
- * @see org.apache.tapestry.form.IPropertySelectionModel#translateValue(java.lang.String)
- */
- public Object translateValue(String value)
- {
- return null;
- }
- };
-
private IPropertySelectionModel _model;
private String _label = "";
@@ -155,7 +109,7 @@
}
/**
- * Returns the underlying IPropertySelectionModel.
+ * Returns the underlying IPropertySelectionModel
*
* @return the underlying IPropertySelectionModel
*/
@@ -165,7 +119,7 @@
}
/**
- * Sets the underlying IPropertySelectionModel.
+ * Sets the underlying IPropertySelectionModel
*
* @param model
* the IPropertySelectionModel to set
@@ -219,7 +173,7 @@
}
/**
- * Returns the label of the initial IPropertySelectionModel option.
+ * Returns the label of the initial IPropertySelectionModel option
*
* @return a IPropertySelectionModel option label
*/
@@ -229,7 +183,7 @@
}
/**
- * Sets the label of the initial IPropertySelectionModel option.
+ * Sets the label of the initial IPropertySelectionModel option
*
* @param label
* a IPropertySelectionModel option label
@@ -240,7 +194,7 @@
}
/**
- * Returns the value of the initial IPropertySelectionModel option.
+ * Returns the value of the initial IPropertySelectionModel option
*
* @return a IPropertySelectionModel option value
*/
@@ -250,7 +204,7 @@
}
/**
- * Sets the value of the initial IPropertySelectionModel option.
+ * Sets the value of the initial IPropertySelectionModel option
*
* @param value
* a IPropertySelectionModel option value
@@ -261,7 +215,7 @@
}
/**
- * Returns the initial option.
+ * Returns the initial option
*
* @return a PropertySelectionModel option
*/
@@ -271,7 +225,7 @@
}
/**
- * Sets the initial IPropertySelectionModel option.
+ * Sets the initial IPropertySelectionModel option
*
* @param option
* a IPropertySelectionModel option
@@ -280,4 +234,50 @@
{
_option = option;
}
+
+ /**
+ * Empty model implementation. Avoids NullPointerExceptions when default constructor is used.
+ */
+ private static final IPropertySelectionModel EMPTY_MODEL = new IPropertySelectionModel()
+ {
+ /**
+ * @see org.apache.tapestry.form.IPropertySelectionModel#getOptionCount()
+ */
+ public int getOptionCount()
+ {
+ return 0;
+ }
+
+ /**
+ * @see org.apache.tapestry.form.IPropertySelectionModel#getOption(int)
+ */
+ public Object getOption(int index)
+ {
+ return null;
+ }
+
+ /**
+ * @see org.apache.tapestry.form.IPropertySelectionModel#getLabel(int)
+ */
+ public String getLabel(int index)
+ {
+ return null;
+ }
+
+ /**
+ * @see org.apache.tapestry.form.IPropertySelectionModel#getValue(int)
+ */
+ public String getValue(int index)
+ {
+ return null;
+ }
+
+ /**
+ * @see org.apache.tapestry.form.IPropertySelectionModel#translateValue(java.lang.String)
+ */
+ public Object translateValue(String value)
+ {
+ return null;
+ }
+ };
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/LinkSubmit.jwc
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/LinkSubmit.jwc?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/LinkSubmit.jwc (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/LinkSubmit.jwc Sat Mar 11 12:54:27 2006
@@ -32,18 +32,14 @@
<parameter name="listener">
<description>
- A listener that is notified when this component is triggered.
- The listener is notified immediately when the component is identified as clicked.
- This behaviour is useful when the component is in a loop, but not all elements
- enclosed by the Form would have had a chance to update their properties at the
- time of the listener invocation. Please see the 'action' parameter as an alternative.
+ A listener that is notified if this component is triggered.
</description>
</parameter>
<parameter name="action">
<description>
- A listener that is notified when this component is triggered.
- The listener notification is delayed until all components enclosed by the Form
- have had a chance to update their properties.
+ A listener that is notified if this component is triggered
+ just before the form's listener, after all components
+ enclosed by the Form have had a chance to update their properties.
</description>
</parameter>
<parameter name="parameters">
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Option.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Option.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Option.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Option.java Sat Mar 11 12:54:27 2006
@@ -87,4 +87,4 @@
public abstract boolean isSelected();
public abstract void setSelected(boolean selected);
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/PropertySelection.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/PropertySelection.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/PropertySelection.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/PropertySelection.java Sat Mar 11 12:54:27 2006
@@ -169,4 +169,4 @@
{
return getValidatableFieldSupport().isRequired(this);
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Radio.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Radio.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Radio.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Radio.java Sat Mar 11 12:54:27 2006
@@ -101,4 +101,4 @@
public abstract boolean isDisabled();
public abstract Object getValue();
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/RadioPropertySelectionRenderer.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/RadioPropertySelectionRenderer.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/RadioPropertySelectionRenderer.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/RadioPropertySelectionRenderer.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -18,18 +18,20 @@
import org.apache.tapestry.IRequestCycle;
/**
- * Implementation of {@link IPropertySelectionRenderer} that produces a table of
- * radio (<input type=radio>) elements.
- *
- * @author Howard Lewis Ship
- */
+ * Implementation of {@link IPropertySelectionRenderer} that
+ * produces a table of radio (<input type=radio>) elements.
+ *
+ * @author Howard Lewis Ship
+ *
+ **/
public class RadioPropertySelectionRenderer implements IPropertySelectionRenderer
{
/**
- * Writes the <table> element.
- */
+ * Writes the <table> element.
+ *
+ **/
public void beginRender(PropertySelection component, IMarkupWriter writer, IRequestCycle cycle)
{
@@ -40,8 +42,9 @@
}
/**
- * Closes the <table> element.
- */
+ * Closes the <table> element.
+ *
+ **/
public void endRender(PropertySelection component, IMarkupWriter writer, IRequestCycle cycle)
{
@@ -49,12 +52,19 @@
}
/**
- * Writes a row of the table. The table contains two cells; the first is the
- * radio button, the second is the label for the radio button.
- */
-
- public void renderOption(PropertySelection component, IMarkupWriter writer, IRequestCycle cycle,
- IPropertySelectionModel model, Object option, int index, boolean selected)
+ * Writes a row of the table. The table contains two cells; the first is the radio
+ * button, the second is the label for the radio button.
+ *
+ **/
+
+ public void renderOption(
+ PropertySelection component,
+ IMarkupWriter writer,
+ IRequestCycle cycle,
+ IPropertySelectionModel model,
+ Object option,
+ int index,
+ boolean selected)
{
writer.begin("tr");
writer.begin("td");
@@ -64,9 +74,11 @@
writer.attribute("name", component.getName());
writer.attribute("value", model.getValue(index));
- if (component.isDisabled()) writer.attribute("disabled", "disabled");
+ if (component.isDisabled())
+ writer.attribute("disabled", "disabled");
- if (selected) writer.attribute("checked", "checked");
+ if (selected)
+ writer.attribute("checked", "checked");
writer.end(); // <td>
@@ -75,8 +87,8 @@
writer.begin("td");
writer.print(model.getLabel(index));
writer.end(); // <td>
- writer.end(); // <tr>
+ writer.end(); // <tr>
writer.println();
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/StringPropertySelectionModel.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/StringPropertySelectionModel.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/StringPropertySelectionModel.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/StringPropertySelectionModel.java Sat Mar 11 12:54:27 2006
@@ -28,7 +28,7 @@
public class StringPropertySelectionModel implements IPropertySelectionModel
{
- private String[] _options;
+ private String[] options;
/**
* Standard constructor.
@@ -38,17 +38,17 @@
public StringPropertySelectionModel(String[] options)
{
- this._options = options;
+ this.options = options;
}
public int getOptionCount()
{
- return _options.length;
+ return options.length;
}
public Object getOption(int index)
{
- return _options[index];
+ return options[index];
}
/**
@@ -58,7 +58,7 @@
public String getLabel(int index)
{
- return _options[index];
+ return options[index];
}
/**
@@ -77,7 +77,7 @@
index = Integer.parseInt(value);
- return _options[index];
+ return options[index];
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Submit.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Submit.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Submit.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Submit.java Sat Mar 11 12:54:27 2006
@@ -18,21 +18,18 @@
import org.apache.tapestry.IRequestCycle;
/**
- * Implements a component that manages an HTML <input type=submit> form
- * element. [ <a href="../../../../../ComponentReference/Submit.html">Component
- * Reference </a>]
+ * Implements a component that manages an HTML <input type=submit> form element. [ <a
+ * href="../../../../../ComponentReference/Submit.html">Component Reference </a>]
* <p>
- * This component is generally only used when the form has multiple submit
- * buttons, and it is important for the application to know which one was
- * pressed. You may also want to use {@link ImageSubmit}which accomplishes much
- * the same thing, but uses a graphic image instead.
+ * This component is generally only used when the form has multiple submit buttons, and it is
+ * important for the application to know which one was pressed. You may also want to use
+ * {@link ImageSubmit}which accomplishes much the same thing, but uses a graphic image instead.
*
* @author Howard Lewis Ship
*/
public abstract class Submit extends AbstractSubmit
{
-
protected boolean isClicked(IRequestCycle cycle, String name)
{
// How to know which Submit button was actually
@@ -55,11 +52,13 @@
writer.attribute("type", "submit");
writer.attribute("name", getName());
- if (isDisabled()) writer.attribute("disabled", "disabled");
+ if (isDisabled())
+ writer.attribute("disabled", "disabled");
String label = getLabel();
- if (label != null) writer.attribute("value", label);
+ if (label != null)
+ writer.attribute("value", label);
renderIdAttribute(writer, cycle);
@@ -68,7 +67,7 @@
writer.closeTag();
}
- /** Parameter. */
+ /** parameter */
public abstract String getLabel();
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Submit.jwc
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Submit.jwc?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Submit.jwc (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Submit.jwc Sat Mar 11 12:54:27 2006
@@ -52,18 +52,14 @@
</parameter>
<parameter name="listener">
<description>
- A listener that is notified when this component is triggered.
- The listener is notified immediately when the component is identified as clicked.
- This behaviour is useful when the component is in a loop, but not all elements
- enclosed by the Form would have had a chance to update their properties at the
- time of the listener invocation. Please see the 'action' parameter as an alternative.
+ A listener that is notified if this component is triggered.
</description>
</parameter>
<parameter name="action">
<description>
- A listener that is notified when this component is triggered.
- The listener notification is delayed until all components enclosed by the Form
- have had a chance to update their properties.
+ A listener that is notified if this component is triggered
+ just before the form's listener, after all components
+ enclosed by the Form have had a chance to update their properties.
</description>
</parameter>
<parameter name="parameters">
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TextArea.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TextArea.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TextArea.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TextArea.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -19,67 +19,67 @@
import org.apache.tapestry.valid.ValidatorException;
/**
- * Implements a component that manages an HTML <textarea> form element. [<a
- * href="../../../../../ComponentReference/TextArea.html">Component Reference</a>]
+ * Implements a component that manages an HTML <textarea> form element.
+ *
+ * [<a href="../../../../../ComponentReference/TextArea.html">Component Reference</a>]
* <p>
* As of 4.0, this component can be configurably translated and validated.
- *
+ *
* @author Howard Lewis Ship
* @author Paul Ferraro
*/
public abstract class TextArea extends AbstractFormComponent implements TranslatedField
{
-
public abstract String getValue();
-
+
public abstract void setValue(String value);
-
+
/**
- * @see org.apache.tapestry.form.AbstractFormComponent#renderFormComponent(org.apache.tapestry.IMarkupWriter,
- * org.apache.tapestry.IRequestCycle)
+ * @see org.apache.tapestry.form.AbstractFormComponent#renderFormComponent(org.apache.tapestry.IMarkupWriter, org.apache.tapestry.IRequestCycle)
*/
protected void renderFormComponent(IMarkupWriter writer, IRequestCycle cycle)
{
String value = getTranslatedFieldSupport().format(this, getValue());
-
+
renderDelegatePrefix(writer, cycle);
-
+
writer.begin("textarea");
writer.attribute("name", getName());
- if (isDisabled()) writer.attribute("disabled", "disabled");
+ if (isDisabled())
+ writer.attribute("disabled", "disabled");
renderIdAttribute(writer, cycle);
renderDelegateAttributes(writer, cycle);
-
+
getTranslatedFieldSupport().renderContributions(this, writer, cycle);
getValidatableFieldSupport().renderContributions(this, writer, cycle);
-
+
renderInformalParameters(writer, cycle);
- if (value != null) writer.print(value);
+ if (value != null)
+ writer.print(value);
writer.end();
-
+
renderDelegateSuffix(writer, cycle);
}
/**
- * @see org.apache.tapestry.form.AbstractFormComponent#rewindFormComponent(org.apache.tapestry.IMarkupWriter,
- * org.apache.tapestry.IRequestCycle)
+ * @see org.apache.tapestry.form.AbstractFormComponent#rewindFormComponent(org.apache.tapestry.IMarkupWriter, org.apache.tapestry.IRequestCycle)
*/
protected void rewindFormComponent(IMarkupWriter writer, IRequestCycle cycle)
{
String value = cycle.getParameter(getName());
-
+
try
{
- String text = (String)getTranslatedFieldSupport().parse(this, value);
-
+ String text = (String) getTranslatedFieldSupport().parse(this, value);
+
getValidatableFieldSupport().validate(this, writer, cycle, text);
-
+
setValue(text);
}
catch (ValidatorException e)
@@ -105,4 +105,4 @@
{
return getValidatableFieldSupport().isRequired(this);
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TextField.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TextField.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TextField.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TextField.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -19,10 +19,9 @@
import org.apache.tapestry.valid.ValidatorException;
/**
- * Implements a component that manages an HTML <input type=text> or
- * <input type=password> form element. [ <a
- * href="../../../../../ComponentReference/TextField.html">Component Reference
- * </a>]
+ * Implements a component that manages an HTML <input type=text> or <input
+ * type=password> form element. [ <a
+ * href="../../../../../ComponentReference/TextField.html">Component Reference </a>]
* <p>
* As of 4.0, this component can be configurably translated and validated.
*
@@ -31,21 +30,18 @@
*/
public abstract class TextField extends AbstractFormComponent implements TranslatedField
{
-
public abstract boolean isHidden();
public abstract Object getValue();
-
public abstract void setValue(Object value);
/**
- * @see org.apache.tapestry.form.AbstractFormComponent#renderFormComponent(org.apache.tapestry.IMarkupWriter,
- * org.apache.tapestry.IRequestCycle)
+ * @see org.apache.tapestry.form.AbstractFormComponent#renderFormComponent(org.apache.tapestry.IMarkupWriter, org.apache.tapestry.IRequestCycle)
*/
protected void renderFormComponent(IMarkupWriter writer, IRequestCycle cycle)
{
String value = getTranslatedFieldSupport().format(this, getValue());
-
+
renderDelegatePrefix(writer, cycle);
writer.beginEmpty("input");
@@ -54,9 +50,11 @@
writer.attribute("name", getName());
- if (isDisabled()) writer.attribute("disabled", "disabled");
+ if (isDisabled())
+ writer.attribute("disabled", "disabled");
- if (value != null) writer.attribute("value", value);
+ if (value != null)
+ writer.attribute("value", value);
renderIdAttribute(writer, cycle);
@@ -73,19 +71,18 @@
}
/**
- * @see org.apache.tapestry.form.AbstractFormComponent#rewindFormComponent(org.apache.tapestry.IMarkupWriter,
- * org.apache.tapestry.IRequestCycle)
+ * @see org.apache.tapestry.form.AbstractFormComponent#rewindFormComponent(org.apache.tapestry.IMarkupWriter, org.apache.tapestry.IRequestCycle)
*/
protected void rewindFormComponent(IMarkupWriter writer, IRequestCycle cycle)
{
String value = cycle.getParameter(getName());
-
+
try
{
Object object = getTranslatedFieldSupport().parse(this, value);
-
+
getValidatableFieldSupport().validate(this, writer, cycle, object);
-
+
setValue(object);
}
catch (ValidatorException e)
@@ -111,4 +108,4 @@
{
return getValidatableFieldSupport().isRequired(this);
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedField.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedField.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedField.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedField.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,15 +16,7 @@
import org.apache.tapestry.form.translator.Translator;
-/**
- * Translated fields provide a read-only property to access their translator
- * object.
- *
- * @author Paul Ferraro
- * @since 4.0
- */
public interface TranslatedField extends ValidatableField
{
-
- Translator getTranslator();
+ public Translator getTranslator();
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedFieldSupport.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedFieldSupport.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedFieldSupport.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedFieldSupport.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -18,20 +18,11 @@
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.valid.ValidatorException;
-/**
- * Basis for handling fields that must be parsed and translated (part of form
- * submission semantics).
- *
- * @author Howard M. Lewis Ship
- * @since 4.0
- */
public interface TranslatedFieldSupport
{
+ public String format(TranslatedField field, Object object);
+
+ public Object parse(TranslatedField field, String text) throws ValidatorException;
- String format(TranslatedField field, Object object);
-
- Object parse(TranslatedField field, String text)
- throws ValidatorException;
-
- void renderContributions(TranslatedField field, IMarkupWriter writer, IRequestCycle cycle);
+ public void renderContributions(TranslatedField field, IMarkupWriter writer, IRequestCycle cycle);
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedFieldSupportImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedFieldSupportImpl.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedFieldSupportImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/TranslatedFieldSupportImpl.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -20,16 +20,8 @@
import org.apache.tapestry.valid.IValidationDelegate;
import org.apache.tapestry.valid.ValidatorException;
-/**
- * Default implementation of
- * {@link org.apache.tapestry.form.TranslatedFieldSupport}.
- *
- * @author Paul Ferraro
- * @since 4.0
- */
public class TranslatedFieldSupportImpl implements TranslatedFieldSupport
{
-
private ThreadLocale _threadLocale;
/**
@@ -53,12 +45,13 @@
{
IValidationDelegate delegate = field.getForm().getDelegate();
- return delegate.isInError() ? delegate.getFieldInputValue() : field.getTranslator().format(field,
- _threadLocale.getLocale(), object);
+ return delegate.isInError() ? delegate.getFieldInputValue() : field.getTranslator().format(
+ field,
+ _threadLocale.getLocale(),
+ object);
}
- public Object parse(TranslatedField field, String text)
- throws ValidatorException
+ public Object parse(TranslatedField field, String text) throws ValidatorException
{
IValidationDelegate delegate = field.getForm().getDelegate();
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Upload.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Upload.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Upload.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Upload.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -36,7 +36,6 @@
public abstract class Upload extends AbstractFormComponent implements ValidatableField
{
-
public abstract void setFile(IUploadFile file);
/**
@@ -81,16 +80,16 @@
protected void rewindFormComponent(IMarkupWriter writer, IRequestCycle cycle)
{
IUploadFile file = getDecoder().getFileUpload(getName());
-
- if (file == null || HiveMind.isBlank(file.getFileName()))
+
+ if (HiveMind.isBlank(file.getFileName()))
{
file = null;
}
-
+
try
{
getValidatableFieldSupport().validate(this, writer, cycle, file);
-
+
setFile(file);
}
catch (ValidatorException e)
@@ -98,7 +97,7 @@
getForm().getDelegate().record(e);
}
}
-
+
/**
* Injected.
*/
@@ -116,4 +115,4 @@
{
return getValidatableFieldSupport().isRequired(this);
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Upload.jwc
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Upload.jwc?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Upload.jwc (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/Upload.jwc Sat Mar 11 12:54:27 2006
@@ -42,7 +42,7 @@
<reserved-parameter name="type"/>
<reserved-parameter name="name"/>
- <inject property="decoder" object="service:tapestry.multipart.MultipartDecoder"/>
+ <inject property="decoder" object="infrastructure:multipartDecoder"/>
<inject property="validatableFieldSupport" object="service:tapestry.form.ValidatableFieldSupport"/>
</component-specification>
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidatableField.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidatableField.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidatableField.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidatableField.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,20 +15,17 @@
package org.apache.tapestry.form;
/**
- * Implemented by form components that can need to be translated and validated.
- * During render the translator is used to translated the value to a string.
- * During rewind, the submitted value is translated back into an object by the
- * translator and then validated.
+ * Implemented by form components that can need to be translated and validated. During render the
+ * translator is used to translated the value to a string. During rewind, the submitted value is
+ * translated back into an object by the translator and then validated.
*
* @author Paul Ferraro
* @since 4.0
*/
public interface ValidatableField extends IFormComponent
{
-
/**
- * Coerced into an Iterator of
- * {@link org.apache.tapestry.form.validator.Validator}s.
+ * Coerced into an Iterator of Validators
*/
- Object getValidators();
+ public Object getValidators();
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidatableFieldSupport.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidatableFieldSupport.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidatableFieldSupport.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidatableFieldSupport.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -19,34 +19,31 @@
import org.apache.tapestry.valid.ValidatorException;
/**
- * Implements the logic used by {@link RequiredField}s for required field
- * checking on rewind and generating client-side logic during render.
+ * Implements the logic used by {@link RequiredField}s for required field checking on rewind and
+ * generating client-side logic during render.
*
* @author Paul Ferraro
* @since 4.0
*/
public interface ValidatableFieldSupport
{
-
/**
- * Called during render of the specified component. Renders any
- * contributions from validators.
+ * Called during render of the specified component. Renders any contributions from validators.
*/
- void renderContributions(ValidatableField field, IMarkupWriter writer, IRequestCycle cycle);
+ public void renderContributions(ValidatableField field, IMarkupWriter writer,
+ IRequestCycle cycle);
/**
- * Called during rewind of the specified component. Specified value is
- * validated using the component's validators.
+ * Called during rewind of the specified component. Specified value is validated using the
+ * component's validators.
*
- * @throws ValidatorException
- * if validation fails
+ * @throws ValidatorException if validation fails
*/
- void validate(ValidatableField component, IMarkupWriter writer, IRequestCycle cycle, Object value)
- throws ValidatorException;
+ public void validate(ValidatableField component, IMarkupWriter writer, IRequestCycle cycle, Object value) throws ValidatorException;
/**
- * Returns true if this component is required. This usually entails a search
- * of the component's validators.
+ * Returns true if this component is required. This usually entails a search of the component's
+ * validators.
*/
- boolean isRequired(ValidatableField field);
-}
+ public boolean isRequired(ValidatableField field);
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidationMessages.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidationMessages.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidationMessages.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/ValidationMessages.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -17,34 +17,32 @@
import java.util.Locale;
/**
- * Support interface used to provide access to validation messages. Typically
- * used by {@link org.apache.tapestry.form.validator.Validator}s.
+ * Support interface used to provide access to validation messages. Typically used by
+ * {@link org.apache.tapestry.form.validator.Validator}s.
*
* @author Howard Lewis Ship
* @since 4.0
*/
public interface ValidationMessages
{
-
/**
- * Formats a validation message. Automatically chooses the correct
- * localization.
+ * Formats a validation message. Automatically chooses the correct localization.
*
* @param messageOverride
- * a supplied override to the default message format taken from
- * the ValidationStrings.properties message catalog.
+ * a supplied override to the default message format taken from the
+ * ValidationStrings.properties message catalog.
* @param messageKey
- * used to look up pa message format when messageOverride is
- * blank (null or empty)
+ * used to look up pa message format when messageOverride is blank (null or empty)
* @param arguments
* array of arguments formatted with the message format
*/
- String formatValidationMessage(String messageOverride, String messageKey, Object[] arguments);
+ public String formatValidationMessage(String messageOverride, String messageKey,
+ Object[] arguments);
/**
* Returns the locale for which messages are generated.
*/
- Locale getLocale();
+ public Locale getLocale();
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/Translator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/Translator.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/Translator.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/translator/Translator.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,41 +16,35 @@
import java.util.Locale;
-import org.apache.tapestry.form.FormComponentContributor;
import org.apache.tapestry.form.IFormComponent;
+import org.apache.tapestry.form.FormComponentContributor;
import org.apache.tapestry.form.ValidationMessages;
import org.apache.tapestry.valid.ValidatorException;
/**
- * Interface used by {@link ValidatableField}s to both format an object as text
- * and translate submitted text into an appropriate object for a given field.
+ * Interface used by {@link ValidatableField}s to both format an object as text and translate
+ * submitted text into an appropriate object for a given field.
*
* @author Paul Ferraro
* @since 4.0
*/
public interface Translator extends FormComponentContributor
{
-
/**
- * Invoked during rendering to format an object (which may be null) into a
- * text value (which should not be null) appropriate for the specified
- * field.
- *
- * @param locale
- * TODO
+ * Invoked during rendering to format an object (which may be null) into a text value (which
+ * should not be null) appropriate for the specified field.
+ * @param locale TODO
*/
- String format(IFormComponent field, Locale locale, Object object);
+ public String format(IFormComponent field, Locale locale, Object object);
/**
- * Invoked during rewind to parse a submitted input value into an object
- * suitable for the specified component.
+ * Invoked during rewind to parse a submitted input value into an object suitable for the
+ * specified component.
+ * @param messages TODO
*
- * @param messages
- * TODO
* @return the parsed object
* @throws ValidatorException
* if the specified text could not be parsed into an object.
*/
- Object parse(IFormComponent field, ValidationMessages messages, String value)
- throws ValidatorException;
+ public Object parse(IFormComponent field, ValidationMessages messages, String value) throws ValidatorException;
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/Validator.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/Validator.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/Validator.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/Validator.java Sat Mar 11 12:54:27 2006
@@ -14,61 +14,54 @@
package org.apache.tapestry.form.validator;
-import org.apache.tapestry.form.FormComponentContributor;
import org.apache.tapestry.form.IFormComponent;
+import org.apache.tapestry.form.FormComponentContributor;
import org.apache.tapestry.form.ValidationMessages;
import org.apache.tapestry.valid.ValidatorException;
/**
- * An object that can be "attached" to a
- * {@link org.apache.tapestry.form.IFormComponent} to perform server-side
- * validation ({@link #validate(IFormComponent, ValidationMessages, Object)})
- * as well as generate cleint-side validation (in the form of JavaScript submit
- * listeners).
+ * An object that can be "attached" to a {@link org.apache.tapestry.form.IFormComponent} to perform
+ * server-side validation ({@link #validate(IFormComponent, ValidationMessages, Object)}) as well
+ * as generate cleint-side validation (in the form of JavaScript submit listeners).
*
* @author Paul Ferraro
* @since 4.0
*/
public interface Validator extends FormComponentContributor
{
-
/**
* Invoked to validate input for the field. A
- * {@link org.apache.tapestry.form.translator.Translator} will have already
- * converted the submitted user input string into an object.
+ * {@link org.apache.tapestry.form.translator.Translator} will have already converted the
+ * submitted user input string into an object.
*
* @param field
- * the form element component being validated, often used to
- * determine the
- * {@link IFormComponent#getDisplayName() user presentable name}
- * for the field, used in error messages.
+ * the form element component being validated, often used to determine the
+ * {@link IFormComponent#getDisplayName() user presentable name} for the field, used
+ * in error messages.
* @param messages
- * access to the pre-defined validation messages, in the
- * appropriate locale
+ * access to the pre-defined validation messages, in the appropriate locale
* @param object
- * the client-side representation of the field's data. May be
- * null if the client did not provide a value for the field (most
- * Validators should check for null and perform no check if
- * null).
+ * the client-side representation of the field's data. May be null if the client did
+ * not provide a value for the field (most Validators should check for null and
+ * perform no check if null).
* @throws ValidatorException
- * if the object violates the constraint represented by this
- * Validator.
+ * if the object violates the constraint represented by this Validator.
*/
- void validate(IFormComponent field, ValidationMessages messages, Object object)
- throws ValidatorException;
+ public void validate(IFormComponent field, ValidationMessages messages, Object object)
+ throws ValidatorException;
/**
- * Returns true if this validator accepts null as the object parameter to
- * validate(). When the object is null, validators that can't accept null
- * are skipped. It is rare for a validator to return true.
+ * Returns true if this validator accepts null as the object parameter to validate(). When the
+ * object is null, validators that can't accept null are skipped. It is rare for a validator to
+ * return true.
*/
- boolean getAcceptsNull();
+ public boolean getAcceptsNull();
/**
* Returns true if this field is required. Returns false otherwise.
*/
- boolean isRequired();
+ public boolean isRequired();
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorFactory.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorFactory.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorFactory.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -19,9 +19,8 @@
import org.apache.tapestry.IComponent;
/**
- * Constructs {@link org.apache.tapestry.form.validator.Validator} instances
- * from a specification. A specification is a comma-seperated list of entries.
- * Each entry is in one of the following forms:
+ * Constructs {@link org.apache.tapestry.form.validator.Validator} instances from a specification. A
+ * specification is a comma-seperated list of entries. Each entry is in one of the following forms:
* <ul>
* <li><em>name</em>
* <li><em>name</em>=<em>value</em>
@@ -30,34 +29,30 @@
* <li>$<em>name</em>
* </ul>
* <p>
- * Most validator classes are <em>configurable</em>: they have a property
- * that matches their name. For example,
- * {@link org.apache.tapestry.form.validator.MinDate} (which is named "minDate"
- * has a <code>minDate</code> property. A few validators are not configurable
- * ("required" => {@link org.apache.tapestry.form.validator.Required}, for
- * example).
+ * Most validator classes are <em>configurable</em>: they have a property that matches their
+ * name. For example, {@link org.apache.tapestry.form.validator.MinDate} (which is named "minDate"
+ * has a <code>minDate</code> property. A few validators are not configurable ("required" =>
+ * {@link org.apache.tapestry.form.validator.Required}, for example).
* <p>
- * Validators are expected to have a public no-args constructor. They are also
- * expected to have a <code>message</code> property which is set from the
- * value in brackets. The message is either a literal string, or may be prefixed
- * with a '%' character, to indicate a localized key, resolved using the
- * component's message catalog.
+ * Validators are expected to have a public no-args constructor. They are also expected to have a
+ * <code>message</code> property which is set from the value in brackets.
+ * The message is either a literal string, or may be prefixed with a '%' character, to indicate
+ * a localized key, resolved using the component's message catalog.
* <p>
- * When the name is prefixed with a dollary sign, it indicates a reference to a
- * <em>bean</em> with the given name.
+ * When the name is prefixed with a dollary sign, it indicates a reference to a <em>bean</em>
+ * with the given name.
* <p>
* A full validator specification might be:
- * <code>required,email[%email-format],minLength=20[Email addresses must be at least 20 characters long.]</code>
+ * <code>required,email[%email-format],minLength=20[Email addresses must be at least 20 characters long.]
*
* @author Howard Lewis Ship
* @since 4.0
*/
public interface ValidatorFactory
{
-
/**
- * Constructs a new (immutable) List of {@link Validator}, or returns a
- * previously constructed List.
+ * Constructs a new (immutable) List of {@link Validator}, or returns a previously constructed
+ * List.
*
* @param component
* the component for which the list is being created
@@ -65,5 +60,5 @@
* a string identifying which validators and their configuration
* @return List of {@link Validator} (possibly empty)
*/
- List constructValidatorList(IComponent component, String specification);
+ public List constructValidatorList(IComponent component, String specification);
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorMessages.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorMessages.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorMessages.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorMessages.java Sat Mar 11 12:54:27 2006
@@ -14,55 +14,53 @@
package org.apache.tapestry.form.validator;
-import org.apache.hivemind.Messages;
import org.apache.hivemind.impl.MessageFormatter;
/**
* @author Howard Lewis Ship
* @since 4.0
*/
-final class ValidatorMessages
+class ValidatorMessages
{
-
- private static final Messages MESSAGES = new MessageFormatter(ValidatorMessages.class);
-
- /** @since 4.1 */
- private ValidatorMessages()
- {
- }
+ private static final MessageFormatter _formatter = new MessageFormatter(ValidatorMessages.class);
static String unknownValidator(String name)
{
- return MESSAGES.format("unknown-validator", name);
+ return _formatter.format("unknown-validator", name);
}
static String needsConfiguration(String name)
{
- return MESSAGES.format("needs-configuration", name);
+ return _formatter.format("needs-configuration", name);
}
public static String notConfigurable(String name, String value)
{
- return MESSAGES.format("not-configurable", name, value);
+ return _formatter.format("not-configurable", name, value);
}
- public static String errorInitializingValidator(String name, Class validatorClass, Throwable cause)
+ public static String errorInitializingValidator(String name, Class validatorClass,
+ Throwable cause)
{
- return MESSAGES.format("error-initializing-validator", name, validatorClass.getName(), cause);
+ return _formatter.format(
+ "error-initializing-validator",
+ name,
+ validatorClass.getName(),
+ cause);
}
public static String badSpecification(String specification)
{
- return MESSAGES.format("bad-specification", specification);
+ return _formatter.format("bad-specification", specification);
}
public static String noValueOrMessageForBean(String name)
{
- return MESSAGES.format("no-value-or-message-for-bean", name);
+ return _formatter.format("no-value-or-message-for-bean", name);
}
public static String beanNotValidator(String name)
{
- return MESSAGES.format("bean-not-validator", name, Validator.class.getName());
+ return _formatter.format("bean-not-validator", name, Validator.class.getName());
}
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorsBindingFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorsBindingFactory.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorsBindingFactory.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorsBindingFactory.java Sat Mar 11 12:54:27 2006
@@ -22,16 +22,8 @@
import org.apache.tapestry.IComponent;
import org.apache.tapestry.binding.AbstractBindingFactory;
-/**
- * Binding factory that creates instances of
- * {@link org.apache.tapestry.form.validator.ValidatorsBinding}.
- *
- * @author Howard M. Lewis Ship
- * @since 4.0
- */
public class ValidatorsBindingFactory extends AbstractBindingFactory
{
-
private ValidatorFactory _validatorFactory;
public void setValidatorFactory(ValidatorFactory validatorFactory)
@@ -39,13 +31,15 @@
_validatorFactory = validatorFactory;
}
- public IBinding createBinding(IComponent root, String bindingDescription, String expression, Location location)
+ public IBinding createBinding(IComponent root, String bindingDescription, String expression,
+ Location location)
{
try
{
List validators = _validatorFactory.constructValidatorList(root, expression);
- return new ValidatorsBinding(bindingDescription, getValueConverter(), location, validators);
+ return new ValidatorsBinding(bindingDescription, getValueConverter(), location,
+ validators);
}
catch (Exception ex)
{
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLMessages.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLMessages.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLMessages.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLMessages.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2005, 2006 The Apache Software Foundation
+// Copyright 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,25 +14,29 @@
package org.apache.tapestry.html;
-import org.apache.hivemind.Messages;
import org.apache.hivemind.impl.MessageFormatter;
+import org.apache.tapestry.IBinding;
/**
* @author Howard M. Lewis Ship
* @since 4.0
*/
-final class HTMLMessages
+class HTMLMessages
{
+ private static final MessageFormatter _formatter = new MessageFormatter(HTMLMessages.class);
- private static final Messages MESSAGES = new MessageFormatter(HTMLMessages.class);
-
- /** @since 4.1 */
- private HTMLMessages()
+ static String textConversionError(Throwable cause)
{
+ return _formatter.format("text-conversion-error", cause);
}
-
- static String textConversionError(Throwable cause)
+
+ static String multiAssetParameterError(IBinding asset, IBinding scriptPath)
+ {
+ return _formatter.format("script-multiscript-error", new Object[] {asset, scriptPath});
+ }
+
+ static String noScriptPathError()
{
- return MESSAGES.format("text-conversion-error", cause);
+ return _formatter.getMessage("script-required-path-error");
}
}
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLStrings.properties
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLStrings.properties?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLStrings.properties (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/HTMLStrings.properties Sat Mar 11 12:54:27 2006
@@ -13,3 +13,7 @@
# limitations under the License.
text-conversion-error=Error converting text to lines (for InsertText component): {0}
+script-multiscript-error=Script component has both script IAsset parameter({0}) AND String scriptPath parameter({1}) set, \
+only one of the two parameters is allowed.
+script-required-path-error=Either the scriptAsset or the scriptPath parameter must be supplied, neither parameter \
+was set.
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertTextMode.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertTextMode.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertTextMode.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/InsertTextMode.java Sat Mar 11 12:54:27 2006
@@ -1,4 +1,4 @@
-// Copyright 2004, 2005, 2006 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
public abstract class InsertTextMode
{
-
/**
* Mode where each line (after the first) is preceded by a <br> tag.
*/
@@ -53,8 +52,7 @@
* Invoked by the {@link InsertText} component to write the next line.
*
* @param lineNumber
- * the line number of the line, starting with 0 for the first
- * line.
+ * the line number of the line, starting with 0 for the first line.
* @param line
* the String for the current line.
* @param writer
@@ -65,10 +63,8 @@
public abstract void writeLine(int lineNumber, String line, IMarkupWriter writer, boolean raw);
- /** Writes <br;gt; elements between lines. */
- private final static class BreakMode extends InsertTextMode
+ private static class BreakMode extends InsertTextMode
{
-
private BreakMode()
{
super("BREAK");
@@ -76,16 +72,15 @@
public void writeLine(int lineNumber, String line, IMarkupWriter writer, boolean raw)
{
- if (lineNumber > 0) writer.beginEmpty("br");
+ if (lineNumber > 0)
+ writer.beginEmpty("br");
writer.print(line, raw);
}
}
- /** Writes <p> elements around lines. */
- private final static class ParagraphMode extends InsertTextMode
+ private static class ParagraphMode extends InsertTextMode
{
-
private ParagraphMode()
{
super("PARAGRAPH");
@@ -101,4 +96,4 @@
}
}
-}
+}
\ No newline at end of file
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.java?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.java Sat Mar 11 12:54:27 2006
@@ -21,12 +21,12 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Resource;
import org.apache.tapestry.AbstractComponent;
+import org.apache.tapestry.IAsset;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.IScript;
import org.apache.tapestry.PageRenderSupport;
-import org.apache.tapestry.Tapestry;
import org.apache.tapestry.TapestryUtils;
import org.apache.tapestry.engine.IScriptSource;
@@ -102,19 +102,30 @@
private IScript getParsedScript()
{
+ IAsset scriptAsset = getScriptAsset();
String scriptPath = getScriptPath();
-
- if (scriptPath == null)
- throw Tapestry.createRequiredParameterException(this, "scriptPath");
-
+
+ //only one of the two is allowed
+ if (scriptAsset != null && scriptPath != null)
+ throw new ApplicationRuntimeException(HTMLMessages.multiAssetParameterError(getBinding("scriptAsset"),
+ getBinding("scriptPath")));
+
+ if (scriptPath == null && scriptAsset == null)
+ throw new ApplicationRuntimeException(HTMLMessages.noScriptPathError());
+
IScriptSource source = getScriptSource();
-
- // If the script path is relative, it should be relative to the Script component's
- // container (i.e., relative to a page in the application).
-
- Resource rootLocation = getContainer().getSpecification().getSpecificationLocation();
- Resource scriptLocation = rootLocation.getRelativeResource(scriptPath);
-
+
+ Resource scriptLocation = null;
+ if (scriptPath != null) {
+
+ // If the script path is relative, it should be relative to the Script component's
+ // container (i.e., relative to a page in the application).
+
+ Resource rootLocation = getContainer().getSpecification().getSpecificationLocation();
+ scriptLocation = rootLocation.getRelativeResource(scriptPath);
+ } else
+ scriptLocation = scriptAsset.getResourceLocation();
+
try
{
return source.getScript(scriptLocation);
@@ -144,6 +155,8 @@
public abstract String getScriptPath();
+ public abstract IAsset getScriptAsset();
+
// Parameter
public abstract Map getBaseSymbols();
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.jwc
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.jwc?rev=385164&r1=385163&r2=385164&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.jwc (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/Script.jwc Sat Mar 11 12:54:27 2006
@@ -25,9 +25,15 @@
Constructs dynamic JavaScript which is added to the page.
</description>
- <parameter name="script" property="scriptPath" required="yes">
+ <parameter name="script" property="scriptPath" >
<description>
The resource path of the script to execute.
+ </description>
+ </parameter>
+
+ <parameter name="scriptAsset" property="scriptAsset" >
+ <description>
+ IAsset reference to script.
</description>
</parameter>
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowB.png.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowB.png.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowB.png.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowB.png.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowB.png.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowBL.png.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowBL.png.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowBL.png.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowBL.png.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowBL.png.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowBR.png.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowBR.png.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowBR.png.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowBR.png.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowBR.png.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowL.png.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowL.png.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowL.png.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowL.png.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowL.png.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowR.png.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowR.png.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowR.png.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowR.png.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowR.png.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowTR..png.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowTR..png.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowTR..png.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowTR..png.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowTR..png.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowUL.png.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowUL.png.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowUL.png.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowUL.png.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowUL.png.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowUR.png.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowUR.png.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowUR.png.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowUR.png.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/html/images/shadowUR.png.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/storage/Storage.swf.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/storage/Storage.swf.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/storage/Storage.swf.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/storage/Storage.swf.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/storage/Storage.swf.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/-.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/-.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/-.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/-.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/-.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/backcolor.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/backcolor.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/backcolor.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/backcolor.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/backcolor.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/bold.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/bold.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/bold.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/bold.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/bold.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/cancel.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/cancel.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/cancel.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/cancel.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/cancel.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/copy.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/copy.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/copy.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/copy.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/copy.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/createlink.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/createlink.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/createlink.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/createlink.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/createlink.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/cut.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/cut.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/cut.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/cut.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/cut.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/delete.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/delete.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/delete.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/delete.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/delete.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/forecolor.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/forecolor.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/forecolor.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/forecolor.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/forecolor.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/hilitecolor.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/hilitecolor.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/hilitecolor.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/hilitecolor.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/hilitecolor.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/indent.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/indent.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/indent.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/indent.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/indent.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/inserthorizontalrule.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/inserthorizontalrule.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/inserthorizontalrule.gif.merge-right.r384672
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/inserthorizontalrule.gif.merge-right.r384672?rev=385164&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/inserthorizontalrule.gif.merge-right.r384672
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/insertimage.gif.merge-left.r0
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/html/dojo/src/widget/templates/buttons/insertimage.gif.merge-left.r0?rev=385164&view=auto
==============================================================================
(empty)
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org