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/04/21 19:31:19 UTC
svn commit: r395955 [1/2] - in
/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry: request/
resolver/ spec/
Author: jkuhnert
Date: Fri Apr 21 10:31:14 2006
New Revision: 395955
URL: http://svn.apache.org/viewcvs?rev=395955&view=rev
Log:
Checkstyle cleanups
Modified:
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/request/IRequestDecoder.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/request/IUploadFile.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ISpecificationResolverDelegate.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolver.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ResolverMessages.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ResolverStrings.properties
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/ExtensionSpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IApplicationSpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IAssetSpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IBeanSpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IBindingSpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IComponentSpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IContainedComponent.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IExtensionSpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/ILibrarySpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IParameterSpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IPropertySpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/InjectSpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/InjectSpecificationImpl.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/LibrarySpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/LocatablePropertyHolder.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/ParameterSpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/PropertyInjectable.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/PropertySpecification.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/SpecFactory.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/SpecMessages.java
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/request/IRequestDecoder.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/request/IRequestDecoder.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/request/IRequestDecoder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/request/IRequestDecoder.java Fri Apr 21 10:31:14 2006
@@ -40,5 +40,5 @@
*
**/
- public DecodedRequest decodeRequest(HttpServletRequest request);
+ DecodedRequest decodeRequest(HttpServletRequest request);
}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/request/IUploadFile.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/request/IUploadFile.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/request/IUploadFile.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/request/IUploadFile.java Fri Apr 21 10:31:14 2006
@@ -18,81 +18,75 @@
import java.io.InputStream;
/**
- * Represents a file uploaded from a client side form.
+ * Represents a file uploaded from a client side form.
*
- * @author Howard Lewis Ship
- * @since 1.0.8
- *
- **/
+ * @author Howard Lewis Ship
+ * @since 1.0.8
+ */
public interface IUploadFile
{
- /**
- * Returns the name of the file that was uploaded. This
- * is just the filename portion of the complete path.
- *
- **/
-
- public String getFileName();
-
- /**
- * Returns the complete path, as reported by the client
- * browser. Different browsers report different things
- * here.
- *
- *
- * @since 2.0.4
- *
- **/
-
- public String getFilePath();
-
- /**
- * Returns an input stream of the content of the file. There is no guarantee
- * that this stream will be valid after the end of the current request cycle,
- * so it should be processed immediately.
- *
- * <p>As of release 1.0.8, this will be a a {@link java.io.ByteArrayInputStream},
- * but that, too, may change (a future implementation may upload the stream
- * to a temporary file and return an input stream from that).
- *
- **/
- public InputStream getStream();
-
/**
- * Returns the MIME type specified when the file was uploaded. May return null
- * if the content type is not known.
+ * Returns the name of the file that was uploaded. This is just the filename
+ * portion of the complete path.
+ */
+
+ String getFileName();
+
+ /**
+ * Returns the complete path, as reported by the client browser. Different
+ * browsers report different things here.
*
- * @since 2.2
+ * @since 2.0.4
+ */
+
+ String getFilePath();
+
+ /**
+ * Returns an input stream of the content of the file. There is no guarantee
+ * that this stream will be valid after the end of the current request
+ * cycle, so it should be processed immediately.
+ * <p>
+ * As of release 1.0.8, this will be a a
+ * {@link java.io.ByteArrayInputStream}, but that, too, may change (a
+ * future implementation may upload the stream to a temporary file and
+ * return an input stream from that).
+ */
+
+ InputStream getStream();
+
+ /**
+ * Returns the MIME type specified when the file was uploaded. May return
+ * null if the content type is not known.
*
- **/
-
- public String getContentType();
-
- /**
- * Writes the content of the file to a known location. This should
- * be invoked at most once. In a standard
- * implementation based on Jakarta FileUpload, this will often
- * be implemented efficiently as a file rename.
+ * @since 2.2
+ */
+
+ String getContentType();
+
+ /**
+ * Writes the content of the file to a known location. This should be
+ * invoked at most once. In a standard implementation based on Jakarta
+ * FileUpload, this will often be implemented efficiently as a file rename.
*
* @since 3.0
*/
-
- public void write(File file);
-
- /**
- * Returns true if the uploaded content is in memory. False generally
- * means the content is stored in a temporary file.
- */
-
- public boolean isInMemory();
-
+
+ void write(File file);
+
+ /**
+ * Returns true if the uploaded content is in memory. False generally means
+ * the content is stored in a temporary file.
+ */
+
+ boolean isInMemory();
+
/**
* Returns the size, in bytes, of the uploaded content.
*
* @since 3.0
- **/
-
- public long getSize();
-}
\ No newline at end of file
+ */
+
+ long getSize();
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ISpecificationResolverDelegate.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ISpecificationResolverDelegate.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ISpecificationResolverDelegate.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ISpecificationResolverDelegate.java Fri Apr 21 10:31:14 2006
@@ -19,9 +19,9 @@
import org.apache.tapestry.spec.IComponentSpecification;
/**
- * Delegate interface used when a page or component specification can not be found by the normal
- * means. This allows hooks to support specifications from unusual locations, or generated on the
- * fly.
+ * Delegate interface used when a page or component specification can not be
+ * found by the normal means. This allows hooks to support specifications from
+ * unusual locations, or generated on the fly.
* <p>
* The delegate must be coded in a threadsafe manner.
*
@@ -31,10 +31,12 @@
public interface ISpecificationResolverDelegate
{
+
/**
- * Invoked by {@link PageSpecificationResolver} to find the indicated page specification.
- * Returns the specification, or null. The specification, if returned, <em>will be cached</em>
- * (this represents a change from release 3.0 to release 4.0).
+ * Invoked by {@link PageSpecificationResolver} to find the indicated page
+ * specification. Returns the specification, or null. The specification, if
+ * returned, <em>will be cached</em> (this represents a change from
+ * release 3.0 to release 4.0).
*
* @param cycle
* used to gain access to framework and Servlet API objects
@@ -44,13 +46,14 @@
* the name of the page (without any namespace prefix)
*/
- public IComponentSpecification findPageSpecification(IRequestCycle cycle, INamespace namespace,
- String simplePageName);
+ IComponentSpecification findPageSpecification(IRequestCycle cycle,
+ INamespace namespace, String simplePageName);
/**
- * Invoked by {@link PageSpecificationResolver} to find the indicated component specification.
- * Returns the specification, or null. The specification <em>will be cached</em> (this
- * represents a change from release 3.0 to release 4.0).
+ * Invoked by {@link PageSpecificationResolver} to find the indicated
+ * component specification. Returns the specification, or null. The
+ * specification <em>will be cached</em> (this represents a change from
+ * release 3.0 to release 4.0).
*
* @param cycle
* used to gain access to framework and Servlet API objects
@@ -60,6 +63,6 @@
* the component type (without any namespace prefix)
*/
- public IComponentSpecification findComponentSpecification(IRequestCycle cycle,
- INamespace namespace, String type);
+ IComponentSpecification findComponentSpecification(
+ IRequestCycle cycle, INamespace namespace, String type);
}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolver.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolver.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolver.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolver.java Fri Apr 21 10:31:14 2006
@@ -26,27 +26,29 @@
*/
public interface PageSpecificationResolver
{
+
/**
* Resolve the name (which may have a library id prefix) to a namespace (see
- * {@link #getNamespace()}) and a specification (see {@link #getSpecification()}).
+ * {@link #getNamespace()}) and a specification (see
+ * {@link #getSpecification()}).
*
* @throws org.apache.tapestry.PageNotFoundException
* if the name cannot be resolved to the name of a page
*/
- public void resolve(IRequestCycle cycle, String prefixedName);
+ void resolve(IRequestCycle cycle, String prefixedName);
/**
* Returns just the name of the page, unqualified by any namespace.
*/
- public String getSimplePageName();
+ String getSimplePageName();
/**
* Returns the namespace containing the page.
*/
- public INamespace getNamespace();
+ INamespace getNamespace();
/**
* Returns the specification for the page.
*/
- public IComponentSpecification getSpecification();
-}
\ No newline at end of file
+ IComponentSpecification getSpecification();
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java Fri Apr 21 10:31:14 2006
@@ -27,18 +27,22 @@
import org.apache.tapestry.spec.IComponentSpecification;
/**
- * Performs the tricky work of resolving a page name to a page specification. The search for pages
- * in the application namespace is the most complicated, since Tapestry searches for pages that
- * aren't explicitly defined in the application specification. The search, based on the
- * <i>simple-name </i> of the page, goes as follows:
+ * Performs the tricky work of resolving a page name to a page specification.
+ * The search for pages in the application namespace is the most complicated,
+ * since Tapestry searches for pages that aren't explicitly defined in the
+ * application specification. The search, based on the <i>simple-name </i> of
+ * the page, goes as follows:
* <ul>
* <li>As declared in the application specification
- * <li><i>simple-name </i>.page in the same folder as the application specification
- * <li><i>simple-name </i> page in the WEB-INF/ <i>servlet-name </i> directory of the context root
+ * <li><i>simple-name </i>.page in the same folder as the application
+ * specification
+ * <li><i>simple-name </i> page in the WEB-INF/ <i>servlet-name </i> directory
+ * of the context root
* <li><i>simple-name </i>.page in WEB-INF
- * <li><i>simple-name </i>.page in the application root (within the context root)
- * <li><i>simple-name </i>.html as a template in the application root, for which an implicit
- * specification is generated
+ * <li><i>simple-name </i>.page in the application root (within the context
+ * root)
+ * <li><i>simple-name </i>.html as a template in the application root, for
+ * which an implicit specification is generated
* <li>By searching the framework namespace
* <li>By invoking
* {@link org.apache.tapestry.resolver.ISpecificationResolverDelegate#findPageSpecification(IRequestCycle, INamespace, String)}
@@ -58,15 +62,16 @@
* @since 3.0
*/
-public class PageSpecificationResolverImpl extends AbstractSpecificationResolver implements
- PageSpecificationResolver
+public class PageSpecificationResolverImpl extends
+ AbstractSpecificationResolver implements PageSpecificationResolver
{
+
private static final String WEB_INF = "/WEB-INF/";
- /** set by container */
+ /** set by container. */
private Log _log;
- /** Set by resolve() */
+ /** Set by resolve(). */
private String _simpleName;
/** @since 4.0 * */
@@ -81,7 +86,8 @@
public void initializeService()
{
- _applicationNamespace = getSpecificationSource().getApplicationNamespace();
+ _applicationNamespace = getSpecificationSource()
+ .getApplicationNamespace();
_frameworkNamespace = getSpecificationSource().getFrameworkNamespace();
super.initializeService();
@@ -96,7 +102,8 @@
/**
* Resolve the name (which may have a library id prefix) to a namespace (see
- * {@link #getNamespace()}) and a specification (see {@link #getSpecification()}).
+ * {@link #getNamespace()}) and a specification (see
+ * {@link #getSpecification()}).
*
* @throws ApplicationRuntimeException
* if the name cannot be resolved
@@ -137,7 +144,8 @@
searchForPage(cycle);
if (getSpecification() == null)
- throw new PageNotFoundException(ResolverMessages.noSuchPage(_simpleName, namespace));
+ throw new PageNotFoundException(ResolverMessages.noSuchPage(
+ _simpleName, namespace));
}
public String getSimplePageName()
@@ -155,8 +163,10 @@
// Check with and without the leading slash
if (_simpleName.regionMatches(true, 0, WEB_INF, 0, WEB_INF.length())
- || _simpleName.regionMatches(true, 0, WEB_INF, 1, WEB_INF.length() - 1))
- throw new ApplicationRuntimeException(ResolverMessages.webInfNotAllowed(_simpleName));
+ || _simpleName.regionMatches(true, 0, WEB_INF, 1, WEB_INF
+ .length() - 1))
+ throw new ApplicationRuntimeException(ResolverMessages
+ .webInfNotAllowed(_simpleName));
String expectedName = _simpleName + ".page";
@@ -166,29 +176,27 @@
// as the library or application specification that's
// supposed to contain the page.
- if (found(namespaceLocation, expectedName))
- return;
+ if (found(namespaceLocation, expectedName)) return;
if (namespace.isApplicationNamespace())
{
// The application namespace gets some extra searching.
- if (found(getWebInfAppLocation(), expectedName))
- return;
+ if (found(getWebInfAppLocation(), expectedName)) return;
- if (found(getWebInfLocation(), expectedName))
- return;
+ if (found(getWebInfLocation(), expectedName)) return;
- if (found(getContextRoot(), expectedName))
- return;
+ if (found(getContextRoot(), expectedName)) return;
- // The wierd one ... where we see if there's a template in the application root
+ // The wierd one ... where we see if there's a template in the
+ // application root
// location.
String templateName = _simpleName + "." + getTemplateExtension();
- Resource templateResource = getContextRoot().getRelativeResource(templateName);
+ Resource templateResource = getContextRoot().getRelativeResource(
+ templateName);
if (_log.isDebugEnabled())
_log.debug(ResolverMessages.checkingResource(templateResource));
@@ -199,12 +207,15 @@
return;
}
- // Not found in application namespace, so maybe its a framework page.
+ // Not found in application namespace, so maybe its a framework
+ // page.
if (_frameworkNamespace.containsPage(_simpleName))
{
if (_log.isDebugEnabled())
- _log.debug(ResolverMessages.foundFrameworkPage(_simpleName));
+ _log
+ .debug(ResolverMessages
+ .foundFrameworkPage(_simpleName));
setNamespace(_frameworkNamespace);
@@ -212,7 +223,8 @@
// for the framework! Framework pages must be
// defined in the framework library specification.
- setSpecification(_frameworkNamespace.getPageSpecification(_simpleName));
+ setSpecification(_frameworkNamespace
+ .getPageSpecification(_simpleName));
return;
}
}
@@ -220,10 +232,8 @@
// Not found by any normal rule, so its time to
// consult the delegate.
- IComponentSpecification specification = getDelegate().findPageSpecification(
- cycle,
- namespace,
- _simpleName);
+ IComponentSpecification specification = getDelegate()
+ .findPageSpecification(cycle, namespace, _simpleName);
if (specification != null)
{
@@ -237,14 +247,17 @@
if (_log.isDebugEnabled())
_log.debug(ResolverMessages.foundHTMLTemplate(resource));
- // TODO The SpecFactory in Specification parser should be used in some way to
+ // TODO The SpecFactory in Specification parser should be used in some
+ // way to
// create an IComponentSpecification!
// The virtual location of the page specification is relative to the
- // namespace (typically, the application specification). This will be used when
+ // namespace (typically, the application specification). This will be
+ // used when
// searching for the page's message catalog or other related assets.
- Resource pageResource = namespaceLocation.getRelativeResource(_simpleName + ".page");
+ Resource pageResource = namespaceLocation
+ .getRelativeResource(_simpleName + ".page");
IComponentSpecification specification = new ComponentSpecification();
specification.setPageSpecification(true);
@@ -263,10 +276,10 @@
if (_log.isDebugEnabled())
_log.debug(ResolverMessages.checkingResource(resource));
- if (resource.getResourceURL() == null)
- return false;
+ if (resource.getResourceURL() == null) return false;
- setSpecification(getSpecificationSource().getPageSpecification(resource));
+ setSpecification(getSpecificationSource()
+ .getPageSpecification(resource));
install();
@@ -279,21 +292,21 @@
IComponentSpecification specification = getSpecification();
if (_log.isDebugEnabled())
- _log.debug(ResolverMessages.installingPage(_simpleName, namespace, specification));
+ _log.debug(ResolverMessages.installingPage(_simpleName, namespace,
+ specification));
namespace.installPageSpecification(_simpleName, specification);
}
/**
* If the namespace defines the template extension (as property
- * {@link Tapestry#TEMPLATE_EXTENSION_PROPERTY}, then that is used, otherwise the default is
- * used.
+ * {@link Tapestry#TEMPLATE_EXTENSION_PROPERTY}, then that is used,
+ * otherwise the default is used.
*/
private String getTemplateExtension()
{
- return _componentPropertySource.getNamespaceProperty(
- getNamespace(),
+ return _componentPropertySource.getNamespaceProperty(getNamespace(),
Tapestry.TEMPLATE_EXTENSION_PROPERTY);
}
@@ -305,8 +318,9 @@
}
/** @since 4.0 */
- public void setComponentPropertySource(ComponentPropertySource componentPropertySource)
+ public void setComponentPropertySource(
+ ComponentPropertySource componentPropertySource)
{
_componentPropertySource = componentPropertySource;
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ResolverMessages.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ResolverMessages.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ResolverMessages.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ResolverMessages.java Fri Apr 21 10:31:14 2006
@@ -27,10 +27,15 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-class ResolverMessages
+final class ResolverMessages
{
- private final static MessageFormatter _formatter = new MessageFormatter(ResolverMessages.class);
+ private static final MessageFormatter _formatter = new MessageFormatter(
+ ResolverMessages.class);
+
+ /* defeat instantiation */
+ private ResolverMessages() { }
+
static String noSuchComponentType(String type, INamespace namespace)
{
return _formatter.format("no-such-component-type", type, namespace);
@@ -38,7 +43,8 @@
static String noSuchPage(String name, INamespace namespace)
{
- return _formatter.format("no-such-page", name, namespace.getNamespaceId());
+ return _formatter.format("no-such-page", name, namespace
+ .getNamespaceId());
}
static String resolvingComponent(String type, INamespace namespace)
@@ -54,13 +60,15 @@
static String installingComponent(String type, INamespace namespace,
IComponentSpecification specification)
{
- return _formatter.format("installing-component", type, namespace, specification);
+ return _formatter.format("installing-component", type, namespace,
+ specification);
}
static String installingPage(String pageName, INamespace namespace,
IComponentSpecification specification)
{
- return _formatter.format("installing-page", pageName, namespace, specification);
+ return _formatter.format("installing-page", pageName, namespace,
+ specification);
}
static String resolvingPage(String pageName, INamespace namespace)
@@ -78,14 +86,15 @@
return _formatter.format("found-html-template", resource);
}
- public static String componentIsDeprecated(String componentType, Location location)
+ public static String componentIsDeprecated(String componentType,
+ Location location)
{
- return _formatter.format("component-is-deprecated", componentType, HiveMind
- .getLocationString(location));
+ return _formatter.format("component-is-deprecated", componentType,
+ HiveMind.getLocationString(location));
}
static String webInfNotAllowed(String simpleName)
{
return _formatter.format("web-inf-not-allowed", simpleName);
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ResolverStrings.properties
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ResolverStrings.properties?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ResolverStrings.properties (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/resolver/ResolverStrings.properties Fri Apr 21 10:31:14 2006
@@ -22,4 +22,4 @@
found-framework-page=Found page ''{0}'' in framework namespace.
found-html-template=Found HTML template at {0}.
component-is-deprecated=Component ''{0}'' (at {1}) is deprecated, and will likely be removed in a later release. Consult its documentation to find a replacement component.
-web-inf-not-allowed=Page name ''{0}'' is not valid, as it directly references a file stored in the WEB-INF folder.
\ No newline at end of file
+web-inf-not-allowed=Page name ''{0}'' is not valid, as it directly references a file stored in the WEB-INF folder.
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/ExtensionSpecification.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/ExtensionSpecification.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/ExtensionSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/ExtensionSpecification.java Fri Apr 21 10:31:14 2006
@@ -39,11 +39,11 @@
IExtensionSpecification
{
private static final Log LOG = LogFactory.getLog(ExtensionSpecification.class);
-
- private String _className;
-
+
protected Map _configuration = new HashMap();
-
+
+ private String _className;
+
private boolean _immediate;
/** @since 4.0 */
@@ -196,4 +196,4 @@
_immediate = immediate;
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IApplicationSpecification.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IApplicationSpecification.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IApplicationSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IApplicationSpecification.java Fri Apr 21 10:31:14 2006
@@ -32,9 +32,9 @@
*
**/
- public String getName();
+ String getName();
- public void setEngineClassName(String value);
+ void setEngineClassName(String value);
/**
* Returns the name of the class (which implements {@link org.apache.tapestry.IEngine}).
@@ -42,7 +42,7 @@
*
**/
- public String getEngineClassName();
+ String getEngineClassName();
- public void setName(String name);
-}
\ No newline at end of file
+ void setName(String name);
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IAssetSpecification.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IAssetSpecification.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IAssetSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IAssetSpecification.java Fri Apr 21 10:31:14 2006
@@ -29,8 +29,8 @@
* Returns the base path for the asset. This may be interpreted as a URL, relative URL or the
* path to a resource, depending on the type of asset.
*/
- public String getPath();
+ String getPath();
/** @since 3.0 * */
- public void setPath(String path);
-}
\ No newline at end of file
+ void setPath(String path);
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IBeanSpecification.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IBeanSpecification.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IBeanSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IBeanSpecification.java Fri Apr 21 10:31:14 2006
@@ -22,34 +22,41 @@
import org.apache.tapestry.util.IPropertyHolder;
/**
- * A specification of a helper bean for a component.
- *
+ * A specification of a helper bean for a component.
+ *
* @author glongman@intelligentworks.com
*/
-public interface IBeanSpecification extends IPropertyHolder, LocationHolder, Locatable, PropertyInjectable
+public interface IBeanSpecification extends IPropertyHolder, LocationHolder,
+ Locatable, PropertyInjectable
{
- public abstract String getClassName();
- public abstract BeanLifecycle getLifecycle();
+
+ String getClassName();
+
+ BeanLifecycle getLifecycle();
+
/**
- * @since 1.0.5
- *
- **/
- public abstract void addInitializer(IBeanInitializer initializer);
+ * @since 1.0.5
+ */
+ void addInitializer(IBeanInitializer initializer);
+
/**
- * Returns the {@link List} of {@link IBeanInitializer}s. The caller
- * should not modify this value!. May return null if there
- * are no initializers.
- *
- * @since 1.0.5
- *
- **/
- public abstract List getInitializers();
- public abstract String toString();
- public abstract String getDescription();
- public abstract void setDescription(String desc);
- /** @since 3.0 **/
- public abstract void setClassName(String className);
- /** @since 3.0 **/
- public abstract void setLifecycle(BeanLifecycle lifecycle);
-
-}
\ No newline at end of file
+ * Returns the {@link List} of {@link IBeanInitializer}s. The caller should
+ * not modify this value!. May return null if there are no initializers.
+ *
+ * @since 1.0.5
+ */
+ List getInitializers();
+
+ String toString();
+
+ String getDescription();
+
+ void setDescription(String desc);
+
+ /** @since 3.0 * */
+ void setClassName(String className);
+
+ /** @since 3.0 * */
+ void setLifecycle(BeanLifecycle lifecycle);
+
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IBindingSpecification.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IBindingSpecification.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IBindingSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IBindingSpecification.java Fri Apr 21 10:31:14 2006
@@ -18,32 +18,34 @@
import org.apache.hivemind.LocationHolder;
/**
- * Stores a binding specification, which identifies the static value or OGNL expression for the
- * binding. The name of the binding (which matches a bindable property of the contined component) is
- * implicitly known.
+ * Stores a binding specification, which identifies the static value or OGNL
+ * expression for the binding. The name of the binding (which matches a bindable
+ * property of the contined component) is implicitly known.
*
* @author glongman@intelligentworks.com
*/
public interface IBindingSpecification extends LocationHolder, Locatable
{
+
/**
* Returns the type of binding specification; this is generally
* {@link org.apache.tapestry.spec.BindingType#PREFIXED}.
*/
- public BindingType getType();
+ BindingType getType();
/**
- * For a prefixed binding specification (the typical type), the value is a binding reference; a
- * string used to contruct the actual binding, and consists of a prefix (such as "ognl:" or
- * "message:") and a locator. The prefix selects a
- * {@link org.apache.tapestry.binding.BindingFactory}, and the locator is passed to the
- * factory, which uses it to construct the {@link org.apache.tapestry.IBinding}instance.
+ * For a prefixed binding specification (the typical type), the value is a
+ * binding reference; a string used to contruct the actual binding, and
+ * consists of a prefix (such as "ognl:" or "message:") and a locator. The
+ * prefix selects a {@link org.apache.tapestry.binding.BindingFactory}, and
+ * the locator is passed to the factory, which uses it to construct the
+ * {@link org.apache.tapestry.IBinding}instance.
*/
- public String getValue();
+ String getValue();
- public void setType(BindingType type);
+ void setType(BindingType type);
- public void setValue(String value);
-}
\ No newline at end of file
+ void setValue(String value);
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IComponentSpecification.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IComponentSpecification.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IComponentSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IComponentSpecification.java Fri Apr 21 10:31:14 2006
@@ -38,9 +38,10 @@
* <li>Any reserved names (used for HTML attributes)
* </ul>
* <p>
- * From this information, an actual component may be instantiated and initialized. Instantiating a
- * component is usually a recursive process, since to initialize a container component, it is
- * necessary to instantiate and initialize its contained components as well.
+ * From this information, an actual component may be instantiated and
+ * initialized. Instantiating a component is usually a recursive process, since
+ * to initialize a container component, it is necessary to instantiate and
+ * initialize its contained components as well.
*
* @see org.apache.tapestry.IComponent
* @see IContainedComponent
@@ -48,208 +49,221 @@
* @see org.apache.tapestry.engine.IPageLoader
* @author glongman@intelligentworks.com
*/
-public interface IComponentSpecification extends IPropertyHolder, LocationHolder, Locatable
+public interface IComponentSpecification extends IPropertyHolder,
+ LocationHolder, Locatable
{
+
/**
* @throws IllegalArgumentException
* if the name already exists.
*/
- public void addAsset(String name, IAssetSpecification asset);
+ void addAsset(String name, IAssetSpecification asset);
/**
* @throws IllegalArgumentException
* if the id is already defined.
*/
- public void addComponent(String id, IContainedComponent component);
+ void addComponent(String id, IContainedComponent component);
/**
- * Adds the parameter. The parameter name and aliases are added as a reserved name. The code
- * assumes that the parameter specification will <strong>not</strong> be subsequently changed.
+ * Adds the parameter. The parameter name and aliases are added as a
+ * reserved name. The code assumes that the parameter specification will
+ * <strong>not</strong> be subsequently changed.
*
* @throws IllegalArgumentException
* if the name already exists.
*/
- public void addParameter(IParameterSpecification spec);
+ void addParameter(IParameterSpecification spec);
/**
- * Returns true if the component is allowed to wrap other elements (static HTML or other
- * components). The default is true.
+ * Returns true if the component is allowed to wrap other elements (static
+ * HTML or other components). The default is true.
*
* @see #setAllowBody(boolean)
*/
- public boolean getAllowBody();
+ boolean getAllowBody();
/**
- * Returns true if the component allows informal parameters (parameters not formally defined).
- * Informal parameters are generally used to create additional HTML attributes for an HTML tag
- * rendered by the component. This is often used to specify JavaScript event handlers or the
- * class of the component (for Cascarding Style Sheets).
+ * Returns true if the component allows informal parameters (parameters not
+ * formally defined). Informal parameters are generally used to create
+ * additional HTML attributes for an HTML tag rendered by the component.
+ * This is often used to specify JavaScript event handlers or the class of
+ * the component (for Cascarding Style Sheets).
* <p>
* The default value is true.
*
* @see #setAllowInformalParameters(boolean)
*/
- public boolean getAllowInformalParameters();
+ boolean getAllowInformalParameters();
/**
- * Returns the {@link IAssetSpecification}with the given name, or null if no such specification
- * exists.
+ * Returns the {@link IAssetSpecification}with the given name, or null if
+ * no such specification exists.
*
* @see #addAsset(String,IAssetSpecification)
*/
- public IAssetSpecification getAsset(String name);
+ IAssetSpecification getAsset(String name);
/**
- * Returns a <code>List</code> of the String names of all assets, in alphabetical order
+ * Returns a <code>List</code> of the String names of all assets, in
+ * alphabetical order.
*/
- public List getAssetNames();
+ List getAssetNames();
/**
- * Returns the specification of a contained component with the given id, or null if no such
- * contained component exists.
+ * Returns the specification of a contained component with the given id, or
+ * null if no such contained component exists.
*
* @see #addComponent(String, IContainedComponent)
*/
- public IContainedComponent getComponent(String id);
+ IContainedComponent getComponent(String id);
/**
- * Returns the class name to be used when instantiating the component, or null if no class name
- * was provided in the specification (in which case, a system of defaults will be used to
- * determine the class name).
+ * Returns the class name to be used when instantiating the component, or
+ * null if no class name was provided in the specification (in which case, a
+ * system of defaults will be used to determine the class name).
*/
- public String getComponentClassName();
+ String getComponentClassName();
/**
- * Returns an <code>List</code> of the String names of the {@link IContainedComponent}s for
- * this component.
+ * Returns an <code>List</code> of the String names of the
+ * {@link IContainedComponent}s for this component.
*
* @see #addComponent(String, IContainedComponent)
*/
- public List getComponentIds();
+ List getComponentIds();
/**
- * Returns the specification of a parameter with the given name, or null if no such parameter
- * exists.
+ * Returns the specification of a parameter with the given name, or null if
+ * no such parameter exists.
*
* @see #addParameter(String, IParameterSpecification)
*/
- public IParameterSpecification getParameter(String name);
+ IParameterSpecification getParameter(String name);
/**
- * Returns an unordered collection of {@link IParameterSpecification}, for all parameters that
- * are required. This includes only "real" parameters, not aliases.
+ * Returns an unordered collection of {@link IParameterSpecification}, for
+ * all parameters that are required. This includes only "real" parameters,
+ * not aliases.
*
* @since 4.0
*/
- public Collection getRequiredParameters();
+ Collection getRequiredParameters();
/**
- * Returns a List of of String names of all parameters. This list is in alphabetical order.
+ * Returns a List of of String names of all parameters. This list is in
+ * alphabetical order.
*
* @see #addParameter(String, IParameterSpecification)
*/
- public List getParameterNames();
+ List getParameterNames();
- public void setAllowBody(boolean value);
+ void setAllowBody(boolean value);
- public void setAllowInformalParameters(boolean value);
+ void setAllowInformalParameters(boolean value);
- public void setComponentClassName(String value);
+ void setComponentClassName(String value);
/**
* @since 1.0.4
* @throws IllegalArgumentException
* if the bean already has a specification.
*/
- public void addBeanSpecification(String name, IBeanSpecification specification);
+ void addBeanSpecification(String name,
+ IBeanSpecification specification);
/**
- * Returns the {@link IBeanSpecification}for the given name, or null if not such specification
- * exists.
+ * Returns the {@link IBeanSpecification}for the given name, or null if not
+ * such specification exists.
*
* @since 1.0.4
*/
- public IBeanSpecification getBeanSpecification(String name);
+ IBeanSpecification getBeanSpecification(String name);
/**
* Returns an unmodifiable collection of the names of all beans.
*/
- public Collection getBeanNames();
+ Collection getBeanNames();
/**
- * Adds the value as a reserved name. Reserved names are not allowed as the names of informal
- * parameters. Since the comparison is caseless, the value is converted to lowercase before
- * being stored.
+ * Adds the value as a reserved name. Reserved names are not allowed as the
+ * names of informal parameters. Since the comparison is caseless, the value
+ * is converted to lowercase before being stored.
*
* @since 1.0.5
*/
- public void addReservedParameterName(String value);
+ void addReservedParameterName(String value);
/**
- * Returns true if the value specified is in the reserved name list. The comparison is caseless.
- * All formal parameters are automatically in the reserved name list, as well as any additional
- * reserved names specified in the component specification. The latter refer to HTML attributes
+ * Returns true if the value specified is in the reserved name list. The
+ * comparison is caseless. All formal parameters are automatically in the
+ * reserved name list, as well as any additional reserved names specified in
+ * the component specification. The latter refer to HTML attributes
* generated directly by the component.
*
* @since 1.0.5
*/
- public boolean isReservedParameterName(String value);
+ boolean isReservedParameterName(String value);
/**
* Returns the documentation for this component.
*
* @since 1.0.9
*/
- public String getDescription();
+ String getDescription();
/**
* Sets the documentation for this component.
*
* @since 1.0.9
*/
- public void setDescription(String description);
+ void setDescription(String description);
/**
- * Returns the XML Public Id for the specification file, or null if not applicable.
+ * Returns the XML Public Id for the specification file, or null if not
+ * applicable.
* <p>
- * This method exists as a convienience for the Spindle plugin. A previous method used an
- * arbitrary version string, the public id is more useful and less ambiguous.
+ * This method exists as a convienience for the Spindle plugin. A previous
+ * method used an arbitrary version string, the public id is more useful and
+ * less ambiguous.
*
* @since 2.2
*/
- public String getPublicId();
+ String getPublicId();
/** @since 2.2 * */
- public void setPublicId(String publicId);
+ void setPublicId(String publicId);
/**
- * Returns true if the specification is known to be a page specification and not a component
- * specification. Earlier versions of the framework did not distinguish between the two, but
- * starting in 2.2, there are seperate XML entities for pages and components. Pages omit several
- * attributes and entities related to parameters, as parameters only make sense for components.
+ * Returns true if the specification is known to be a page specification and
+ * not a component specification. Earlier versions of the framework did not
+ * distinguish between the two, but starting in 2.2, there are seperate XML
+ * entities for pages and components. Pages omit several attributes and
+ * entities related to parameters, as parameters only make sense for
+ * components.
*
* @since 2.2
*/
- public boolean isPageSpecification();
+ boolean isPageSpecification();
/** @since 2.2 * */
- public void setPageSpecification(boolean pageSpecification);
+ void setPageSpecification(boolean pageSpecification);
/** @since 3.0 * */
- public Resource getSpecificationLocation();
+ Resource getSpecificationLocation();
/** @since 3.0 * */
- public void setSpecificationLocation(Resource specificationLocation);
+ void setSpecificationLocation(Resource specificationLocation);
/**
- * Adds a new property specification. The name of the property must not already be defined (and
- * must not change after being added).
+ * Adds a new property specification. The name of the property must not
+ * already be defined (and must not change after being added).
*
* @since 3.0
*/
- public void addPropertySpecification(IPropertySpecification spec);
+ void addPropertySpecification(IPropertySpecification spec);
/**
* Returns a sorted, immutable list of the names of all
@@ -257,16 +271,16 @@
*
* @since 3.0
*/
- public List getPropertySpecificationNames();
+ List getPropertySpecificationNames();
/**
- * Returns the named {@link org.apache.tapestry.spec.IPropertySpecification}, or null if no
- * such specification exist.
+ * Returns the named {@link org.apache.tapestry.spec.IPropertySpecification},
+ * or null if no such specification exist.
*
* @since 3.0
* @see #addPropertySpecification(IPropertySpecification)
*/
- public IPropertySpecification getPropertySpecification(String name);
+ IPropertySpecification getPropertySpecification(String name);
/**
* Adds a {@link InjectSpecification}.
@@ -274,41 +288,42 @@
* @since 4.0
*/
- public void addInjectSpecification(InjectSpecification spec);
+ void addInjectSpecification(InjectSpecification spec);
/**
- * Returns the list of {@link InjectSpecification}. Will return an empty list if no
- * specifications have been added.
+ * Returns the list of {@link InjectSpecification}. Will return an empty
+ * list if no specifications have been added.
*
* @since 4.0
*/
- public List getInjectSpecifications();
+ List getInjectSpecifications();
/**
- * Returns true if the component is deprecated. Deprecated components generate a warning when
- * used.
+ * Returns true if the component is deprecated. Deprecated components
+ * generate a warning when used.
*
* @since 4.0
*/
- public boolean isDeprecated();
+ boolean isDeprecated();
/**
* @since 4.0
*/
- public void setDeprecated(boolean deprecated);
+ void setDeprecated(boolean deprecated);
/**
- * Returns a Set of Strings; the reserved parameter names for the component. This combines
- * explicit reserved names with formal parameter names. Each parameter name in the Set will be
- * all lower case (to facilitate a caseless comparison).
+ * Returns a Set of Strings; the reserved parameter names for the component.
+ * This combines explicit reserved names with formal parameter names. Each
+ * parameter name in the Set will be all lower case (to facilitate a
+ * caseless comparison).
*
* @returns an unmodifiable set (of String), possibly empty
* @since 4.0
*/
- public Set getReservedParameterNames();
+ Set getReservedParameterNames();
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IContainedComponent.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IContainedComponent.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IContainedComponent.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IContainedComponent.java Fri Apr 21 10:31:14 2006
@@ -21,73 +21,76 @@
import org.apache.tapestry.util.IPropertyHolder;
/**
- * Defines a contained component. This includes the information needed to
- * get the contained component's specification, as well as any bindings
- * for the component.
-
+ * Defines a contained component. This includes the information needed to get
+ * the contained component's specification, as well as any bindings for the
+ * component.
+ *
* @author glongman@intelligentworks.com
*/
-public interface IContainedComponent extends IPropertyHolder, LocationHolder, Locatable, PropertyInjectable
+public interface IContainedComponent extends IPropertyHolder, LocationHolder,
+ Locatable, PropertyInjectable
{
+
+ /**
+ * Returns the named binding, or null if the binding does not exist.
+ */
+ IBindingSpecification getBinding(String name);
+
/**
- * Returns the named binding, or null if the binding does not
- * exist.
- *
- **/
- public abstract IBindingSpecification getBinding(String name);
- /**
- * Returns an umodifiable <code>Collection</code>
- * of Strings, each the name of one binding
- * for the component.
- *
- **/
- public abstract Collection getBindingNames();
- public abstract String getType();
- public abstract void setBinding(String name, IBindingSpecification spec);
- public abstract void setType(String value);
+ * Returns an umodifiable <code>Collection</code> of Strings, each the
+ * name of one binding for the component.
+ */
+ Collection getBindingNames();
+
+ String getType();
+
+ void setBinding(String name, IBindingSpecification spec);
+
+ void setType(String value);
+
/**
- * Sets the String Id of the component being copied from.
- * For use by IDE tools like Spindle.
+ * Sets the String Id of the component being copied from. For use by IDE
+ * tools like Spindle.
*
- * @since 1.0.9
- **/
- public abstract void setCopyOf(String id);
+ * @since 1.0.9
+ */
+ void setCopyOf(String id);
+
/**
- * Returns the id of the component being copied from.
- * For use by IDE tools like Spindle.
+ * Returns the id of the component being copied from. For use by IDE tools
+ * like Spindle.
*
- * @since 1.0.9
- **/
- public abstract String getCopyOf();
+ * @since 1.0.9
+ */
+ String getCopyOf();
/**
- * Returns whether the contained component will inherit
- * the informal parameters of its parent.
+ * Returns whether the contained component will inherit the informal
+ * parameters of its parent.
*
* @since 3.0
- **/
- public abstract boolean getInheritInformalParameters();
+ */
+ boolean getInheritInformalParameters();
/**
- * Sets whether the contained component will inherit
- * the informal parameters of its parent.
+ * Sets whether the contained component will inherit the informal parameters
+ * of its parent.
*
* @since 3.0
*/
- public abstract void setInheritInformalParameters(boolean value);
-
+ void setInheritInformalParameters(boolean value);
+
/**
- * Returns the name of the property to be created for this component,
- * or null if no property should be created.
+ * Returns the name of the property to be created for this component, or
+ * null if no property should be created.
*
* @since 4.0
*/
- public String getPropertyName();
-
+ String getPropertyName();
+
/**
- *
- * @since 4.0
+ * @since 4.0
*/
-
- public void setPropertyName(String propertyName);
-}
\ No newline at end of file
+
+ void setPropertyName(String propertyName);
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IExtensionSpecification.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IExtensionSpecification.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IExtensionSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IExtensionSpecification.java Fri Apr 21 10:31:14 2006
@@ -20,37 +20,40 @@
import org.apache.tapestry.util.IPropertyHolder;
/**
- * Defines an "extension", which is much like a helper bean, but is part of a library or application
- * specification (and has the same lifecycle as the application).
+ * Defines an "extension", which is much like a helper bean, but is part of a
+ * library or application specification (and has the same lifecycle as the
+ * application).
*
* @author glongman@intelligentworks.com
*/
-public interface IExtensionSpecification extends IPropertyHolder, LocationHolder
+public interface IExtensionSpecification extends IPropertyHolder,
+ LocationHolder
{
- public abstract String getClassName();
- public abstract void setClassName(String className);
+ String getClassName();
- public abstract void addConfiguration(String propertyName, String value);
+ void setClassName(String className);
+
+ void addConfiguration(String propertyName, String value);
/**
- * Returns an immutable Map of the configuration; keyed on property name, with values as
- * properties to assign.
+ * Returns an immutable Map of the configuration; keyed on property name,
+ * with values as properties to assign.
*/
- public abstract Map getConfiguration();
+ Map getConfiguration();
/**
- * Invoked to instantiate an instance of the extension and return it. It also configures
- * properties of the extension.
+ * Invoked to instantiate an instance of the extension and return it. It
+ * also configures properties of the extension.
*/
- public abstract Object instantiateExtension();
+ Object instantiateExtension();
/**
- * Returns true if the extensions should be instantiated immediately after the containing
- * {@link org.apache.tapestry.spec.LibrarySpecification}if parsed. Non-immediate extensions are
- * instantiated only as needed.
+ * Returns true if the extensions should be instantiated immediately after
+ * the containing {@link org.apache.tapestry.spec.LibrarySpecification}if
+ * parsed. Non-immediate extensions are instantiated only as needed.
*/
- public abstract boolean isImmediate();
+ boolean isImmediate();
- public abstract void setImmediate(boolean immediate);
-}
\ No newline at end of file
+ void setImmediate(boolean immediate);
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/ILibrarySpecification.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/ILibrarySpecification.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/ILibrarySpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/ILibrarySpecification.java Fri Apr 21 10:31:14 2006
@@ -23,7 +23,8 @@
/**
* Interface for the Specification for a library.
- * {@link org.apache.tapestry.spec.ApplicationSpecification}is a specialized kind of library.
+ * {@link org.apache.tapestry.spec.ApplicationSpecification}is a specialized
+ * kind of library.
*
* @author Geoffrey Longman
* @since 2.2
@@ -33,11 +34,11 @@
{
/**
- * Returns the specification path (within the classpath) for an embedded library, or null if no
- * such library has been defined.
+ * Returns the specification path (within the classpath) for an embedded
+ * library, or null if no such library has been defined.
*/
- public String getLibrarySpecificationPath(String id);
+ String getLibrarySpecificationPath(String id);
/**
* Sets the specification path for an embedded library.
@@ -46,44 +47,46 @@
* if a library with the given id already exists
*/
- public void setLibrarySpecificationPath(String id, String path);
+ void setLibrarySpecificationPath(String id, String path);
/**
* Returns a sorted list of library ids (or the empty list, but not null).
*/
- public List getLibraryIds();
+ List getLibraryIds();
- public String getPageSpecificationPath(String name);
+ String getPageSpecificationPath(String name);
- public void setPageSpecificationPath(String name, String path);
+ void setPageSpecificationPath(String name, String path);
/**
- * Returns a sorted list of page names explicitly defined by this library, or an empty list (but
- * not null).
+ * Returns a sorted list of page names explicitly defined by this library,
+ * or an empty list (but not null).
*/
- public List getPageNames();
+ List getPageNames();
- public void setComponentSpecificationPath(String type, String path);
+ void setComponentSpecificationPath(String type, String path);
- public String getComponentSpecificationPath(String type);
+ String getComponentSpecificationPath(String type);
/**
- * Returns the simple types of all components defined in this library. Returns a list of strings
- * in sorted order, or an empty list (but not null).
+ * Returns the simple types of all components defined in this library.
+ * Returns a list of strings in sorted order, or an empty list (but not
+ * null).
*
* @since 3.0
*/
- public List getComponentTypes();
+ List getComponentTypes();
/**
- * @throws UnsupportedOperationException always
+ * @throws UnsupportedOperationException
+ * always
* @deprecated to be removed in release 4.1
*/
-
- public String getServiceClassName(String name);
+
+ String getServiceClassName(String name);
/**
* Returns a sorted list of service names (or an empty list, but not null).
@@ -92,91 +95,95 @@
* @deprecated to be removed in release 4.1
*/
- public List getServiceNames();
+ List getServiceNames();
/**
* @deprecated To be removed in release 4.1.
- * @throws UnsupportedOperationException always
+ * @throws UnsupportedOperationException
+ * always
*/
- public void setServiceClassName(String name, String className);
+ void setServiceClassName(String name, String className);
/**
* Returns the documentation for this library..
*/
- public String getDescription();
+ String getDescription();
/**
* Sets the documentation for this library.
*/
- public void setDescription(String description);
+ void setDescription(String description);
/**
* Returns a Map of extensions; key is extension name, value is
- * {@link org.apache.tapestry.spec.IExtensionSpecification}. May return null. The returned Map
- * is immutable.
+ * {@link org.apache.tapestry.spec.IExtensionSpecification}. May return
+ * null. The returned Map is immutable.
*/
- public Map getExtensionSpecifications();
+ Map getExtensionSpecifications();
/**
* Adds another extension specification.
*/
- public void addExtensionSpecification(String name, IExtensionSpecification extension);
+ void addExtensionSpecification(String name,
+ IExtensionSpecification extension);
/**
- * Returns a sorted List of the names of all extensions. May return the empty list, but won't
- * return null.
+ * Returns a sorted List of the names of all extensions. May return the
+ * empty list, but won't return null.
*/
- public List getExtensionNames();
+ List getExtensionNames();
/**
* Returns the named IExtensionSpecification, or null if it doesn't exist.
*/
- public IExtensionSpecification getExtensionSpecification(String name);
+ IExtensionSpecification getExtensionSpecification(String name);
/**
- * Returns an instantiated extension. Extensions are created as needed and cached for later use.
+ * Returns an instantiated extension. Extensions are created as needed and
+ * cached for later use.
*
* @throws IllegalArgumentException
* if no extension specification exists for the given name.
*/
- public Object getExtension(String name);
+ Object getExtension(String name);
/**
- * Returns an instantiated extension, performing a check to ensure that the extension is a
- * subtype of the given class (or extends the given interface).
+ * Returns an instantiated extension, performing a check to ensure that the
+ * extension is a subtype of the given class (or extends the given
+ * interface).
*
* @throws IllegalArgumentException
- * if no extension specification exists for the given name, or if the extension
- * fails the type check.
+ * if no extension specification exists for the given name, or
+ * if the extension fails the type check.
* @since 3.0
*/
- public Object getExtension(String name, Class typeConstraint);
+ Object getExtension(String name, Class typeConstraint);
/**
- * Returns true if the named extension exists (or can be instantiated), returns false if the
- * named extension has no specification.
+ * Returns true if the named extension exists (or can be instantiated),
+ * returns false if the named extension has no specification.
*/
- public boolean checkExtension(String name);
+ boolean checkExtension(String name);
/**
- * Invoked after the entire specification has been constructed to instantiate any extensions
- * marked immediate.
+ * Invoked after the entire specification has been constructed to
+ * instantiate any extensions marked immediate.
*/
- public void instantiateImmediateExtensions();
+ void instantiateImmediateExtensions();
- public String getPublicId();
+ String getPublicId();
- public void setPublicId(String value);
+ void setPublicId(String value);
/**
* Returns the location from which the specification was read.
@@ -184,9 +191,9 @@
* @since 3.0
*/
- public Resource getSpecificationLocation();
+ Resource getSpecificationLocation();
/** @since 3.0 * */
- public void setSpecificationLocation(Resource specificationLocation);
-}
\ No newline at end of file
+ void setSpecificationLocation(Resource specificationLocation);
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IParameterSpecification.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IParameterSpecification.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IParameterSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IParameterSpecification.java Fri Apr 21 10:31:14 2006
@@ -19,8 +19,9 @@
import org.apache.hivemind.LocationHolder;
/**
- * Defines a formal parameter to a component. An <code>IParameterSpecification</code> is contained
- * by a {@link IComponentSpecification}.
+ * Defines a formal parameter to a component. An
+ * <code>IParameterSpecification</code> is contained by a
+ * {@link IComponentSpecification}.
* <p>
* TBD: Identify arrays in some way.
*
@@ -28,73 +29,78 @@
*/
public interface IParameterSpecification extends LocationHolder
{
+
/**
- * Returns the class name of the expected type of the parameter. The default value is
- * <code>java.lang.Object</code> which matches anything.
+ * Returns the class name of the expected type of the parameter. The default
+ * value is <code>java.lang.Object</code> which matches anything.
*/
- public String getType();
+ String getType();
/**
- * Returns true if the parameter is required by the component. The default is false, meaning the
- * parameter is optional.
+ * Returns true if the parameter is required by the component. The default
+ * is false, meaning the parameter is optional.
*/
- public boolean isRequired();
+ boolean isRequired();
- public void setRequired(boolean value);
+ void setRequired(boolean value);
/**
- * Sets the type of value expected for the parameter. This can be left blank to indicate any
- * type.
+ * Sets the type of value expected for the parameter. This can be left blank
+ * to indicate any type.
*/
- public void setType(String value);
+ void setType(String value);
/**
* Returns the documentation for this parameter.
*
* @since 1.0.9
*/
- public String getDescription();
+ String getDescription();
/**
* Sets the documentation for this parameter.
*
* @since 1.0.9
*/
- public void setDescription(String description);
+ void setDescription(String description);
/**
- * Sets the property name (of the component class) to connect the parameter to.
+ * Sets the property name (of the component class) to connect the parameter
+ * to.
*/
- public void setPropertyName(String propertyName);
+ void setPropertyName(String propertyName);
/**
* Returns the name of the JavaBeans property to connect the parameter to.
*/
- public String getPropertyName();
+ String getPropertyName();
/**
- * Returns the default value for the parameter (or null if the parameter has no default value).
- * Required parameters may not have a default value. The default value is a
- * <em>binding locator</em> (a prefixed value, as with a binding element).
+ * Returns the default value for the parameter (or null if the parameter has
+ * no default value). Required parameters may not have a default value. The
+ * default value is a <em>binding locator</em> (a prefixed value, as with
+ * a binding element).
*/
- public String getDefaultValue();
+ String getDefaultValue();
/**
- * Sets the default value of the JavaBeans property if no binding is provided
+ * Sets the default value of the JavaBeans property if no binding is
+ * provided.
*/
- public void setDefaultValue(String defaultValue);
+ void setDefaultValue(String defaultValue);
/**
- * Returns true if the parameter property should cache the result of the binding.
+ * Returns true if the parameter property should cache the result of the
+ * binding.
*
* @since 4.0
*/
- public boolean getCache();
+ boolean getCache();
/** @since 4.0 */
- public void setCache(boolean cache);
+ void setCache(boolean cache);
/**
* Returns the (primary) name of the parameter.
@@ -102,22 +108,22 @@
* @since 4.0
*/
- public String getParameterName();
+ String getParameterName();
/**
* @since 4.0
*/
- public void setParameterName(String name);
+ void setParameterName(String name);
/**
- * Returns a non-null collection of strings for the aliases of the parameter. This is usually an
- * empty list.
+ * Returns a non-null collection of strings for the aliases of the
+ * parameter. This is usually an empty list.
*
* @since 4.0
*/
- public Collection getAliasNames();
+ Collection getAliasNames();
/**
* Sets the list of aliases as a comma-seperated list.
@@ -127,21 +133,21 @@
* @since 4.0
*/
- public void setAliases(String nameList);
+ void setAliases(String nameList);
/**
- * Returns true if the parameter is deprecated. Deprecated parameter generate a warning when
- * bound.
+ * Returns true if the parameter is deprecated. Deprecated parameter
+ * generate a warning when bound.
*
* @since 4.0
*/
- public boolean isDeprecated();
+ boolean isDeprecated();
/**
* @since 4.0
*/
- public void setDeprecated(boolean deprecated);
+ void setDeprecated(boolean deprecated);
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IPropertySpecification.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IPropertySpecification.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IPropertySpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/IPropertySpecification.java Fri Apr 21 10:31:14 2006
@@ -18,39 +18,42 @@
/**
* Defines a transient or persistant property of a component or page. A
- * {@link org.apache.tapestry.enhance.ComponentClassFactory}uses this information to create a
- * subclass with the necessary instance variables and methods.
+ * {@link org.apache.tapestry.enhance.ComponentClassFactory}uses this
+ * information to create a subclass with the necessary instance variables and
+ * methods.
*
* @author glongman@intelligentworks.com
*/
public interface IPropertySpecification extends LocationHolder
{
+
/**
- * Returns the initial value for this property, as a binding reference. May return null if the
- * property has no initial value. The initial value is from finishLoad() and re-applied in
- * pageDetached().
+ * Returns the initial value for this property, as a binding reference. May
+ * return null if the property has no initial value. The initial value is
+ * from finishLoad() and re-applied in pageDetached().
*/
- public String getInitialValue();
+ String getInitialValue();
- public String getName();
+ String getName();
/**
* Returns true if {@link #getPersistence()}is null.
*/
- public boolean isPersistent();
+ boolean isPersistent();
- public String getType();
+ String getType();
- public void setInitialValue(String initialValue);
+ void setInitialValue(String initialValue);
/**
- * Sets the name of the property. This should not be changed once this IPropertySpecification is
- * added to a {@link org.apache.tapestry.spec.IComponentSpecification}.
+ * Sets the name of the property. This should not be changed once this
+ * IPropertySpecification is added to a
+ * {@link org.apache.tapestry.spec.IComponentSpecification}.
*/
- public void setName(String name);
+ void setName(String name);
- public void setType(String type);
+ void setType(String type);
/**
* A string indicating how the property is persisted.
@@ -58,13 +61,13 @@
* @since 4.0
*/
- public void setPersistence(String persistence);
+ void setPersistence(String persistence);
/**
* If null, then the property is not persistent.
*
* @since 4.0
*/
- public String getPersistence();
+ String getPersistence();
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/InjectSpecification.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/InjectSpecification.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/InjectSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/InjectSpecification.java Fri Apr 21 10:31:14 2006
@@ -22,29 +22,31 @@
*/
public interface InjectSpecification extends LocationHolder
{
+
/**
* Returns the name of the property to be created.
*/
- public String getProperty();
+ String getProperty();
- public void setProperty(String property);
+ void setProperty(String property);
/**
* Returns the type of injection. Different injection types interpret the
- * {@link #getObject() object property} differently. Ultimately, the type is used to select the
- * correct {@link org.apache.tapestry.enhance.InjectEnhancementWorker}.
+ * {@link #getObject() object property} differently. Ultimately, the type is
+ * used to select the correct
+ * {@link org.apache.tapestry.enhance.InjectEnhancementWorker}.
*/
- public String getType();
+ String getType();
- public void setType(String type);
+ void setType(String type);
/**
* Returns the string used to indentify a particular object.
*/
- public String getObject();
+ String getObject();
- public void setObject(String object);
-}
\ No newline at end of file
+ void setObject(String object);
+}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/InjectSpecificationImpl.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/InjectSpecificationImpl.java?rev=395955&r1=395954&r2=395955&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/InjectSpecificationImpl.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/spec/InjectSpecificationImpl.java Fri Apr 21 10:31:14 2006
@@ -20,8 +20,10 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class InjectSpecificationImpl extends BaseLocatable implements InjectSpecification
+public class InjectSpecificationImpl extends BaseLocatable implements
+ InjectSpecification
{
+
private String _property;
private String _object;
@@ -57,4 +59,4 @@
{
_type = type;
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org