You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2003/08/06 16:28:50 UTC
cvs commit: jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/components When.java
hlship 2003/08/06 07:28:50
Modified: framework/src/org/apache/tapestry StaleSessionException.java
StaleLinkException.java PageRedirectException.java
AbstractComponent.java
BaseComponentTemplateLoader.java Tapestry.java
BindingException.java
ApplicationRuntimeException.java
framework/src/org/apache/tapestry/form DatePicker.java
LinkSubmit.java Option.java ListEdit.java
Button.jwc Hidden.java Radio.java Select.java
Form.java RadioGroup.java
AbstractFormComponent.java
contrib project.xml
framework/src/org/apache/tapestry/param
ParameterManager.java
ConnectedParameterException.java
doc/src/ComponentReference Shell.html ValidField.html
Button.html
framework/src/org/apache/tapestry/html Rollover.java
Script.java InsertText.java Body.java
framework/src/org/apache/tapestry/link
DefaultLinkRenderer.java AbstractLinkComponent.java
framework/src/org/apache/tapestry/wml Select.java
AbstractPostfield.java Card.java
contrib/src/org/apache/tapestry/contrib/palette Palette.java
framework project.properties project.xml
framework/src/org/apache/tapestry/valid ValidField.java
FieldLabel.java BaseValidator.java
. .classpath .cvsignore project.xml
contrib/src/org/apache/tapestry/contrib/inspector
InspectorButton.java
contrib/src/org/apache/tapestry/contrib/table/components
AbstractTableViewComponent.java
AbstractTableRowComponent.java
framework/src/org/apache/tapestry/engine DirectService.java
RequestCycle.java
framework/src/org/apache/tapestry/components Any.java
web new.html
eclipse Tapestry-Junit.launch
framework/src/org/apache/tapestry/pageload PageLoader.java
examples/Vlib/src/org/apache/tapestry/vlib/components
Border.java
contrib/src/org/apache/tapestry/contrib/components When.java
Added: contrib maven.xml
framework maven.xml
Log:
Prune out unused or unneeded exception constructors for ApplicationRuntimeException and subclasses.
Revision Changes Path
1.3 +2 -2 jakarta-tapestry/framework/src/org/apache/tapestry/StaleSessionException.java
Index: StaleSessionException.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/StaleSessionException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StaleSessionException.java 15 Mar 2003 21:22:09 -0000 1.2
+++ StaleSessionException.java 6 Aug 2003 14:28:48 -0000 1.3
@@ -81,7 +81,7 @@
public StaleSessionException(String message, IPage page)
{
- super(message, page);
+ super(message, page, null, null);
_page = page;
if (page != null)
1.5 +1 -10 jakarta-tapestry/framework/src/org/apache/tapestry/StaleLinkException.java
Index: StaleLinkException.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/StaleLinkException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StaleLinkException.java 28 May 2003 13:41:38 -0000 1.4
+++ StaleLinkException.java 6 Aug 2003 14:28:48 -0000 1.5
@@ -125,16 +125,7 @@
super(message, component, null, null);
}
- public StaleLinkException(String message, IPage page)
- {
- super(message, page, null, null);
-
- _page = page;
-
- if (page != null)
- _pageName = page.getPageName();
- }
public String getPageName()
{
1.4 +2 -12 jakarta-tapestry/framework/src/org/apache/tapestry/PageRedirectException.java
Index: PageRedirectException.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/PageRedirectException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PageRedirectException.java 30 May 2003 19:43:01 -0000 1.3
+++ PageRedirectException.java 6 Aug 2003 14:28:48 -0000 1.4
@@ -70,7 +70,7 @@
public PageRedirectException(String targetPageName)
{
- this(targetPageName, null, targetPageName);
+ this(targetPageName, null, null, targetPageName);
}
public PageRedirectException(IPage page)
@@ -78,11 +78,6 @@
this(page.getPageName());
}
- public PageRedirectException(String message, IComponent component, String targetPageName)
- {
- this(message, component, null, targetPageName);
- }
-
public PageRedirectException(
String message,
Object component,
@@ -92,11 +87,6 @@
super(message, component, null, rootCause);
_targetPageName = targetPageName;
- }
-
- public PageRedirectException(String message, String targetPageName)
- {
- this(message, null, targetPageName);
}
public String getTargetPageName()
1.14 +6 -5 jakarta-tapestry/framework/src/org/apache/tapestry/AbstractComponent.java
Index: AbstractComponent.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/AbstractComponent.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractComponent.java 6 Aug 2003 03:04:10 -0000 1.13
+++ AbstractComponent.java 6 Aug 2003 14:28:48 -0000 1.14
@@ -515,8 +515,8 @@
}
}
-
- /**
+
+ /**
* Returns an object used to resolve classes.
* @since 3.0
*
@@ -577,7 +577,9 @@
if (result == null)
throw new ApplicationRuntimeException(
Tapestry.format("no-such-component", this, id),
- this);
+ this,
+ null,
+ null);
return result;
}
@@ -1181,8 +1183,7 @@
{
IResourceResolver resolver = getResourceResolver();
OgnlUtils.set(propertyName, resolver, this, value);
- }
-
+}
/**
* Gets a property of a component.
* @see IComponent
1.12 +14 -5 jakarta-tapestry/framework/src/org/apache/tapestry/BaseComponentTemplateLoader.java
Index: BaseComponentTemplateLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/BaseComponentTemplateLoader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BaseComponentTemplateLoader.java 21 Jun 2003 21:25:22 -0000 1.11
+++ BaseComponentTemplateLoader.java 6 Aug 2003 14:28:48 -0000 1.12
@@ -235,7 +235,9 @@
if (_stackx != 0)
throw new ApplicationRuntimeException(
Tapestry.getMessage("BaseComponent.unbalance-open-tags"),
- _loadComponent);
+ _loadComponent,
+ null,
+ null);
checkAllComponentsReferenced();
}
@@ -316,7 +318,7 @@
_requestCycle,
_loadComponent,
id,
- componentType,
+ componentType,
location);
return result;
@@ -368,7 +370,12 @@
IComponentSpecification spec = component.getSpecification();
// add a static binding carrying the template tag
- addStaticBinding(component, spec, ITemplateSource.TEMPLATE_TAG_PARAMETER_NAME, token.getTag(), token.getLocation());
+ addStaticBinding(
+ component,
+ spec,
+ ITemplateSource.TEMPLATE_TAG_PARAMETER_NAME,
+ token.getTag(),
+ token.getLocation());
Map attributes = token.getAttributesMap();
@@ -660,6 +667,8 @@
{
return new ApplicationRuntimeException(
Tapestry.getMessage("BaseComponentTemplateLoader.bodyless-component"),
- component);
+ component,
+ null,
+ null);
}
}
1.16 +5 -2 jakarta-tapestry/framework/src/org/apache/tapestry/Tapestry.java
Index: Tapestry.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/Tapestry.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Tapestry.java 1 Jul 2003 20:49:36 -0000 1.15
+++ Tapestry.java 6 Aug 2003 14:28:48 -0000 1.16
@@ -1268,6 +1268,7 @@
return new BindingException(
format("required-parameter", parameterName, component.getExtendedId()),
component,
+ null,
component.getBinding(parameterName),
null);
}
@@ -1280,7 +1281,9 @@
{
return new ApplicationRuntimeException(
format("render-only-property", propertyName, component.getExtendedId()),
- component);
+ component,
+ null,
+ null);
}
/**
1.7 +2 -10 jakarta-tapestry/framework/src/org/apache/tapestry/BindingException.java
Index: BindingException.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/BindingException.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BindingException.java 30 May 2003 19:43:01 -0000 1.6
+++ BindingException.java 6 Aug 2003 14:28:48 -0000 1.7
@@ -75,17 +75,9 @@
public BindingException(String message, IBinding binding, Throwable rootCause)
{
- this(message, null, binding, rootCause);
+ this(message, null, null, binding, rootCause);
}
- public BindingException(
- String message,
- Object component,
- IBinding binding,
- Throwable rootCause)
- {
- this(message, component, null, binding, rootCause);
- }
public BindingException(
String message,
1.6 +1 -16 jakarta-tapestry/framework/src/org/apache/tapestry/ApplicationRuntimeException.java
Index: ApplicationRuntimeException.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/ApplicationRuntimeException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApplicationRuntimeException.java 30 May 2003 19:43:01 -0000 1.5
+++ ApplicationRuntimeException.java 6 Aug 2003 14:28:48 -0000 1.6
@@ -73,11 +73,6 @@
private transient ILocation _location;
private transient Object _component;
- public ApplicationRuntimeException(Object component, Throwable rootCause)
- {
- this(rootCause.getMessage(), component, null, rootCause);
- }
-
public ApplicationRuntimeException(Throwable rootCause)
{
this(rootCause.getMessage(), rootCause);
@@ -91,16 +86,6 @@
public ApplicationRuntimeException(String message, Throwable rootCause)
{
this(message, null, null, rootCause);
- }
-
- public ApplicationRuntimeException(String message, IComponent component)
- {
- this(message, component, null, null);
- }
-
- public ApplicationRuntimeException(String message, Object component, Throwable ex)
- {
- this(message, component, null, ex);
}
public ApplicationRuntimeException(
1.9 +4 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/DatePicker.java
Index: DatePicker.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/DatePicker.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DatePicker.java 1 Jul 2003 20:49:33 -0000 1.8
+++ DatePicker.java 6 Aug 2003 14:28:48 -0000 1.9
@@ -151,7 +151,9 @@
if (body == null)
throw new ApplicationRuntimeException(
Tapestry.format("must-be-contained-by-body", "DatePicker"),
- this);
+ this,
+ null,
+ null);
Locale locale = getPage().getLocale();
DateFormatSymbols dfs = new DateFormatSymbols(locale);
1.3 +33 -19 jakarta-tapestry/framework/src/org/apache/tapestry/form/LinkSubmit.java
Index: LinkSubmit.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/LinkSubmit.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LinkSubmit.java 28 May 2003 13:41:36 -0000 1.2
+++ LinkSubmit.java 6 Aug 2003 14:28:48 -0000 1.3
@@ -74,7 +74,8 @@
*
**/
-public abstract class LinkSubmit extends AbstractFormComponent {
+public abstract class LinkSubmit extends AbstractFormComponent
+{
/**
* The name of an {@link org.apache.tapestry.IRequestCycle} attribute in which the
* current submit link is stored. LinkSubmits do not nest.
@@ -90,14 +91,15 @@
* LinkSubmit)
*
**/
- public static final String ATTRIBUTE_FUNCTION_NAME = "org.apache.tapestry.form.LinkSubmit_function";
+ public static final String ATTRIBUTE_FUNCTION_NAME =
+ "org.apache.tapestry.form.LinkSubmit_function";
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
IForm form = getForm(cycle);
String formName = form.getName();
-
+
boolean rewinding = form.isRewinding();
String name = form.getElementId(this);
@@ -105,42 +107,52 @@
IMarkupWriter wrappedWriter;
if (cycle.getAttribute(ATTRIBUTE_NAME) != null)
- throw new ApplicationRuntimeException(Tapestry.getMessage("LinkSubmit.may-not-nest"), this);
+ throw new ApplicationRuntimeException(
+ Tapestry.getMessage("LinkSubmit.may-not-nest"),
+ this,
+ null,
+ null);
cycle.setAttribute(ATTRIBUTE_NAME, this);
boolean disabled = isDisabled();
if (!disabled)
{
- if (!rewinding) {
+ if (!rewinding)
+ {
Body body = Body.get(cycle);
// make sure the submit function is on the page (once)
- if (cycle.getAttribute(ATTRIBUTE_FUNCTION_NAME) == null) {
- body.addBodyScript("function submitLink(form, elementId) { form._linkSubmit.value = elementId; if (form.onsubmit == null || form.onsubmit()) form.submit(); }");
+ if (cycle.getAttribute(ATTRIBUTE_FUNCTION_NAME) == null)
+ {
+ body.addBodyScript(
+ "function submitLink(form, elementId) { form._linkSubmit.value = elementId; if (form.onsubmit == null || form.onsubmit()) form.submit(); }");
cycle.setAttribute(ATTRIBUTE_FUNCTION_NAME, this);
}
-
+
// one hidden field per form:
String formHiddenFieldAttributeName = ATTRIBUTE_FUNCTION_NAME + formName;
- if (cycle.getAttribute(formHiddenFieldAttributeName) == null) {
+ if (cycle.getAttribute(formHiddenFieldAttributeName) == null)
+ {
writer.beginEmpty("input");
writer.attribute("type", "hidden");
writer.attribute("name", "_linkSubmit");
cycle.setAttribute(formHiddenFieldAttributeName, this);
}
- }
- else {
+ }
+ else
+ {
// How to know which Submit link was actually
// clicked? When submitted, it sets its elementId into a hidden field
-
+
String value = cycle.getRequestContext().getParameter("_linkSubmit");
-
+
// If the value isn't the elementId of this component, then this link wasn't
// selected.
-
- if (value != null && value.equals(name)) {
- IBinding selectedBinding = getSelectedBinding();
+
+ if (value != null && value.equals(name))
+ {
+ IBinding selectedBinding = getSelectedBinding();
if (selectedBinding != null)
selectedBinding.setObject(getTag());
IActionListener listener = getListener();
@@ -148,9 +160,11 @@
listener.actionTriggered(this, cycle);
}
}
-
+
writer.begin("a");
- writer.attribute("href", "javascript:submitLink(document." + formName + ",\"" + name + "\");");
+ writer.attribute(
+ "href",
+ "javascript:submitLink(document." + formName + ",\"" + name + "\");");
// Allow the wrapped components a chance to render.
// Along the way, they may interact with this component
@@ -182,7 +196,7 @@
}
public abstract boolean isDisabled();
-
+
public abstract void setDisabled(boolean disabled);
public abstract IActionListener getListener();
1.6 +5 -3 jakarta-tapestry/framework/src/org/apache/tapestry/form/Option.java
Index: Option.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Option.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Option.java 28 May 2003 13:41:37 -0000 1.5
+++ Option.java 6 Aug 2003 14:28:48 -0000 1.6
@@ -86,12 +86,14 @@
**/
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
-{
+ {
Select select = Select.get(cycle);
if (select == null)
throw new ApplicationRuntimeException(
Tapestry.getMessage("Option.must-be-contained-by-select"),
- this);
+ this,
+ null,
+ null);
// It isn't enough to know whether the cycle in general is rewinding, need to know
// specifically if the form which contains this component is rewinding.
1.9 +5 -4 jakarta-tapestry/framework/src/org/apache/tapestry/form/ListEdit.java
Index: ListEdit.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/ListEdit.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ListEdit.java 28 May 2003 13:41:36 -0000 1.8
+++ ListEdit.java 6 Aug 2003 14:28:48 -0000 1.9
@@ -173,11 +173,11 @@
throw new ApplicationRuntimeException(
Tapestry.format("ListEdit.unable-to-convert-value", value),
this,
+ null,
ex);
}
-
- form.addHiddenValue(name, externalValue);
+ form.addHiddenValue(name, externalValue);
}
private Object convertValue(String value)
@@ -191,6 +191,7 @@
throw new ApplicationRuntimeException(
Tapestry.format("ListEdit.unable-to-convert-string", value),
this,
+ null,
ex);
}
}
@@ -215,7 +216,7 @@
public abstract IBinding getIndexBinding();
/** @since 3.0 **/
-
+
public boolean isDisabled()
{
return false;
1.4 +1 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/Button.jwc
Index: Button.jwc
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Button.jwc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Button.jwc 1 Jun 2003 05:05:02 -0000 1.3
+++ Button.jwc 6 Aug 2003 14:28:48 -0000 1.4
@@ -12,7 +12,6 @@
<parameter name="label" type="java.lang.String" direction="in"/>
<parameter name="disabled" type="boolean" direction="in"/>
- <parameter name="selected"/>
<reserved-parameter name="name"/>
<reserved-parameter name="type"/>
1.7 +14 -14 jakarta-tapestry/framework/src/org/apache/tapestry/form/Hidden.java
Index: Hidden.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Hidden.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Hidden.java 21 May 2003 23:39:39 -0000 1.6
+++ Hidden.java 6 Aug 2003 14:28:48 -0000 1.7
@@ -107,13 +107,13 @@
}
catch (IOException ex)
{
- throw new ApplicationRuntimeException(this, ex);
+ throw new ApplicationRuntimeException(ex.getMessage(), this, null, ex);
}
}
else
externalValue = (String) getValueBinding().getObject("value", String.class);
- form.addHiddenValue(name, externalValue);
+ form.addHiddenValue(name, externalValue);
return;
}
@@ -129,7 +129,7 @@
}
catch (IOException ex)
{
- throw new ApplicationRuntimeException(this, ex);
+ throw new ApplicationRuntimeException(ex.getMessage(), this, null, ex);
}
}
else
@@ -181,16 +181,16 @@
**/
public abstract boolean getEncode();
-
+
public abstract void setEncode(boolean encode);
- /**
- * Sets the encode parameter property to its default, true.
- *
- * @since 3.0
- */
- protected void finishLoad()
- {
- setEncode(true);
- }
+ /**
+ * Sets the encode parameter property to its default, true.
+ *
+ * @since 3.0
+ */
+ protected void finishLoad()
+ {
+ setEncode(true);
+ }
}
1.6 +4 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/Radio.java
Index: Radio.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Radio.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Radio.java 28 May 2003 13:41:37 -0000 1.5
+++ Radio.java 6 Aug 2003 14:28:48 -0000 1.6
@@ -94,7 +94,9 @@
if (group == null)
throw new ApplicationRuntimeException(
Tapestry.getMessage("Radio.must-be-contained-by-group"),
- this);
+ this,
+ null,
+ null);
// The group determines rewinding from the form.
1.7 +10 -6 jakarta-tapestry/framework/src/org/apache/tapestry/form/Select.java
Index: Select.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Select.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Select.java 28 May 2003 13:41:37 -0000 1.6
+++ Select.java 6 Aug 2003 14:28:48 -0000 1.7
@@ -103,13 +103,13 @@
}
public abstract boolean isDisabled();
-
+
public abstract boolean isMultiple();
-
+
public boolean isRewinding()
{
if (!_rendering)
- throw Tapestry.createRenderOnlyPropertyException(this, "rewinding");
+ throw Tapestry.createRenderOnlyPropertyException(this, "rewinding");
return _rewinding;
}
@@ -140,9 +140,13 @@
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
IForm form = getForm(cycle);
-
+
if (cycle.getAttribute(ATTRIBUTE_NAME) != null)
- throw new ApplicationRuntimeException(Tapestry.getMessage("Select.may-not-nest"), this);
+ throw new ApplicationRuntimeException(
+ Tapestry.getMessage("Select.may-not-nest"),
+ this,
+ null,
+ null);
// It isn't enough to know whether the cycle in general is rewinding, need to know
// specifically if the form which contains this component is rewinding.
1.12 +10 -4 jakarta-tapestry/framework/src/org/apache/tapestry/form/Form.java
Index: Form.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/Form.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Form.java 1 Jul 2003 20:49:33 -0000 1.11
+++ Form.java 6 Aug 2003 14:28:48 -0000 1.12
@@ -319,7 +319,9 @@
if (cycle.getAttribute(ATTRIBUTE_NAME) != null)
throw new ApplicationRuntimeException(
Tapestry.getMessage("Form.forms-may-not-nest"),
- this);
+ this,
+ null,
+ null);
cycle.setAttribute(ATTRIBUTE_NAME, this);
}
@@ -514,7 +516,9 @@
if (body == null)
throw new ApplicationRuntimeException(
Tapestry.getMessage("Form.needs-body-for-event-handlers"),
- this);
+ this,
+ null,
+ null);
StringBuffer buffer = new StringBuffer();
@@ -777,7 +781,9 @@
getExtendedId(),
_encodingType,
encodingType),
- this);
+ this,
+ null,
+ null);
_encodingType = encodingType;
}
1.5 +10 -6 jakarta-tapestry/framework/src/org/apache/tapestry/form/RadioGroup.java
Index: RadioGroup.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/RadioGroup.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RadioGroup.java 28 May 2003 13:41:37 -0000 1.4
+++ RadioGroup.java 6 Aug 2003 14:28:48 -0000 1.5
@@ -76,7 +76,7 @@
**/
public abstract class RadioGroup extends AbstractFormComponent
-{
+{
// Cached copy of the value from the selectedBinding
private Object _selection;
@@ -119,11 +119,11 @@
**/
public abstract boolean isDisabled();
-
+
public boolean isRewinding()
{
if (!_rendering)
- throw Tapestry.createRenderOnlyPropertyException(this, "rewinding");
+ throw Tapestry.createRenderOnlyPropertyException(this, "rewinding");
return _rewinding;
}
@@ -138,7 +138,7 @@
public boolean isSelection(Object value)
{
if (!_rendering)
- throw Tapestry.createRenderOnlyPropertyException(this, "selection");
+ throw Tapestry.createRenderOnlyPropertyException(this, "selection");
if (_selection == value)
return true;
@@ -184,7 +184,11 @@
IForm form = getForm(cycle);
if (cycle.getAttribute(ATTRIBUTE_NAME) != null)
- throw new ApplicationRuntimeException(Tapestry.getMessage("RadioGroup.may-not-nest"), this);
+ throw new ApplicationRuntimeException(
+ Tapestry.getMessage("RadioGroup.may-not-nest"),
+ this,
+ null,
+ null);
// It isn't enough to know whether the cycle in general is rewinding, need to know
// specifically if the form which contains this component is rewinding.
1.5 +4 -2 jakarta-tapestry/framework/src/org/apache/tapestry/form/AbstractFormComponent.java
Index: AbstractFormComponent.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/form/AbstractFormComponent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractFormComponent.java 28 May 2003 13:41:37 -0000 1.4
+++ AbstractFormComponent.java 6 Aug 2003 14:28:48 -0000 1.5
@@ -92,7 +92,9 @@
if (result == null)
throw new ApplicationRuntimeException(
Tapestry.getMessage("AbstractFormComponent.must-be-contained-by-form"),
- this);
+ this,
+ null,
+ null);
setForm(result);
1.3 +8 -1 jakarta-tapestry/contrib/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 22 Jun 2003 02:56:14 -0000 1.2
+++ project.xml 6 Aug 2003 14:28:49 -0000 1.3
@@ -17,6 +17,13 @@
<artifactId>jboss-j2ee</artifactId>
<version>3.2.1</version>
</dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+
</dependencies>
<build>
1.1 jakarta-tapestry/contrib/maven.xml
Index: maven.xml
===================================================================
<!-- $Id: maven.xml,v 1.1 2003/08/06 14:28:49 hlship Exp $ -->
<!-- Just to keep Maven from picking up the maven.xml in the root directory. -->
<project default="jar"/>
1.8 +9 -5 jakarta-tapestry/framework/src/org/apache/tapestry/param/ParameterManager.java
Index: ParameterManager.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/param/ParameterManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ParameterManager.java 1 Jul 2003 20:49:33 -0000 1.7
+++ ParameterManager.java 6 Aug 2003 14:28:49 -0000 1.8
@@ -228,7 +228,8 @@
propertyName),
_component,
name,
- propertyName);
+ propertyName,
+ null);
}
if (!propertyInfo.isReadWrite())
@@ -240,7 +241,8 @@
propertyName),
_component,
name,
- propertyName);
+ propertyName,
+ null);
}
// Check if the parameter type matches the property type
@@ -257,7 +259,8 @@
_component.getExtendedId()),
_component,
name,
- propertyName);
+ propertyName,
+ null);
}
if (!propertyType.equals(parameterType))
@@ -272,7 +275,8 @@
propertyType.toString()}),
_component,
name,
- propertyName);
+ propertyName,
+ null);
}
// Here's where we will sniff it for type, for the moment
1.7 +1 -10 jakarta-tapestry/framework/src/org/apache/tapestry/param/ConnectedParameterException.java
Index: ConnectedParameterException.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/param/ConnectedParameterException.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ConnectedParameterException.java 1 Jun 2003 12:35:41 -0000 1.6
+++ ConnectedParameterException.java 6 Aug 2003 14:28:49 -0000 1.7
@@ -77,15 +77,6 @@
String message,
Object component,
String parameterName,
- String propertyName)
- {
- this(message, component, parameterName, propertyName, null);
- }
-
- public ConnectedParameterException(
- String message,
- Object component,
- String parameterName,
String propertyName,
Throwable rootCause)
{
1.12 +2 -2 jakarta-tapestry/doc/src/ComponentReference/Shell.html
Index: Shell.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/doc/src/ComponentReference/Shell.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Shell.html 31 Mar 2003 21:47:57 -0000 1.11
+++ Shell.html 6 Aug 2003 14:28:49 -0000 1.12
@@ -163,7 +163,7 @@
</tr>
</table>
<P>Body: <STRONG>rendered<BR></STRONG>Informal parameters:
- <STRONG>allowed</STRONG>
+ <STRONG>forbidden</STRONG>
<br>
Reserved parameters: <EM>none</EM>
1.21 +0 -11 jakarta-tapestry/doc/src/ComponentReference/ValidField.html
Index: ValidField.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/doc/src/ComponentReference/ValidField.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ValidField.html 26 Jul 2003 02:18:27 -0000 1.20
+++ ValidField.html 6 Aug 2003 14:28:49 -0000 1.21
@@ -184,17 +184,6 @@
form element.
</td>
</tr>
- <tr>
- <td>hidden</td>
- <td>boolean</td>
- <td>in</td>
- <td>no</td>
- <td>false</td>
- <td>
- If true, then the text field is written as a <input type="password">
- form element.
- </td>
- </tr>
<tr>
<td>disabled</td>
<td>boolean</td>
1.5 +1 -13 jakarta-tapestry/doc/src/ComponentReference/Button.html
Index: Button.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/doc/src/ComponentReference/Button.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Button.html 24 Mar 2003 20:41:43 -0000 1.4
+++ Button.html 6 Aug 2003 14:28:49 -0000 1.5
@@ -102,18 +102,6 @@
the mouse); the browser should provide a "greyed out" appearance.
</td>
</tr>
- <tr>
- <td>selected</td>
- <td>Object</td>
- <td>out</td>
- <td>no</td>
- <td> </td>
- <td>
- This parameter is bound to a property that is updated when the submit
- button is clicked by the user. The property is updated to match the tag
- parameter.
- </td>
- </tr>
</table><BR>Body: <STRONG>removed</STRONG><BR>
Informal parameters: <STRONG>allowed</STRONG><br>
Reserved parameters: "name", "type"
1.6 +7 -3 jakarta-tapestry/framework/src/org/apache/tapestry/html/Rollover.java
Index: Rollover.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/html/Rollover.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Rollover.java 28 May 2003 13:41:42 -0000 1.5
+++ Rollover.java 6 Aug 2003 14:28:49 -0000 1.6
@@ -121,7 +121,9 @@
if (body == null)
throw new ApplicationRuntimeException(
Tapestry.getMessage("Rollover.must-be-contained-by-body"),
- this);
+ this,
+ null,
+ null);
ILinkComponent serviceLink =
(ILinkComponent) cycle.getAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME);
@@ -129,7 +131,9 @@
if (serviceLink == null)
throw new ApplicationRuntimeException(
Tapestry.getMessage("Rollover.must-be-contained-by-link"),
- this);
+ this,
+ null,
+ null);
boolean linkDisabled = serviceLink.isDisabled();
1.7 +5 -3 jakarta-tapestry/framework/src/org/apache/tapestry/html/Script.java
Index: Script.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/html/Script.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Script.java 28 May 2003 13:41:42 -0000 1.6
+++ Script.java 6 Aug 2003 14:28:49 -0000 1.7
@@ -163,7 +163,7 @@
}
catch (RuntimeException ex)
{
- throw new ApplicationRuntimeException(this, ex);
+ throw new ApplicationRuntimeException(ex.getMessage(), this, null, ex);
}
}
@@ -177,7 +177,9 @@
if (body == null)
throw new ApplicationRuntimeException(
Tapestry.getMessage("Script.must-be-contained-by-body"),
- this);
+ this,
+ null,
+ null);
_symbols = getInputSymbols();
1.5 +8 -7 jakarta-tapestry/framework/src/org/apache/tapestry/html/InsertText.java
Index: InsertText.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/html/InsertText.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InsertText.java 28 May 2003 13:41:42 -0000 1.4
+++ InsertText.java 6 Aug 2003 14:28:49 -0000 1.5
@@ -125,6 +125,7 @@
throw new ApplicationRuntimeException(
Tapestry.getMessage("InsertText.conversion-error"),
this,
+ null,
ex);
}
finally
@@ -155,12 +156,12 @@
public abstract String getValue();
- /**
- * Sets the mode parameter property to its default,
- * {@link InsertTextMode#BREAK}.
- *
- * @since 3.0
- */
+ /**
+ * Sets the mode parameter property to its default,
+ * {@link InsertTextMode#BREAK}.
+ *
+ * @since 3.0
+ */
protected void finishLoad()
{
setMode(InsertTextMode.BREAK);
1.8 +14 -8 jakarta-tapestry/framework/src/org/apache/tapestry/html/Body.java
Index: Body.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/html/Body.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Body.java 28 May 2003 13:41:42 -0000 1.7
+++ Body.java 6 Aug 2003 14:28:49 -0000 1.8
@@ -241,7 +241,9 @@
if (!(scriptLocation instanceof ClasspathResourceLocation))
throw new ApplicationRuntimeException(
Tapestry.format("Body.include-classpath-script-only", scriptLocation),
- this);
+ this,
+ null,
+ null);
// Record the URL so we don't include it twice.
@@ -293,7 +295,11 @@
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
if (cycle.getAttribute(ATTRIBUTE_NAME) != null)
- throw new ApplicationRuntimeException(Tapestry.getMessage("Body.may-not-nest"), this);
+ throw new ApplicationRuntimeException(
+ Tapestry.getMessage("Body.may-not-nest"),
+ this,
+ null,
+ null);
cycle.setAttribute(ATTRIBUTE_NAME, this);
@@ -418,11 +424,11 @@
public abstract void setElement(String element);
- /**
- * Sets the element parameter property to its default, "body".
- *
- * @since 3.0
- */
+ /**
+ * Sets the element parameter property to its default, "body".
+ *
+ * @since 3.0
+ */
protected void finishLoad()
{
setElement("body");
1.6 +4 -2 jakarta-tapestry/framework/src/org/apache/tapestry/link/DefaultLinkRenderer.java
Index: DefaultLinkRenderer.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/link/DefaultLinkRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultLinkRenderer.java 28 May 2003 13:41:48 -0000 1.5
+++ DefaultLinkRenderer.java 6 Aug 2003 14:28:49 -0000 1.6
@@ -89,7 +89,9 @@
if (cycle.getAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME) != null)
throw new ApplicationRuntimeException(
Tapestry.getMessage("AbstractLinkComponent.no-nesting"),
- linkComponent);
+ linkComponent,
+ null,
+ null);
cycle.setAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME, linkComponent);
1.9 +10 -8 jakarta-tapestry/framework/src/org/apache/tapestry/link/AbstractLinkComponent.java
Index: AbstractLinkComponent.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/link/AbstractLinkComponent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractLinkComponent.java 28 May 2003 13:41:48 -0000 1.8
+++ AbstractLinkComponent.java 6 Aug 2003 14:28:49 -0000 1.9
@@ -163,7 +163,9 @@
if (body == null)
throw new ApplicationRuntimeException(
Tapestry.getMessage("AbstractLinkComponent.events-need-body"),
- this);
+ this,
+ null,
+ null);
Iterator i = _eventHandlers.entrySet().iterator();
@@ -259,12 +261,12 @@
return null;
}
- /**
- * Sets the renderer parameter property to its default value
- * {@link DefaultLinkRenderer#SHARED_INSTANCE}.
- *
- * @since 3.0
- */
+ /**
+ * Sets the renderer parameter property to its default value
+ * {@link DefaultLinkRenderer#SHARED_INSTANCE}.
+ *
+ * @since 3.0
+ */
protected void finishLoad()
{
setRenderer(DefaultLinkRenderer.SHARED_INSTANCE);
1.8 +29 -24 jakarta-tapestry/framework/src/org/apache/tapestry/wml/Select.java
Index: Select.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/Select.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Select.java 24 Jun 2003 01:52:19 -0000 1.7
+++ Select.java 6 Aug 2003 14:28:49 -0000 1.8
@@ -90,50 +90,55 @@
* @see org.apache.tapestry.AbstractComponent#renderComponent(IMarkupWriter, IRequestCycle)
**/
- protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
- {
- if (cycle.getAttribute(ATTRIBUTE_NAME) != null)
- throw new ApplicationRuntimeException(Tapestry.getMessage("Select.may-not-nest"), this);
+ protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
+ {
+ if (cycle.getAttribute(ATTRIBUTE_NAME) != null)
+ throw new ApplicationRuntimeException(
+ Tapestry.getMessage("Select.may-not-nest"),
+ this,
+ null,
+ null);
- cycle.setAttribute(ATTRIBUTE_NAME, this);
+ cycle.setAttribute(ATTRIBUTE_NAME, this);
- boolean render = !cycle.isRewinding();
+ boolean render = !cycle.isRewinding();
- if (render) {
- writer.begin("select");
+ if (render)
+ {
+ writer.begin("select");
- writer.attribute("name", getName());
+ writer.attribute("name", getName());
String value = getValue();
- if (StringUtils.isNotEmpty(value))
- writer.attribute("value", value);
+ if (StringUtils.isNotEmpty(value))
+ writer.attribute("value", value);
String title = getTitle();
- if (StringUtils.isNotEmpty(title))
- writer.attribute("title", title);
+ if (StringUtils.isNotEmpty(title))
+ writer.attribute("title", title);
- boolean multiple = isMultiple();
+ boolean multiple = isMultiple();
if (multiple)
- writer.attribute("multiple", multiple);
+ writer.attribute("multiple", multiple);
+
+ renderInformalParameters(writer, cycle);
+ }
- renderInformalParameters(writer, cycle);
- }
-
renderBody(writer, cycle);
if (render)
- {
+ {
writer.end();
}
cycle.removeAttribute(ATTRIBUTE_NAME);
- }
+ }
public abstract boolean isMultiple();
- public abstract String getName();
+ public abstract String getName();
- public abstract String getValue();
+ public abstract String getValue();
- public abstract String getTitle();
+ public abstract String getTitle();
}
1.7 +12 -9 jakarta-tapestry/framework/src/org/apache/tapestry/wml/AbstractPostfield.java
Index: AbstractPostfield.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/AbstractPostfield.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractPostfield.java 28 May 2003 13:41:43 -0000 1.6
+++ AbstractPostfield.java 6 Aug 2003 14:28:49 -0000 1.7
@@ -63,7 +63,6 @@
import org.apache.tapestry.Tapestry;
import org.apache.tapestry.form.AbstractFormComponent;
-
/**
* A base class for building components that correspond to WML postfield elements.
* All such components must be wrapped (directly or indirectly) by
@@ -79,19 +78,23 @@
{
/**
- * Returns the {@link org.apache.tapestry.wml.Go} wrapping this component.
- *
- * @throws ApplicationRuntimeException if the component is not wrapped by a
- * {@link org.apache.tapestry.wml.Go}.
- *
- **/
+ * Returns the {@link org.apache.tapestry.wml.Go} wrapping this component.
+ *
+ * @throws ApplicationRuntimeException if the component is not wrapped by a
+ * {@link org.apache.tapestry.wml.Go}.
+ *
+ **/
public IForm getForm(IRequestCycle cycle)
{
IForm result = Go.get(cycle);
if (result == null)
- throw new ApplicationRuntimeException(Tapestry.getMessage("Postfield.must-be-contained-by-go"), this);
+ throw new ApplicationRuntimeException(
+ Tapestry.getMessage("Postfield.must-be-contained-by-go"),
+ this,
+ null,
+ null);
setForm(result);
1.8 +6 -2 jakarta-tapestry/framework/src/org/apache/tapestry/wml/Card.java
Index: Card.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/wml/Card.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Card.java 24 Jun 2003 01:52:19 -0000 1.7
+++ Card.java 6 Aug 2003 14:28:49 -0000 1.8
@@ -83,7 +83,11 @@
protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
{
if (cycle.getAttribute(ATTRIBUTE_NAME) != null)
- throw new ApplicationRuntimeException(Tapestry.getMessage("Card.cards-may-not-nest"), this);
+ throw new ApplicationRuntimeException(
+ Tapestry.getMessage("Card.cards-may-not-nest"),
+ this,
+ null,
+ null);
cycle.setAttribute(ATTRIBUTE_NAME, this);
1.9 +7 -3 jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/palette/Palette.java
Index: Palette.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/palette/Palette.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Palette.java 28 May 2003 13:39:48 -0000 1.8
+++ Palette.java 6 Aug 2003 14:28:49 -0000 1.9
@@ -316,7 +316,9 @@
if (form == null)
throw new ApplicationRuntimeException(
"Palette component must be wrapped by a Form.",
- this);
+ this,
+ null,
+ null);
setForm(form);
@@ -394,7 +396,9 @@
if (body == null)
throw new ApplicationRuntimeException(
"Palette component must be wrapped by a Body.",
- this);
+ this,
+ null,
+ null);
setImage(body, cycle, "selectImage", getSelectImage());
setImage(body, cycle, "selectDisabledImage", getSelectDisabledImage());
1.2 +1 -2 jakarta-tapestry/framework/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 23 Jun 2003 18:40:42 -0000 1.1
+++ project.properties 6 Aug 2003 14:28:49 -0000 1.2
@@ -1,6 +1,5 @@
# $Id$
-root.path=/..
maven.xdoc.version=${pom.currentVersion}
maven.license.licenseFile=${basedir}/../LICENSE.txt
maven.xdoc.date=left
1.5 +13 -6 jakarta-tapestry/framework/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 23 Jun 2003 18:40:42 -0000 1.4
+++ project.xml 6 Aug 2003 14:28:49 -0000 1.5
@@ -9,16 +9,23 @@
This is the subproject for the master Tapestry framework.
</description>
+ <dependencies>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+
+ </dependencies>
+
<build>
- <sourceDirectory>src</sourceDirectory>
+ <sourceDirectory>${basedir}/src</sourceDirectory>
<!-- J A R R E S O U R C E S -->
<!-- Resources that are packaged up inside the JAR file -->
<resources>
<resource>
-
- <!-- Note: THIS ISN'T WORKING! -->
-
- <directory>${basedir}/src/java</directory>
+
+ <directory>${basedir}/src</directory>
<include>**/*.html</include>
<include>**/*.dtd</include>
1.4 +3 -15 jakarta-tapestry/framework/maven.xml
1.10 +4 -2 jakarta-tapestry/framework/src/org/apache/tapestry/valid/ValidField.java
Index: ValidField.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/valid/ValidField.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ValidField.java 1 Jul 2003 20:49:34 -0000 1.9
+++ ValidField.java 6 Aug 2003 14:28:49 -0000 1.10
@@ -113,7 +113,9 @@
"ValidField.no-delegate",
getExtendedId(),
getForm().getExtendedId()),
- this);
+ this,
+ null,
+ null);
IValidator validator = getValidator();
1.6 +2 -1 jakarta-tapestry/framework/src/org/apache/tapestry/valid/FieldLabel.java
Index: FieldLabel.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/valid/FieldLabel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FieldLabel.java 28 May 2003 13:41:48 -0000 1.5
+++ FieldLabel.java 6 Aug 2003 14:28:49 -0000 1.6
@@ -107,6 +107,7 @@
throw new BindingException(
Tapestry.format("FieldLabel.no-display-name", field.getExtendedId()),
this,
+ null,
getBinding("field"),
null);
1.7 +9 -7 jakarta-tapestry/framework/src/org/apache/tapestry/valid/BaseValidator.java
Index: BaseValidator.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/valid/BaseValidator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseValidator.java 1 Jul 2003 20:49:34 -0000 1.6
+++ BaseValidator.java 6 Aug 2003 14:28:49 -0000 1.7
@@ -334,13 +334,15 @@
IScript script = source.getScript(location);
- Body body = Body.get(cycle);
+ Body body = Body.get(cycle);
+
+ if (body == null)
+ throw new ApplicationRuntimeException(
+ Tapestry.getMessage("ValidField.must-be-contained-by-body"),
+ field,
+ null,
+ null);
- if (body == null)
- throw new ApplicationRuntimeException(
- Tapestry.getMessage("ValidField.must-be-contained-by-body"),
- field);
-
script.execute(cycle, body, finalSymbols);
String functionName = (String) finalSymbols.get(FUNCTION_SYMBOL);
1.37 +3 -3 jakarta-tapestry/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/jakarta-tapestry/.classpath,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .classpath 17 Jul 2003 12:40:02 -0000 1.36
+++ .classpath 6 Aug 2003 14:28:49 -0000 1.37
@@ -23,9 +23,9 @@
<classpathentry exported="true" kind="lib" path="lib/ext/commons-beanutils-1.6.1.jar"/>
<classpathentry kind="lib" path="examples/Workbench/lib/jCharts-0.6.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ext/commons-collections-2.1.jar"/>
- <classpathentry kind="lib" path="lib/ext/ognl-2.5.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/ext/ognl-2.5.1.jar"/>
<classpathentry kind="lib" path="lib/ext/commons-fileupload-1.0.jar"/>
- <classpathentry kind="lib" path="lib/ext/javassist-2.5.1.jar"/>
- <classpathentry kind="lib" path="lib/ext/commons-digester-1.5.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/ext/javassist-2.5.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/ext/commons-digester-1.5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1.8 +1 -0 jakarta-tapestry/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-tapestry/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 30 May 2003 19:43:21 -0000 1.7
+++ .cvsignore 6 Aug 2003 14:28:49 -0000 1.8
@@ -5,3 +5,4 @@
target
maven.log
velocity.log
+*.out
1.9 +8 -2 jakarta-tapestry/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 17 Jul 2003 16:02:29 -0000 1.8
+++ project.xml 6 Aug 2003 14:28:49 -0000 1.9
@@ -2,7 +2,7 @@
<project>
<pomVersion>3</pomVersion>
<name>Tapestry Web Application Framework</name>
- <id>tapestry</id>
+ <id>tapestry-main</id>
<groupId>jakarta-tapestry</groupId>
<currentVersion>3.0-beta-3</currentVersion>
<organization>
@@ -147,12 +147,18 @@
<url>http://jakarta.apache.org/oro/</url>
</dependency>
+ <!--
+
+ Work around Maven beta-10 problems with inherited
+ dependencies in multiproject.
+
<dependency>
<groupId>jboss</groupId>
<artifactId>javassist</artifactId>
<version>2.5.1</version>
</dependency>
-
+ -->
+
<dependency>
<id>bsf</id>
<version>2.3.0</version>
1.6 +9 -7 jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/inspector/InspectorButton.java
Index: InspectorButton.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/inspector/InspectorButton.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InspectorButton.java 28 May 2003 13:41:45 -0000 1.5
+++ InspectorButton.java 6 Aug 2003 14:28:50 -0000 1.6
@@ -133,14 +133,16 @@
symbols.put("URL", link.getURL());
- Body body = Body.get(cycle);
+ Body body = Body.get(cycle);
- if (body == null)
- throw new ApplicationRuntimeException(
- Tapestry.getMessage("InspectorButton.must-be-contained-by-body"),
- this);
+ if (body == null)
+ throw new ApplicationRuntimeException(
+ Tapestry.getMessage("InspectorButton.must-be-contained-by-body"),
+ this,
+ null,
+ null);
- script.execute(cycle, body, symbols);
+ script.execute(cycle, body, symbols);
// Now, go render the rest from the template.
1.3 +3 -1 jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/table/components/AbstractTableViewComponent.java
Index: AbstractTableViewComponent.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/table/components/AbstractTableViewComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractTableViewComponent.java 15 Mar 2003 21:22:17 -0000 1.2
+++ AbstractTableViewComponent.java 6 Aug 2003 14:28:50 -0000 1.3
@@ -79,7 +79,9 @@
"The component "
+ getId()
+ " must be contained within an ITableModelSource component, such as TableView",
- this);
+ this,
+ null,
+ null);
return objSource;
}
1.3 +15 -14 jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/table/components/AbstractTableRowComponent.java
Index: AbstractTableRowComponent.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/table/components/AbstractTableRowComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractTableRowComponent.java 15 Mar 2003 21:22:17 -0000 1.2
+++ AbstractTableRowComponent.java 6 Aug 2003 14:28:50 -0000 1.3
@@ -65,22 +65,23 @@
*/
public class AbstractTableRowComponent extends AbstractTableViewComponent
{
- public ITableRowSource getTableRowSource()
- {
- IRequestCycle objCycle = getPage().getRequestCycle();
+ public ITableRowSource getTableRowSource()
+ {
+ IRequestCycle objCycle = getPage().getRequestCycle();
- Object objSourceObj =
- objCycle.getAttribute(ITableRowSource.TABLE_ROW_SOURCE_ATTRIBUTE);
- ITableRowSource objSource = (ITableRowSource) objSourceObj;
+ Object objSourceObj = objCycle.getAttribute(ITableRowSource.TABLE_ROW_SOURCE_ATTRIBUTE);
+ ITableRowSource objSource = (ITableRowSource) objSourceObj;
- if (objSource == null)
- throw new ApplicationRuntimeException(
- "The component "
- + getId()
- + " must be contained within an ITableRowSource component, such as TableRows",
- this);
+ if (objSource == null)
+ throw new ApplicationRuntimeException(
+ "The component "
+ + getId()
+ + " must be contained within an ITableRowSource component, such as TableRows",
+ this,
+ null,
+ null);
- return objSource;
- }
+ return objSource;
+ }
}
1.7 +11 -4 jakarta-tapestry/framework/src/org/apache/tapestry/engine/DirectService.java
Index: DirectService.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/engine/DirectService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DirectService.java 28 May 2003 13:41:39 -0000 1.6
+++ DirectService.java 6 Aug 2003 14:28:50 -0000 1.7
@@ -132,7 +132,10 @@
return constructLink(cycle, Tapestry.DIRECT_SERVICE, context, parameters, true);
}
- public void service(IEngineServiceView engine, IRequestCycle cycle, ResponseOutputStream output)
+ public void service(
+ IEngineServiceView engine,
+ IRequestCycle cycle,
+ ResponseOutputStream output)
throws ServletException, IOException
{
IDirect direct;
@@ -146,7 +149,8 @@
count = serviceContext.length;
if (count != 3 && count != 4)
- throw new ApplicationRuntimeException(Tapestry.getMessage("DirectService.context-parameters"));
+ throw new ApplicationRuntimeException(
+ Tapestry.getMessage("DirectService.context-parameters"));
boolean complex = count == 4;
@@ -181,6 +185,7 @@
throw new ApplicationRuntimeException(
Tapestry.format("DirectService.component-wrong-type", component.getExtendedId()),
component,
+ null,
ex);
}
@@ -193,7 +198,9 @@
if (session == null || session.isNew())
throw new StaleSessionException(
- Tapestry.format("DirectService.stale-session-exception", direct.getExtendedId()),
+ Tapestry.format(
+ "DirectService.stale-session-exception",
+ direct.getExtendedId()),
direct.getPage());
}
1.9 +3 -3 jakarta-tapestry/framework/src/org/apache/tapestry/engine/RequestCycle.java
Index: RequestCycle.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/engine/RequestCycle.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RequestCycle.java 1 Jul 2003 20:49:33 -0000 1.8
+++ RequestCycle.java 6 Aug 2003 14:28:50 -0000 1.9
@@ -495,7 +495,7 @@
// But wrap other exceptions in a ApplicationRuntimeException ... this
// will ensure that some of the context is available.
- throw new ApplicationRuntimeException(ex.getMessage(), page, ex);
+ throw new ApplicationRuntimeException(ex.getMessage(), page, null, ex);
}
finally
{
@@ -566,7 +566,7 @@
// But wrap other exceptions in a RequestCycleException ... this
// will ensure that some of the context is available.
- throw new ApplicationRuntimeException(ex.getMessage(), _page, ex);
+ throw new ApplicationRuntimeException(ex.getMessage(), _page, null, ex);
}
finally
{
1.5 +4 -2 jakarta-tapestry/framework/src/org/apache/tapestry/components/Any.java
Index: Any.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/components/Any.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Any.java 21 Jun 2003 21:25:21 -0000 1.4
+++ Any.java 6 Aug 2003 14:28:50 -0000 1.5
@@ -80,7 +80,9 @@
if (element == null)
throw new ApplicationRuntimeException(
Tapestry.getMessage("Any.element-not-defined"),
- this);
+ this,
+ null,
+ null);
if (!cycle.isRewinding())
{
1.194 +6 -3 jakarta-tapestry/web/new.html
Index: new.html
===================================================================
RCS file: /home/cvs/jakarta-tapestry/web/new.html,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- new.html 23 Jul 2003 13:57:08 -0000 1.193
+++ new.html 6 Aug 2003 14:28:50 -0000 1.194
@@ -14,13 +14,16 @@
<h3>Release 3.0-beta-3</h3>
<ul>
-<li>Update dependency to Jakarta Digester 1.5.</li>
-<li>Add some new FAQs.</li>
+<li>Update dependency to Jakarta Digester 1.5. [hlship]</li>
+<li>Add some new FAQs. [hlship]</li>
+<li>Removed the errant selected parameter from Button (a bad cut-and-paste from Submit), and fix the Button
+ component reference page. [hlship]</li>
</ul>
<pre>
[ 21729 ] Vlib doesn't deploy into JBoss
[ 20616 ] Palette component appears to be broken in 3.0b1a
+[ 21870 ] tapestry lib dir includes both 1.4 and 1.5 versions of digester
</pre>
<h3>Release 3.0-beta-2</h3>
1.20 +7 -6 jakarta-tapestry/eclipse/Tapestry-Junit.launch
Index: Tapestry-Junit.launch
===================================================================
RCS file: /home/cvs/jakarta-tapestry/eclipse/Tapestry-Junit.launch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Tapestry-Junit.launch 3 Jul 2003 02:37:13 -0000 1.19
+++ Tapestry-Junit.launch 6 Aug 2003 14:28:50 -0000 1.20
@@ -73,11 +73,6 @@
"/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?>
<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/commons-digester-1.4.jar"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
internalArchive="/jakarta-tapestry/examples/Workbench/lib/jCharts-0.6.0.jar"
path="3" type="2"/>
"/>
@@ -101,7 +96,13 @@
"/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?>
<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/javassist-2.5.1.jar" path="3" type="2"/>
+ internalArchive="/jakarta-tapestry/lib/ext/javassist-2.5.1.jar"
+ path="3" type="2"/>
+"/>
+ <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
+<runtimeClasspathEntry
+ internalArchive="/jakarta-tapestry/lib/ext/commons-digester-1.5.jar"
+ path="3" type="2"/>
"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jakarta-tapestry"/>
1.18 +5 -2 jakarta-tapestry/framework/src/org/apache/tapestry/pageload/PageLoader.java
Index: PageLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/pageload/PageLoader.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- PageLoader.java 1 Jul 2003 20:49:34 -0000 1.17
+++ PageLoader.java 6 Aug 2003 14:28:50 -0000 1.18
@@ -582,6 +582,7 @@
container.getExtendedId(),
ex.getMessage()),
container,
+ null,
ex);
}
@@ -674,7 +675,9 @@
if (result instanceof IPage)
throw new ApplicationRuntimeException(
Tapestry.format("PageLoader.page-not-allowed", result.getExtendedId()),
- result);
+ result,
+ null,
+ null);
result.setNamespace(namespace);
result.setSpecification(spec);
1.10 +4 -2 jakarta-tapestry/examples/Vlib/src/org/apache/tapestry/vlib/components/Border.java
Index: Border.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Vlib/src/org/apache/tapestry/vlib/components/Border.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Border.java 28 May 2003 13:41:48 -0000 1.9
+++ Border.java 6 Aug 2003 14:28:50 -0000 1.10
@@ -134,7 +134,9 @@
if (_titleImage == null)
throw new ApplicationRuntimeException(
"Cannot find title image for " + pageName + " or " + _pageType + ".",
- this);
+ this,
+ null,
+ null);
// Based on the type, select the images to use on this instance of Border
// in this particular page.
1.2 +56 -51 jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/components/When.java
Index: When.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/org/apache/tapestry/contrib/components/When.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- When.java 26 Jul 2003 02:13:43 -0000 1.1
+++ When.java 6 Aug 2003 14:28:50 -0000 1.2
@@ -73,55 +73,60 @@
**/
public abstract class When extends Conditional
{
- /** Parent of this component. */
-
- private Choose _choose;
-
- /**
- * Renders its wrapped components only if the condition is true and its parent {@link Choose}
- * allows it. In addition, if element is specified, can emulate that HTML element.
- *
- **/
-
- protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
- {
- Choose choose = getChoose();
-
- if (choose == null)
- throw new ApplicationRuntimeException(Tapestry.getMessage("When.must-be-contained-by-choose"), this);
-
-
- if (!choose.isConditionMet() && getCondition())
- {
- choose.setConditionMet(true);
- super.renderComponent(writer, cycle);
- }
- }
-
- protected boolean evaluateCondition()
- {
- return true;
- }
-
- public boolean getInvert()
- {
- // This component doesn't require invert parameter.
- return false;
- }
-
- /**
- * @return Choose
- */
- public Choose getChoose() {
- return _choose;
- }
-
- /**
- * Sets the choose.
- * @param value The choose to set
- */
- public void setChoose(Choose value) {
- _choose = value;
- }
+ /** Parent of this component. */
+
+ private Choose _choose;
+
+ /**
+ * Renders its wrapped components only if the condition is true and its parent {@link Choose}
+ * allows it. In addition, if element is specified, can emulate that HTML element.
+ *
+ **/
+
+ protected void renderComponent(IMarkupWriter writer, IRequestCycle cycle)
+ {
+ Choose choose = getChoose();
+
+ if (choose == null)
+ throw new ApplicationRuntimeException(
+ Tapestry.getMessage("When.must-be-contained-by-choose"),
+ this,
+ null,
+ null);
+
+ if (!choose.isConditionMet() && getCondition())
+ {
+ choose.setConditionMet(true);
+ super.renderComponent(writer, cycle);
+ }
+ }
+
+ protected boolean evaluateCondition()
+ {
+ return true;
+ }
+
+ public boolean getInvert()
+ {
+ // This component doesn't require invert parameter.
+ return false;
+ }
+
+ /**
+ * @return Choose
+ */
+ public Choose getChoose()
+ {
+ return _choose;
+ }
+
+ /**
+ * Sets the choose.
+ * @param value The choose to set
+ */
+ public void setChoose(Choose value)
+ {
+ _choose = value;
+ }
}