You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2014/12/31 02:12:13 UTC
[1/2] tapestry-5 git commit: Allow the component's render phase
methods to execute before the advice provided by the ImportWorker
Repository: tapestry-5
Updated Branches:
refs/heads/master 687abdf28 -> 7a9b2e81d
Allow the component's render phase methods to execute before the advice provided by the ImportWorker
This is the last piece necessary for TAP5-2435 (the rest was implemented previously).
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/d025536f
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d025536f
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d025536f
Branch: refs/heads/master
Commit: d025536f5af206c10744c884fde41b87ae37fc7f
Parents: 687abdf
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Dec 30 17:11:16 2014 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Dec 30 17:11:16 2014 -0800
----------------------------------------------------------------------
.../org/apache/tapestry5/internal/transform/ImportWorker.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d025536f/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java
index 17bddc4..a3801a6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ImportWorker.java
@@ -268,11 +268,11 @@ public class ImportWorker implements ComponentClassTransformWorker2
{
public void advise(MethodInvocation invocation)
{
+ invocation.proceed();
+
Asset[] assets = (Asset[]) access.get(invocation.getInstance());
F.flow(assets).each(operation);
-
- invocation.proceed();
}
});
}
[2/2] tapestry-5 git commit: Improve the Javadoc
Posted by hl...@apache.org.
Improve the Javadoc
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7a9b2e81
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7a9b2e81
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7a9b2e81
Branch: refs/heads/master
Commit: 7a9b2e81d8984e8d538bd2eb4ed7c398c3176e7d
Parents: d025536
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Dec 30 17:11:29 2014 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Dec 30 17:11:29 2014 -0800
----------------------------------------------------------------------
.../java/org/apache/tapestry5/modules/TapestryModule.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7a9b2e81/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
index 8a72a4d..d215095 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
@@ -99,7 +99,6 @@ import org.slf4j.Logger;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
import java.io.InputStream;
import java.lang.annotation.Annotation;
@@ -1706,8 +1705,13 @@ public final class TapestryModule
* <dt>PageNameMeta (since 5.4)</dt>
* <dd>Renders a {@code <meta/>} tag describing the active page name (development mode only)</dd>
* <dt>ImportCoreStack (since 5.4) </dt>
- * <dd>Imports to "core" stack (necessary to get the Bootstrap CSS, if nothing else).</dd>
+ * <dd>Imports the "core" stack (necessary to get the Bootstrap CSS, if nothing else).</dd>
* </dl>
+ *
+ * @see org.apache.tapestry5.SymbolConstants#OMIT_GENERATOR_META
+ * @see org.apache.tapestry5.SymbolConstants#PRODUCTION_MODE
+ * @see org.apache.tapestry5.SymbolConstants#INCLUDE_CORE_STACK
+ * @see org.apache.tapestry5.SymbolConstants#ENABLE_PAGELOADING_MASK
*/
public void contributeMarkupRenderer(OrderedConfiguration<MarkupRendererFilter> configuration,
[2/2] tapestry-5 git commit: Improve the Javadoc
Posted by hl...@apache.org.
Improve the Javadoc
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7a9b2e81
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7a9b2e81
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7a9b2e81
Branch: refs/heads/master
Commit: 7a9b2e81d8984e8d538bd2eb4ed7c398c3176e7d
Parents: d025536
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Dec 30 17:11:29 2014 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Dec 30 17:11:29 2014 -0800
----------------------------------------------------------------------
.../java/org/apache/tapestry5/modules/TapestryModule.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7a9b2e81/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
index 8a72a4d..d215095 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
@@ -99,7 +99,6 @@ import org.slf4j.Logger;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
import java.io.InputStream;
import java.lang.annotation.Annotation;
@@ -1706,8 +1705,13 @@ public final class TapestryModule
* <dt>PageNameMeta (since 5.4)</dt>
* <dd>Renders a {@code <meta/>} tag describing the active page name (development mode only)</dd>
* <dt>ImportCoreStack (since 5.4) </dt>
- * <dd>Imports to "core" stack (necessary to get the Bootstrap CSS, if nothing else).</dd>
+ * <dd>Imports the "core" stack (necessary to get the Bootstrap CSS, if nothing else).</dd>
* </dl>
+ *
+ * @see org.apache.tapestry5.SymbolConstants#OMIT_GENERATOR_META
+ * @see org.apache.tapestry5.SymbolConstants#PRODUCTION_MODE
+ * @see org.apache.tapestry5.SymbolConstants#INCLUDE_CORE_STACK
+ * @see org.apache.tapestry5.SymbolConstants#ENABLE_PAGELOADING_MASK
*/
public void contributeMarkupRenderer(OrderedConfiguration<MarkupRendererFilter> configuration,