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/05 17:21:32 UTC

svn commit: r1179258 - in /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5: ./ corelib/components/ services/

Author: mlusetti
Date: Wed Oct  5 15:21:31 2011
New Revision: 1179258

URL: http://svn.apache.org/viewvc?rev=1179258&view=rev
Log:
TAP5-1677 ParamterConstants -> ComponentsParamtersConstants

Added:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentsParametersConstants.java   (contents, props changed)
      - copied, changed from r1179242, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ParameterConstants.java
Removed:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ParameterConstants.java
Modified:
    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/services/TapestryModule.java

Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentsParametersConstants.java (from r1179242, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ParameterConstants.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentsParametersConstants.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentsParametersConstants.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ParameterConstants.java&r1=1179242&r2=1179258&rev=1179258&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ParameterConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentsParametersConstants.java Wed Oct  5 15:21:31 2011
@@ -5,7 +5,7 @@ package org.apache.tapestry5;
  *
  * @since 5.3
  */
-public class ParameterConstants
+public class ComponentsParametersConstants
 {
     /**
      * The default number for how many rows to display in a

Propchange: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentsParametersConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

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=1179258&r1=1179257&r2=1179258&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  5 15:21:31 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 + ":" + ParameterConstants.GRID_ROWS_PER_PAGE)
+    @Parameter(BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.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 + ":" + ParameterConstants.GRID_PAGER_POSITION,
+    @Parameter(value = BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.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 + ":" + ParameterConstants.GRID_EMPTY_BLOCK,
+    @Parameter(value = BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.GRID_EMPTY_BLOCK,
             defaultPrefix = BindingConstants.LITERAL)
     private Block empty;
 
@@ -191,7 +191,7 @@ public class Grid implements GridModel
      * element.
      */
     @Parameter(name = "class", defaultPrefix = BindingConstants.LITERAL,
-            value = BindingConstants.SYMBOL + ":" + ParameterConstants.GRID_TABLE_CSS_CLASS)
+            value = BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.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=1179258&r1=1179257&r2=1179258&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  5 15:21:31 2011
@@ -72,15 +72,15 @@ public class GridColumns
     private EventLink sort, sort2;
 
     @Inject
-    @Path("${" + ParameterConstants.GRIDCOLUMNS_ASCENDING_ASSET + "}")
+    @Path("${" + ComponentsParametersConstants.GRIDCOLUMNS_ASCENDING_ASSET + "}")
     private Asset ascendingAsset;
 
     @Inject
-    @Path("${" + ParameterConstants.GRIDCOLUMNS_DESCENDING_ASSET + "}")
+    @Path("${" + ComponentsParametersConstants.GRIDCOLUMNS_DESCENDING_ASSET + "}")
     private Asset descendingAsset;
 
     @Inject
-    @Path("${" + ParameterConstants.GRIDCOLUMNS_SORTABLE_ASSET + "}")
+    @Path("${" + ComponentsParametersConstants.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=1179258&r1=1179257&r2=1179258&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  5 15:21:31 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 + ":" + ParameterConstants.GRIDPAGER_PAGE_RANGE)
+    @Parameter(BindingConstants.SYMBOL + ":" + ComponentsParametersConstants.GRIDPAGER_PAGE_RANGE)
     private int range;
 
     /**

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=1179258&r1=1179257&r2=1179258&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  5 15:21:31 2011
@@ -2366,14 +2366,14 @@ public final class TapestryModule
         configuration.add(SymbolConstants.APPLICATION_FOLDER, "");
 
         // Components parameters default
-        configuration.add(ParameterConstants.GRID_ROWS_PER_PAGE, GridConstants.ROWS_PER_PAGE);
-        configuration.add(ParameterConstants.GRID_PAGER_POSITION, GridConstants.PAGER_POSITION);
-        configuration.add(ParameterConstants.GRID_EMPTY_BLOCK, GridConstants.EMPTY_BLOCK);
-        configuration.add(ParameterConstants.GRID_TABLE_CSS_CLASS,  GridConstants.TABLE_CLASS);
-        configuration.add(ParameterConstants.GRIDPAGER_PAGE_RANGE, GridConstants.PAGER_PAGE_RANGE);
-        configuration.add(ParameterConstants.GRIDCOLUMNS_SORTABLE_ASSET, GridConstants.COLUMNS_SORTABLE);
-        configuration.add(ParameterConstants.GRIDCOLUMNS_ASCENDING_ASSET, GridConstants.COLUMNS_ASCENDING);
-        configuration.add(ParameterConstants.GRIDCOLUMNS_DESCENDING_ASSET, GridConstants.COLUMNS_DESCENDING);
+        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);
     }
 
     /**