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 2014/05/17 14:14:37 UTC
[2/2] git commit: fix some typos
fix some typos
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/fd3c9e6b
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/fd3c9e6b
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/fd3c9e6b
Branch: refs/heads/master
Commit: fd3c9e6b72670e7fe7f5d76f5433d4ac03e067cf
Parents: bb30964
Author: Jochen Kemnade <jk...@apache.org>
Authored: Sat May 17 14:13:49 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Sat May 17 14:13:49 2014 +0200
----------------------------------------------------------------------
.../archetype-resources/src/main/java/services/AppModule.java | 2 +-
.../java/org/apache/tapestry5/corelib/components/Label.java | 2 +-
.../java/org/apache/tapestry5/corelib/components/Zone.java | 2 +-
.../apache/tapestry5/internal/pageload/ComponentAssembler.java | 2 +-
.../apache/tapestry5/ioc/internal/ServiceProxyProvider.java | 2 +-
.../org/apache/tapestry5/ioc/internal/util/GenericsUtils.java | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fd3c9e6b/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java
----------------------------------------------------------------------
diff --git a/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java b/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java
index c42293e..b2994d6 100644
--- a/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java
+++ b/quickstart/filtered/archetype-resources/src/main/java/services/AppModule.java
@@ -35,7 +35,7 @@ public class AppModule
public static void contributeFactoryDefaults(
MappedConfiguration<String, Object> configuration)
{
- // The application version is incorprated into URLs for most assets. Web
+ // The application version is incorporated into URLs for most assets. Web
// browsers will cache assets because of the far future expires header.
// If existing assets change (or if the Tapestry version changes) you
// should also change this number, to force the browser to download new
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fd3c9e6b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
index b030929..2b15eeb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
@@ -27,7 +27,7 @@ import org.apache.tapestry5.ioc.internal.util.InternalUtils;
* Generates a <label> element for a particular field. It writes the CSS class "control-label".
* <p/>
* A Label will render its body, if it has one. However, in most cases it will not have a body, and will render its
- * {@linkplain org.apache.tapestry5.Field#getLabel() field's label} as it's body. Remember, however, that it is the
+ * {@linkplain org.apache.tapestry5.Field#getLabel() field's label} as its body. Remember, however, that it is the
* field label that will be used in any error messages. The Label component allows for client- and server-side
* validation error decorations.
*
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fd3c9e6b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
index 141663f..f79b286 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
@@ -41,7 +41,7 @@ import org.slf4j.Logger;
* content on the client side. Often, re-rendering the Zone's {@linkplain #getBody() body} is useful. Multiple
* client-side zones may be updated via the {@link org.apache.tapestry5.services.ajax.AjaxResponseRenderer} service.
* <p/>
- * You will often want to specify the id parameter of the Zone, in addition to it's Tapestry component id; this "locks
+ * You will often want to specify the id parameter of the Zone, in addition to its Tapestry component id; this "locks
* down" the client-side id, so the same value is used even in later partial renders of the page (essential if the Zone
* is nested inside another Zone). When you specify the client-side id, it is used exactly as provided (meaning that you
* are responsible for ensuring that there will not be an id conflict even in the face of multiple partial renders of
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fd3c9e6b/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/ComponentAssembler.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/ComponentAssembler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/ComponentAssembler.java
index f99d63c..a5627d3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/ComponentAssembler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/ComponentAssembler.java
@@ -95,7 +95,7 @@ interface ComponentAssembler
* @param mixins
* mixins for the component (as defined in the template)
* @param location
- * location of the component (i.e., it's location in the container template)
+ * location of the component (i.e., its location in the container template)
* @return assembler for the component
*/
EmbeddedComponentAssembler createEmbeddedAssembler(String embeddedId, String componentClassName,
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fd3c9e6b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyProvider.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyProvider.java
index 83eec6b..8a5ed62 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyProvider.java
@@ -21,7 +21,7 @@ package org.apache.tapestry5.ioc.internal;
public interface ServiceProxyProvider
{
/**
- * Look up the service and return it's proxy.
+ * Look up the service and return its proxy.
*
* @param serviceId the id of the service to obtain
* @return the service proxy
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/fd3c9e6b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
index d0a93c4..5fd8c24 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
@@ -314,7 +314,7 @@ public class GenericsUtils
}
/**
- * Method to resolve a TypeVariable to it's most
+ * Method to resolve a TypeVariable to its most
* <a href="http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html#112582">reifiable</a> form.
* <p/>
* <p/>
@@ -336,7 +336,7 @@ public class GenericsUtils
* <p/>
* When extracting Types we only have to consider the superclass hierarchy and not the interfaces implemented by
* the class. When a class implements a generic interface it must provide types for the interface and any generic
- * methods implemented from the interface will be re-defined by the class with it's generic type variables.
+ * methods implemented from the interface will be re-defined by the class with its generic type variables.
*
* @param typeVariable - the type variable to resolve.
* @param containingType - the shallowest class in the class hierarchy (furthest from Object) where typeVariable is defined.
@@ -588,7 +588,7 @@ public class GenericsUtils
* the actual type.
*
* @param typeVariable - the type variable in question.
- * @return the index of the type variable in it's declaring class/method/constructor's type parameters.
+ * @return the index of the type variable in its declaring class/method/constructor's type parameters.
*/
private static int getTypeVariableIndex(final TypeVariable typeVariable)
{