svn commit: r1069358 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry5/ main/java/org/apache/tapestry5/corelib/components/ test/java/org/apache/tapestry5/integration/app1/pages/

[hl...@apache.org]

Author: hlship
Date: Thu Feb 10 12:33:44 2011
New Revision: 1069358

URL: http://svn.apache.org/viewvc?rev=1069358&view=rev
Log:
TAP5-1439: Remove PrimaryKeyEncoder (replaced by ValueEncoder)

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Loop.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java?rev=1069358&r1=1069357&r2=1069358&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java Thu Feb 10 12:33:44 2011
@@ -1,4 +1,4 @@
-// Copyright 2008, 2009, 2010 The Apache Software Foundation
+// Copyright 2008, 2009, 2010, 2011 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -147,10 +147,9 @@ public class EventConstants
 
     /**
      * Event triggered by {@link org.apache.tapestry5.corelib.components.AjaxFormLoop} to inform the
-     * container that a
-     * new row has been requested. The return value from the event handler must be the newly created
+     * container that a new row has been requested. The return value from the event handler must be the newly created
      * object, which must
-     * also be visible in the {@link org.apache.tapestry5.PrimaryKeyEncoder encoder parameter}.
+     * also be visible in the {@link encoder parameter}.
      */
     public static final String ADD_ROW = "addRow";
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java?rev=1069358&r1=1069357&r2=1069358&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java Thu Feb 10 12:33:44 2011
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008 The Apache Software Foundation
+// Copyright 2007, 2008, 2011 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ package org.apache.tapestry5;
  *
  * @see SelectModel
  * @see org.apache.tapestry5.services.ValueEncoderSource
- * @see PrimaryKeyEncoder
  */
 public interface ValueEncoder<V>
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Loop.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Loop.java?rev=1069358&r1=1069357&r2=1069358&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Loop.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Loop.java Thu Feb 10 12:33:44 2011
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2006, 2007, 2008, 2009, 2011 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -149,7 +149,7 @@ public class Loop<T>
     }
 
     /**
-     * Restores the value using a stored primary key via {@link PrimaryKeyEncoder#toValue(Serializable)}.
+     * Restores the value using a stored primary key via {@link ValueEncoder#toValue(String)}.
      */
     static class RestoreStateFromStoredClientValue implements ComponentAction<Loop>
     {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java?rev=1069358&r1=1069357&r2=1069358&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java Thu Feb 10 12:33:44 2011
@@ -157,7 +157,7 @@ public class Index
                             "Show that a blank value in a PasswordField does not update the server side value."),
 
                     new Item("GridFormEncoderDemo", "Grid Form Encoder Demo",
-                            "Grid inside a Form using the PrimaryKeyEncoder option"),
+                            "Grid inside a Form using the ValueEncoder option"),
 
                     new Item("DateFieldAjaxFormLoop", "DateField inside AjaxFormLoop",
                             "Show that DateField component works correctly inside AjaxFormLoop"),