svn commit: r525934 - in /incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src: main/java/wicket/model/IWrapModel.java test/java/wicket/model/StringResourceModelTest.java

[eh...@apache.org]

Author: ehillenius
Date: Thu Apr  5 12:20:18 2007
New Revision: 525934

URL: http://svn.apache.org/viewvc?view=rev&rev=525934
Log:
doc fixes

Modified:
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/model/StringResourceModelTest.java

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.java?view=diff&rev=525934&r1=525933&r2=525934
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.java Thu Apr  5 12:20:18 2007
@@ -20,19 +20,7 @@
  * A marker interface that represents a model that serves as a wrapper for
  * another. Typically these models are produced by the following methods:
  * {@link IComponentAssignedModel#wrapOnAssignment(wicket.Component)} and
- * {@link IInheritanceAware#wrapOnInheritance(wicket.Component)}
- * 
- * <b>Nested Models </b>- IModels can be nested and the innermost model is also
- * known as the "root" model since it is the model on which the outer models
- * rely. The getNestedModel() method on IModel gets any nested model within the
- * given model. This allows Component.sameInnermostModel() to compare two models
- * to see if they both have the same innermost model (the same most nested
- * model).
- * <p>
- * For example, a Form might have a Person model and then a TextField might have
- * a PropertyModel which is the "name" property of the Person model. In this
- * case, PropertyModel will implement getNestedModel(), returning the Person
- * model which is the nested model of the property model.
+ * {@link IComponentInheritedModel#wrapOnInheritance(wicket.Component)}
  * 
  * @author jcompagner
  * @author Igor Vaynberg (ivaynberg)

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/model/StringResourceModelTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/model/StringResourceModelTest.java?view=diff&rev=525934&r1=525933&r2=525934
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/model/StringResourceModelTest.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/model/StringResourceModelTest.java Thu Apr  5 12:20:18 2007
@@ -230,7 +230,6 @@
 		Assert.assertNotNull(model.getLocalizer());
 		model.detach();
 		// Removed this because getObject() will reattach now...
-		//Assert.assertNull(model.getNestedModel().getObject());
 		Assert.assertNull(model.getLocalizer());
 	}