You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by ml...@apache.org on 2011/10/19 10:29:31 UTC
svn commit: r1186026 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/
main/java/org/apache/tapestry5/corelib/components/
main/java/org/apache/tapestry5/services/
test/groovy/org/apache/tapestry5/integration/symbolparam/...
Author: mlusetti
Date: Wed Oct 19 08:29:30 2011
New Revision: 1186026
URL: http://svn.apache.org/viewvc?rev=1186026&view=rev
Log:
Rename ComponentsParametersConstants to ComponentParameterConstants
Added:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentParameterConstants.java (contents, props changed)
- copied, changed from r1186009, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentsParametersConstants.java
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentsParametersConstants.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridColumns.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/symbolparam/services/AppModule.groovy
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentParameterConstants.java (from r1186009, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentsParametersConstants.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentParameterConstants.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentParameterConstants.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentsParametersConstants.java&r1=1186009&r2=1186026&rev=1186026&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentsParametersConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentParameterConstants.java Wed Oct 19 08:29:30 2011
@@ -19,7 +19,7 @@ package org.apache.tapestry5;
*
* @since 5.3
*/
-public class ComponentsParametersConstants
+public class ComponentParameterConstants
{
/**
* The default number for how many rows to display in a
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentParameterConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java?rev=1186026&r1=1186025&r2=1186026&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java Wed Oct 19 08:29:30 2011
@@ -59,7 +59,7 @@ public class FormInjector implements Cli
private Object[] context;
@Parameter(defaultPrefix = BindingConstants.LITERAL,
- value = BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.FORMINJECTOR_INSERT_POSITION)
+ value = BindingConstants.SYMBOL + ":" + ComponentParameterConstants.FORMINJECTOR_INSERT_POSITION)
private InsertPosition position;
/**
@@ -67,7 +67,7 @@ public class FormInjector implements Cli
* visible. The default value is "highlight".
*/
@Parameter(defaultPrefix = BindingConstants.LITERAL,
- value = BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.FORMINJECTOR_SHOW_FUNCTION)
+ value = BindingConstants.SYMBOL + ":" + ComponentParameterConstants.FORMINJECTOR_SHOW_FUNCTION)
private String show;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java?rev=1186026&r1=1186025&r2=1186026&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java Wed Oct 19 08:29:30 2011
@@ -91,14 +91,14 @@ public class Grid implements GridModel
* the rows into "pages" and (normally) provide a pager to allow the user to navigate within the overall result
* set.
*/
- @Parameter(BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.GRID_ROWS_PER_PAGE)
+ @Parameter(BindingConstants.SYMBOL + ":" + ComponentParameterConstants.GRID_ROWS_PER_PAGE)
private int rowsPerPage;
/**
* Defines where the pager (used to navigate within the "pages" of results) should be displayed: "top", "bottom",
* "both" or "none".
*/
- @Parameter(value = BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.GRID_PAGER_POSITION,
+ @Parameter(value = BindingConstants.SYMBOL + ":" + ComponentParameterConstants.GRID_PAGER_POSITION,
defaultPrefix = BindingConstants.LITERAL)
private GridPagerPosition pagerPosition;
@@ -182,7 +182,7 @@ public class Grid implements GridModel
* "There is no data to display". This parameter is used to customize that message, possibly including components to
* allow the user to create new objects.
*/
- //@Parameter(value = BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.GRID_EMPTY_BLOCK,
+ //@Parameter(value = BindingConstants.SYMBOL + ":" + ComponentParameterConstants.GRID_EMPTY_BLOCK,
@Parameter(value = "block:empty",
defaultPrefix = BindingConstants.LITERAL)
private Block empty;
@@ -192,7 +192,7 @@ public class Grid implements GridModel
* element.
*/
@Parameter(name = "class", defaultPrefix = BindingConstants.LITERAL,
- value = BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.GRID_TABLE_CSS_CLASS)
+ value = BindingConstants.SYMBOL + ":" + ComponentParameterConstants.GRID_TABLE_CSS_CLASS)
@Property(write = false)
private String tableClass;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridColumns.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridColumns.java?rev=1186026&r1=1186025&r2=1186026&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridColumns.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridColumns.java Wed Oct 19 08:29:30 2011
@@ -72,15 +72,15 @@ public class GridColumns
private EventLink sort, sort2;
@Inject
- @Path("${" + ComponentsParametersConstants.GRIDCOLUMNS_ASCENDING_ASSET + "}")
+ @Path("${" + ComponentParameterConstants.GRIDCOLUMNS_ASCENDING_ASSET + "}")
private Asset ascendingAsset;
@Inject
- @Path("${" + ComponentsParametersConstants.GRIDCOLUMNS_DESCENDING_ASSET + "}")
+ @Path("${" + ComponentParameterConstants.GRIDCOLUMNS_DESCENDING_ASSET + "}")
private Asset descendingAsset;
@Inject
- @Path("${" + ComponentsParametersConstants.GRIDCOLUMNS_SORTABLE_ASSET + "}")
+ @Path("${" + ComponentParameterConstants.GRIDCOLUMNS_SORTABLE_ASSET + "}")
private Asset sortableAsset;
@Inject
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java?rev=1186026&r1=1186025&r2=1186026&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java Wed Oct 19 08:29:30 2011
@@ -57,7 +57,7 @@ public class GridPager
* Number of pages before and after the current page in the range. The pager always displays links for 2 * range + 1
* pages, unless that's more than the total number of available pages.
*/
- @Parameter(BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.GRIDPAGER_PAGE_RANGE)
+ @Parameter(BindingConstants.SYMBOL + ":" + ComponentParameterConstants.GRIDPAGER_PAGE_RANGE)
private int range;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java?rev=1186026&r1=1186025&r2=1186026&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java Wed Oct 19 08:29:30 2011
@@ -285,7 +285,7 @@ public class Palette extends AbstractFie
/**
* Number of rows to display.
*/
- @Parameter(value = BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.PALETTE_ROWS_SIZE)
+ @Parameter(value = BindingConstants.SYMBOL + ":" + ComponentParameterConstants.PALETTE_ROWS_SIZE)
private int size;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java?rev=1186026&r1=1186025&r2=1186026&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java Wed Oct 19 08:29:30 2011
@@ -20,7 +20,7 @@ import org.apache.tapestry5.CSSClassCons
import org.apache.tapestry5.ClientBodyElement;
import org.apache.tapestry5.ComponentAction;
import org.apache.tapestry5.ComponentResources;
-import org.apache.tapestry5.ComponentsParametersConstants;
+import org.apache.tapestry5.ComponentParameterConstants;
import org.apache.tapestry5.MarkupWriter;
import org.apache.tapestry5.QueryParameterConstants;
import org.apache.tapestry5.annotations.BeginRender;
@@ -92,7 +92,7 @@ public class Zone implements ClientBodyE
* <div> visible before being updated. If not specified, then the basic "show" method is used.
*/
@Parameter(defaultPrefix = BindingConstants.LITERAL,
- value = BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.ZONE_SHOW_METHOD)
+ value = BindingConstants.SYMBOL + ":" + ComponentParameterConstants.ZONE_SHOW_METHOD)
private String show;
/**
@@ -101,7 +101,7 @@ public class Zone implements ClientBodyE
* to indicate to the user that and update has taken place.
*/
@Parameter(defaultPrefix = BindingConstants.LITERAL,
- value = BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.ZONE_UPDATE_METHOD)
+ value = BindingConstants.SYMBOL + ":" + ComponentParameterConstants.ZONE_UPDATE_METHOD)
private String update;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=1186026&r1=1186025&r2=1186026&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java Wed Oct 19 08:29:30 2011
@@ -2364,25 +2364,25 @@ public final class TapestryModule
configuration.add(SymbolConstants.APPLICATION_FOLDER, "");
// Grid component parameters defaults
- configuration.add(ComponentsParametersConstants.GRID_ROWS_PER_PAGE, GridConstants.ROWS_PER_PAGE);
- configuration.add(ComponentsParametersConstants.GRID_PAGER_POSITION, GridConstants.PAGER_POSITION);
- configuration.add(ComponentsParametersConstants.GRID_EMPTY_BLOCK, GridConstants.EMPTY_BLOCK);
- configuration.add(ComponentsParametersConstants.GRID_TABLE_CSS_CLASS, GridConstants.TABLE_CLASS);
- configuration.add(ComponentsParametersConstants.GRIDPAGER_PAGE_RANGE, GridConstants.PAGER_PAGE_RANGE);
- configuration.add(ComponentsParametersConstants.GRIDCOLUMNS_SORTABLE_ASSET, GridConstants.COLUMNS_SORTABLE);
- configuration.add(ComponentsParametersConstants.GRIDCOLUMNS_ASCENDING_ASSET, GridConstants.COLUMNS_ASCENDING);
- configuration.add(ComponentsParametersConstants.GRIDCOLUMNS_DESCENDING_ASSET, GridConstants.COLUMNS_DESCENDING);
+ configuration.add(ComponentParameterConstants.GRID_ROWS_PER_PAGE, GridConstants.ROWS_PER_PAGE);
+ configuration.add(ComponentParameterConstants.GRID_PAGER_POSITION, GridConstants.PAGER_POSITION);
+ configuration.add(ComponentParameterConstants.GRID_EMPTY_BLOCK, GridConstants.EMPTY_BLOCK);
+ configuration.add(ComponentParameterConstants.GRID_TABLE_CSS_CLASS, GridConstants.TABLE_CLASS);
+ configuration.add(ComponentParameterConstants.GRIDPAGER_PAGE_RANGE, GridConstants.PAGER_PAGE_RANGE);
+ configuration.add(ComponentParameterConstants.GRIDCOLUMNS_SORTABLE_ASSET, GridConstants.COLUMNS_SORTABLE);
+ configuration.add(ComponentParameterConstants.GRIDCOLUMNS_ASCENDING_ASSET, GridConstants.COLUMNS_ASCENDING);
+ configuration.add(ComponentParameterConstants.GRIDCOLUMNS_DESCENDING_ASSET, GridConstants.COLUMNS_DESCENDING);
// FormInjector component parameters defaults
- configuration.add(ComponentsParametersConstants.FORMINJECTOR_INSERT_POSITION, "above");
- configuration.add(ComponentsParametersConstants.FORMINJECTOR_SHOW_FUNCTION, "highlight");
+ configuration.add(ComponentParameterConstants.FORMINJECTOR_INSERT_POSITION, "above");
+ configuration.add(ComponentParameterConstants.FORMINJECTOR_SHOW_FUNCTION, "highlight");
// Palette component parameters defaults
- configuration.add(ComponentsParametersConstants.PALETTE_ROWS_SIZE, 10);
+ configuration.add(ComponentParameterConstants.PALETTE_ROWS_SIZE, 10);
// Zone component parameters defaults
- configuration.add(ComponentsParametersConstants.ZONE_SHOW_METHOD, "show");
- configuration.add(ComponentsParametersConstants.ZONE_UPDATE_METHOD, "highlight");
+ configuration.add(ComponentParameterConstants.ZONE_SHOW_METHOD, "show");
+ configuration.add(ComponentParameterConstants.ZONE_UPDATE_METHOD, "highlight");
// By default, no page is on the whitelist unless it has the @WhitelistAccessOnly annotation
configuration.add(MetaDataConstants.WHITELIST_ONLY_PAGE, false);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/symbolparam/services/AppModule.groovy
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/symbolparam/services/AppModule.groovy?rev=1186026&r1=1186025&r2=1186026&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/symbolparam/services/AppModule.groovy (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/symbolparam/services/AppModule.groovy Wed Oct 19 08:29:30 2011
@@ -16,13 +16,13 @@ package org.apache.tapestry5.integration
import org.apache.tapestry5.SymbolConstants
import org.apache.tapestry5.ioc.MappedConfiguration
-import org.apache.tapestry5.ComponentsParametersConstants
+import org.apache.tapestry5.ComponentParameterConstants
class AppModule {
void contributeApplicationDefaults(MappedConfiguration conf)
{
conf.add(SymbolConstants.PRODUCTION_MODE, false)
- conf.add(ComponentsParametersConstants.GRID_ROWS_PER_PAGE, 2);
+ conf.add(ComponentParameterConstants.GRID_ROWS_PER_PAGE, 2);
}
}