You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2012/11/01 21:44:32 UTC
[5/5] git commit: Rename method for consistency - modules() was
incorrect, as other attributes were in the singular
Rename method for consistency
- modules() was incorrect, as other attributes were in the singular
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/90f4ae18
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/90f4ae18
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/90f4ae18
Branch: refs/heads/5.4-js-rewrite
Commit: 90f4ae18384597c95f92922db794e8c8e83653d5
Parents: b1bd027
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Thu Nov 1 13:18:30 2012 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Thu Nov 1 13:18:30 2012 -0700
----------------------------------------------------------------------
.../org/apache/tapestry5/annotations/Import.java | 2 +-
.../tapestry5/corelib/base/AbstractField.java | 2 +-
.../tapestry5/corelib/components/AjaxFormLoop.java | 2 +-
.../tapestry5/corelib/components/FormFragment.java | 2 +-
.../tapestry5/corelib/components/LinkSubmit.java | 2 +-
.../apache/tapestry5/corelib/components/Zone.java | 2 +-
.../tapestry5/internal/transform/ImportWorker.java | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/90f4ae18/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java
index d78b53f..f055d9b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Import.java
@@ -81,5 +81,5 @@ public @interface Import
* @see JavaScriptSupport#require(String)
* @since 5.4
*/
- String[] modules() default {};
+ String[] module() default {};
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/90f4ae18/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java
index af7a3b0..f47e969 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java
@@ -36,7 +36,7 @@ import java.io.Serializable;
* @tapestrydoc
*/
@SupportsInformalParameters
-@Import(modules = "core/fields")
+@Import(module = "core/fields")
public abstract class AbstractField implements Field
{
/**
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/90f4ae18/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
index 6e0936f..3db5c7e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
@@ -56,7 +56,7 @@ import java.util.Iterator;
*/
@Events(
{EventConstants.ADD_ROW, EventConstants.REMOVE_ROW})
-@Import(modules = "core/ajaxformloop")
+@Import(module = "core/ajaxformloop")
public class AjaxFormLoop
{
/**
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/90f4ae18/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
index 1ffaea3..ea956c4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
@@ -55,7 +55,7 @@ import org.slf4j.Logger;
* @see Form
*/
@SupportsInformalParameters
-@Import(modules = "core/form-fragment")
+@Import(module = "core/form-fragment")
public class FormFragment implements ClientElement
{
/**
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/90f4ae18/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java
index 7970959..6fd1ede 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/LinkSubmit.java
@@ -34,7 +34,7 @@ import org.apache.tapestry5.services.javascript.JavaScriptSupport;
*/
@SupportsInformalParameters
@Events(EventConstants.SELECTED + " by default, may be overridden")
-@Import(modules = "core/forms")
+@Import(module = "core/forms")
public class LinkSubmit implements ClientElement
{
/**
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/90f4ae18/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 31e4d1f..ce5e697 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
@@ -65,7 +65,7 @@ import org.slf4j.Logger;
* @see FormFragment
*/
@SupportsInformalParameters
-@Import(modules = "core/zone")
+@Import(module = "core/zone")
public class Zone implements ClientBodyElement
{
/**
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/90f4ae18/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 2c48d3f..53410a9 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
@@ -118,7 +118,7 @@ public class ImportWorker implements ComponentClassTransformWorker2
importStylesheets(componentClass, model, method, annotation.stylesheet());
- importModules(method, annotation.modules());
+ importModules(method, annotation.module());
}
private void importStacks(PlasticMethod method, String[] stacks)