Author: ehillenius
Date: Thu Apr 5 10:53:48 2007
New Revision: 525914
URL: http://svn.apache.org/viewvc?view=rev&rev=525914
Log:
INestedModelContainer -> IWrapModel
Added:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.java
- copied, changed from r525893, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/INestedModelContainer.java
Removed:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/INestedModelContainer.java
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/Component.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/MarkupContainer.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractWrapModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ComponentPropertyModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentAssignedModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ResourceModel.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/Component.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/Component.java?view=diff&rev=525914&r1=525913&r2=525914
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/Component.java
(original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/Component.java
Thu Apr 5 10:53:48 2007
@@ -43,7 +43,7 @@
import wicket.model.IComponentInheritedModel;
import wicket.model.IModel;
import wicket.model.IModelComparator;
-import wicket.model.INestedModelContainer;
+import wicket.model.IWrapModel;
import wicket.util.convert.IConverter;
import wicket.util.lang.Classes;
import wicket.util.lang.Objects;
@@ -1960,9 +1960,9 @@
}
IModel prevModel = this.model;
- if (prevModel instanceof INestedModelContainer)
+ if (prevModel instanceof IWrapModel)
{
- prevModel = ((INestedModelContainer)prevModel).getNestedModel();
+ prevModel = ((IWrapModel)prevModel).getWrappedModel();
}
// Change model
@@ -2563,9 +2563,9 @@
// Get model
IModel model = current.getModel();
- if (model instanceof INestedModelContainer)
+ if (model instanceof IWrapModel)
{
- model = ((INestedModelContainer)model).getNestedModel();
+ model = ((IWrapModel)model).getWrappedModel();
}
if (model instanceof IComponentInheritedModel)
@@ -3183,9 +3183,9 @@
protected final IModel getInnermostModel(final IModel model)
{
IModel nested = model;
- while (nested != null && nested instanceof INestedModelContainer)
+ while (nested != null && nested instanceof IWrapModel)
{
- final IModel next = ((INestedModelContainer)nested).getNestedModel();
+ final IModel next = ((IWrapModel)nested).getWrappedModel();
if (nested == next)
{
throw new WicketRuntimeException("Model for " + nested + " is self-referential");
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/MarkupContainer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/MarkupContainer.java?view=diff&rev=525914&r1=525913&r2=525914
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/MarkupContainer.java
(original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/MarkupContainer.java
Thu Apr 5 10:53:48 2007
@@ -36,7 +36,7 @@
import wicket.markup.resolver.IComponentResolver;
import wicket.model.IComponentInheritedModel;
import wicket.model.IModel;
-import wicket.model.INestedModelContainer;
+import wicket.model.IWrapModel;
import wicket.util.resource.IResourceStream;
import wicket.util.string.Strings;
import wicket.version.undo.Change;
@@ -684,9 +684,9 @@
public Object component(Component component)
{
IModel compModel = component.getModel();
- if (compModel instanceof INestedModelContainer)
+ if (compModel instanceof IWrapModel)
{
- compModel = ((INestedModelContainer)compModel).getNestedModel();
+ compModel = ((IWrapModel)compModel).getWrappedModel();
}
if (compModel == previous)
{
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractWrapModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractWrapModel.java?view=diff&rev=525914&r1=525913&r2=525914
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractWrapModel.java
(original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractWrapModel.java
Thu Apr 5 10:53:48 2007
@@ -17,13 +17,13 @@
package wicket.model;
/**
- * Simple base class for INestedModelContainer objects see {@link IComponentAssignedModel}
+ * Simple base class for IWrapModel objects see {@link IComponentAssignedModel}
* or {@link IComponentInheritedModel} so that you don't have to have empty methods
* like detach or setObject() when not used in the wrapper.
*
* @author jcompagner
*/
-public abstract class AbstractWrapModel implements INestedModelContainer
+public abstract class AbstractWrapModel implements IWrapModel
{
/**
* @see wicket.model.IModel#getObject()
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ComponentPropertyModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ComponentPropertyModel.java?view=diff&rev=525914&r1=525913&r2=525914
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ComponentPropertyModel.java
(original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ComponentPropertyModel.java
Thu Apr 5 10:53:48 2007
@@ -57,7 +57,7 @@
/**
* @see wicket.model.IComponentAssignedModel#wrapOnAssignment(wicket.Component)
*/
- public INestedModelContainer wrapOnAssignment(final Component component)
+ public IWrapModel wrapOnAssignment(final Component component)
{
return new AssignmentWrapper(component, propertyName);
}
@@ -67,7 +67,7 @@
*/
private class AssignmentWrapper extends AbstractReadOnlyModel
implements
- INestedModelContainer
+ IWrapModel
{
private static final long serialVersionUID = 1L;
@@ -82,9 +82,9 @@
}
/**
- * @see wicket.model.INestedModelContainer#getNestedModel()
+ * @see wicket.model.IWrapModel#getWrappedModel()
*/
- public IModel getNestedModel()
+ public IModel getWrappedModel()
{
return ComponentPropertyModel.this;
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java?view=diff&rev=525914&r1=525913&r2=525914
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java
(original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java
Thu Apr 5 10:53:48 2007
@@ -96,7 +96,7 @@
/**
* @see wicket.model.IComponentInheritedModel#wrapOnInheritance(wicket.Component)
*/
- public INestedModelContainer wrapOnInheritance(Component component)
+ public IWrapModel wrapOnInheritance(Component component)
{
return new AttachedCompoundPropertyModel(component);
}
@@ -109,7 +109,7 @@
*/
private class AttachedCompoundPropertyModel extends AbstractPropertyModel
implements
- INestedModelContainer,
+ IWrapModel,
IComponentInheritedModel
{
private static final long serialVersionUID = 1L;
@@ -137,9 +137,9 @@
}
/**
- * @see wicket.model.INestedModelContainer#getNestedModel()
+ * @see wicket.model.IWrapModel#getWrappedModel()
*/
- public IModel getNestedModel()
+ public IModel getWrappedModel()
{
return CompoundPropertyModel.this;
}
@@ -147,7 +147,7 @@
/**
* @see wicket.model.IComponentInheritedModel#wrapOnInheritance(wicket.Component)
*/
- public INestedModelContainer wrapOnInheritance(Component component)
+ public IWrapModel wrapOnInheritance(Component component)
{
return new AttachedCompoundPropertyModel(component);
};
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentAssignedModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentAssignedModel.java?view=diff&rev=525914&r1=525913&r2=525914
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentAssignedModel.java
(original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentAssignedModel.java
Thu Apr 5 10:53:48 2007
@@ -52,5 +52,5 @@
* @param component
* @return The WrapModel that wraps this model
*/
- INestedModelContainer wrapOnAssignment(Component component);
+ IWrapModel wrapOnAssignment(Component component);
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java?view=diff&rev=525914&r1=525913&r2=525914
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java
(original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java
Thu Apr 5 10:53:48 2007
@@ -40,5 +40,5 @@
* @param component
* @return The WrapModel that wraps this model
*/
- INestedModelContainer wrapOnInheritance(Component component);
+ IWrapModel wrapOnInheritance(Component component);
}
Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.java
(from r525893, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/INestedModelContainer.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=525914&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/INestedModelContainer.java&r1=525893&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.java&r2=525914
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/INestedModelContainer.java
(original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.java
Thu Apr 5 10:53:48 2007
@@ -37,12 +37,12 @@
* @author jcompagner
* @author Igor Vaynberg (ivaynberg)
*/
-public interface INestedModelContainer extends IModel
+public interface IWrapModel extends IModel
{
/**
- * Gets the nested model.
+ * Gets the wrapped model.
*
- * @return The nested model object.
+ * @return The wrapped model
*/
- IModel getNestedModel();
+ IModel getWrappedModel();
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ResourceModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ResourceModel.java?view=diff&rev=525914&r1=525913&r2=525914
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ResourceModel.java
(original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ResourceModel.java
Thu Apr 5 10:53:48 2007
@@ -80,7 +80,7 @@
/**
* @see wicket.model.IComponentAssignedModel#wrapOnAssignment(wicket.Component)
*/
- public INestedModelContainer wrapOnAssignment(final Component component)
+ public IWrapModel wrapOnAssignment(final Component component)
{
return new AssignmentWrapper(resourceKey, defaultValue, component);
}
@@ -88,7 +88,7 @@
/**
*
*/
- private class AssignmentWrapper extends ResourceModel implements INestedModelContainer
+ private class AssignmentWrapper extends ResourceModel implements IWrapModel
{
private static final long serialVersionUID = 1L;
@@ -108,9 +108,9 @@
}
/**
- * @see wicket.model.INestedModelContainer#getNestedModel()
+ * @see wicket.model.IWrapModel#getWrappedModel()
*/
- public IModel getNestedModel()
+ public IModel getWrappedModel()
{
return ResourceModel.this;
}
|