You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by an...@apache.org on 2008/02/08 21:02:03 UTC
svn commit: r619986 - in
/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry:
components/ form/ html/ link/ valid/
Author: andyhot
Date: Fri Feb 8 12:01:52 2008
New Revision: 619986
URL: http://svn.apache.org/viewvc?rev=619986&view=rev
Log:
TAPESTRY-1567: broken links
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Any.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Block.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Conditional.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Delegator.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Insert.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/RenderBlock.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/RenderBody.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/ListEdit.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Body.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/ExceptionDisplay.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Frame.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Image.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/InsertText.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Script.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/GenericLink.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/PageLink.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ServiceLink.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/ValidField.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Any.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Any.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Any.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Any.java Fri Feb 8 12:01:52 2008
@@ -20,7 +20,7 @@
/**
* A component that can substitute for any HTML element. [<a
- * href="../../../../../ComponentReference/Any.html">Component Reference</a>]
+ * href="../../../../../components/general/any.html">Component Reference</a>]
*/
public abstract class Any extends AbstractComponent
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Block.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Block.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Block.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Block.java Fri Feb 8 12:01:52 2008
@@ -22,7 +22,7 @@
/**
* Prevents its contents from being rendered until triggered by an {@link RenderBlock} component. [<a
- * href="../../../../../ComponentReference/Block.html">Component Reference</a>]
+ * href="../../../../../components/general/block.html">Component Reference</a>]
* <p>
* Block and {@link RenderBlock} are used to build a certain class of complicated component that
* can't be assembled using the normal wrapping containment. Such a super component would have two
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Conditional.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Conditional.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Conditional.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Conditional.java Fri Feb 8 12:01:52 2008
@@ -20,8 +20,7 @@
import org.apache.tapestry.IRequestCycle;
/**
- * A conditional element on a page which will render its wrapped elements zero or one times. [ <a
- * href="../../../../../ComponentReference/Conditional.html">Component Reference </a>]
+ * A conditional element on a page which will render its wrapped elements zero or one times.
*
* @author Howard Lewis Ship, David Solis
*/
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Delegator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Delegator.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Delegator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Delegator.java Fri Feb 8 12:01:52 2008
@@ -21,7 +21,7 @@
/**
* A component which delegates it's behavior to another object. [<a
- * href="../../../../../ComponentReference/Delegator.html">Component Reference</a>]
+ * href="../../../../../components/general/delegator.html">Component Reference</a>]
*
* @author Howard Lewis Ship
*/
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Insert.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Insert.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Insert.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Insert.java Fri Feb 8 12:01:52 2008
@@ -27,7 +27,7 @@
/**
* Used to insert some text (from a parameter) into the HTML. [ <a
- * href="../../../../../ComponentReference/Insert.html">Component Reference
+ * href="../../../../../components/general/insert.html">Component Reference
* </a>]
*
* @author Howard Lewis Ship
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/RenderBlock.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/RenderBlock.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/RenderBlock.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/RenderBlock.java Fri Feb 8 12:01:52 2008
@@ -20,7 +20,7 @@
/**
* Renders the text and components wrapped by a {@link Block}component. [ <a
- * href="../../../../../ComponentReference/RenderBlock.html">Component Reference
+ * href="../../../../../components/general/renderblock.html">Component Reference
* </a>]
* <p>
* It is possible for an RenderBlock to obtain a Block from a page
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/RenderBody.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/RenderBody.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/RenderBody.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/RenderBody.java Fri Feb 8 12:01:52 2008
@@ -19,7 +19,7 @@
/**
* Renders the text and components wrapped by a component. [<a
- * href="../../../../../ComponentReference/RenderBody.html">Component Reference</a>]
+ * href="../../../../../components/general/renderbody.html">Component Reference</a>]
*
* @author Howard Lewis Ship
*/
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/ListEdit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/ListEdit.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/ListEdit.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/ListEdit.java Fri Feb 8 12:01:52 2008
@@ -29,8 +29,7 @@
/**
* A specialized component used to edit a list of items within a form; it is similar to a
* {@link org.apache.tapestry.components.ForBean} but leverages hidden inputs within the
- * <form> to store the items in the list. [ <a
- * href="../../../../../ComponentReference/ListEdit.html">Component Reference </a>]
+ * <form> to store the items in the list.
*
* @author Howard Lewis Ship
* @since 1.0.2
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Body.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Body.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Body.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Body.java Fri Feb 8 12:01:52 2008
@@ -23,7 +23,7 @@
* The body of a Tapestry page. This is used since it allows components on the page access to an
* initialization script (that is written the start, just inside the <body> tag). This is
* currently used by {@link Rollover}and {@link Script}components. [ <a
- * href="../../../../../ComponentReference/Body.html">Component Reference </a>]
+ * href="../../../../../components/general/body.html">Component Reference </a>]
*
* @author Howard Lewis Ship
*/
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/ExceptionDisplay.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/ExceptionDisplay.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/ExceptionDisplay.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/ExceptionDisplay.java Fri Feb 8 12:01:52 2008
@@ -24,7 +24,7 @@
/**
* Component used to display an already formatted exception. [ <a
- * href="../../../../../ComponentReference/ExceptionDisplay.html">Component
+ * href="../../../../../components/general/exceptiondisplay.html">Component
* Reference </a>]
*
* @author Howard Lewis Ship
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Frame.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Frame.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Frame.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Frame.java Fri Feb 8 12:01:52 2008
@@ -22,7 +22,7 @@
/**
* Implements a <frame> within a <frameset>. [ <a
- * href="../../../../../ComponentReference/Frame.html">Component Reference </a>]
+ * href="../../../../../components/general/frame.html">Component Reference </a>]
*
* @author Howard Lewis Ship
*/
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Image.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Image.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Image.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Image.java Fri Feb 8 12:01:52 2008
@@ -23,7 +23,7 @@
/**
* Used to insert an image. To create a rollover image, use the {@link Rollover}
* class, which integrates a link with the image assets used with the button. [<a
- * href="../../../../../ComponentReference/Image.html">Component Reference</a>]
+ * href="../../../../../components/general/image.html">Component Reference</a>]
*
* @author Howard Lewis Ship
*/
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/InsertText.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/InsertText.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/InsertText.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/InsertText.java Fri Feb 8 12:01:52 2008
@@ -27,7 +27,7 @@
/**
* Inserts formatted text (possibly collected using a
* {@link org.apache.tapestry.form.TextArea} component. [<a
- * href="../../../../../ComponentReference/InsertText.html">Component Reference</a>]
+ * href="../../../../../components/general/inserttext.html">Component Reference</a>]
* <p>
* To maintain the line breaks provided originally, this component will break
* the input into individual lines and insert additional HTML to make each line
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java Fri Feb 8 12:01:52 2008
@@ -28,7 +28,7 @@
* {@link org.apache.tapestry.link.DirectLink}) with an <img> and
* JavaScript code to create a rollover effect that works with both Netscape
* Navigator and Internet Explorer. [ <a
- * href="../../../../../ComponentReference/Rollover.html">Component Reference
+ * href="../../../../../components/link/rollover.html">Component Reference
* </a>]
*
* @author Howard Lewis Ship
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Script.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Script.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Script.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Script.java Fri Feb 8 12:01:52 2008
@@ -29,7 +29,7 @@
/**
* Works with the {@link Body}component to add a script (and perhaps some
* initialization) to the HTML response. [ <a
- * href="../../../../../ComponentReference/Script.html">Component Reference
+ * href="../../../../../components/general/script.html">Component Reference
* </a>]
*
* @author Howard Lewis Ship
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.java Fri Feb 8 12:01:52 2008
@@ -31,7 +31,7 @@
/**
* Component for creating a standard 'shell' for a page, which comprises the <html> and
* <head> portions of the page. [ <a
- * href="../../../../../ComponentReference/Shell.html">Component Reference </a>]
+ * href="../../../../../components/general/shell.html">Component Reference </a>]
* <p>
* Specifically does <em>not</em> provide a <body> tag, that is usually accomplished using a
* {@link Body} component.
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLink.java Fri Feb 8 12:01:52 2008
@@ -27,7 +27,7 @@
/**
* A component for creating a link using the direct service; used for actions that are not dependant
- * on dynamic page state. [ <a href="../../../../../ComponentReference/DirectLink.html">Component
+ * on dynamic page state. [ <a href="../../../../../components/link/directlink.html">Component
* Reference </a>]
*
*/
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ExternalLink.java Fri Feb 8 12:01:52 2008
@@ -23,7 +23,7 @@
/**
* A component for creating a link to {@link org.apache.tapestry.IExternalPage}using
* the {@link org.apache.tapestry.engine.ExternalService}. [ <a
- * href="../../../../../ComponentReference/ExternalLink.html">Component
+ * href="../../../../../components/link/externallink.html">Component
* Reference </a>]
*
* @see org.apache.tapestry.IExternalPage
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/GenericLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/GenericLink.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/GenericLink.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/GenericLink.java Fri Feb 8 12:01:52 2008
@@ -21,7 +21,7 @@
* An implementation of {@link org.apache.tapestry.components.ILinkComponent}
* that allows the exact HREF to be specified, usually used for client side
* scripting. [<a
- * href="../../../../../ComponentReference/GenericLink.html">Component Reference</a>]
+ * href="../../../../../components/link/genericlink.html">Component Reference</a>]
*
* @author Howard Lewis Ship
* @since 2.0.2
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/PageLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/PageLink.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/PageLink.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/PageLink.java Fri Feb 8 12:01:52 2008
@@ -22,7 +22,7 @@
/**
* A component for creating a navigation link to another page, using the page
* service. [ <a
- * href="../../../../../ComponentReference/PageLink.html">Component Reference
+ * href="../../../../../components/link/pagelink.html">Component Reference
* </a>]
*
* @author Howard Ship
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ServiceLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ServiceLink.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ServiceLink.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/ServiceLink.java Fri Feb 8 12:01:52 2008
@@ -23,7 +23,7 @@
* engine service}. A ServiceLink component can emulate a {@link PageLink} or {@link DirectLink} component,
* but is most often used in conjunction with an application-specific service.
*
- * [<a href="../../../../../ComponentReference/ServiceLink.html">Component Reference</a>]
+ * [<a href="../../../../../components/link/servicelink.html">Component Reference</a>]
*
* @author Howard Lewis Ship
*
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/ValidField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/ValidField.java?rev=619986&r1=619985&r2=619986&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/ValidField.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/ValidField.java Fri Feb 8 12:01:52 2008
@@ -22,9 +22,7 @@
/**
* A {@link Form}component that creates a text field that allows for validation
- * of user input and conversion between string and object values. [ <a
- * href="../../../../../ComponentReference/ValidField.html">Component Reference
- * </a>]
+ * of user input and conversion between string and object values.
* <p>
* A ValidatingTextField uses an {@link IValidationDelegate} to track errors and
* an {@link IValidator}to convert between strings and objects (as well as