You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jo...@apache.org on 2007/04/04 21:29:53 UTC
svn commit: r525588 - in
/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket:
./ markup/html/form/ markup/html/link/ model/
Author: jonl
Date: Wed Apr 4 12:29:52 2007
New Revision: 525588
URL: http://svn.apache.org/viewvc?view=rev&rev=525588
Log:
Renamed interfaces and made getRootModel accessible as per vote. Added ComponentPropertyModel to be reviewed and hopefully merged into PropertyModel if it's not too gory.
Added:
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/IComponentAssignedModel.java
- copied, changed from r525261, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IAssignmentAwareModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java
- copied, changed from r525261, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IInheritableModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IModelWrapper.java
- copied, changed from r525261, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.java
Removed:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IAssignmentAwareModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IInheritableModel.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.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/markup/html/form/FormComponent.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/link/ExternalLink.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/CompoundPropertyModel.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=525588&r1=525587&r2=525588
==============================================================================
--- 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 Wed Apr 4 12:29:52 2007
@@ -39,11 +39,11 @@
import wicket.markup.WicketTag;
import wicket.markup.html.IHeaderContributor;
import wicket.markup.html.internal.HtmlHeaderContainer;
-import wicket.model.IAssignmentAwareModel;
-import wicket.model.IInheritableModel;
+import wicket.model.IComponentAssignedModel;
+import wicket.model.IComponentInheritedModel;
import wicket.model.IModel;
import wicket.model.IModelComparator;
-import wicket.model.IWrapModel;
+import wicket.model.IModelWrapper;
import wicket.util.convert.IConverter;
import wicket.util.lang.Classes;
import wicket.util.lang.Objects;
@@ -597,15 +597,7 @@
{
setId(id);
getApplication().notifyComponentInstantiationListeners(this);
-
- if (model instanceof IAssignmentAwareModel)
- {
- this.model = ((IAssignmentAwareModel)model).wrapOnAssignment(this);
- }
- else
- {
- this.model = model;
- }
+ this.model = wrap(model);
}
/**
@@ -1970,9 +1962,9 @@
}
IModel prevModel = this.model;
- if (prevModel instanceof IWrapModel)
+ if (prevModel instanceof IModelWrapper)
{
- prevModel = ((IWrapModel)prevModel).getNestedModel();
+ prevModel = ((IModelWrapper)prevModel).getNestedModel();
}
// Change model
@@ -1983,14 +1975,7 @@
addStateChange(new ComponentModelChange(prevModel));
}
- if (model instanceof IAssignmentAwareModel)
- {
- this.model = ((IAssignmentAwareModel)model).wrapOnAssignment(this);
- }
- else
- {
- this.model = model;
- }
+ this.model = wrap(model);
}
modelChanged();
@@ -2580,12 +2565,12 @@
// Get model
IModel model = current.getModel();
- if (model instanceof IWrapModel)
+ if (model instanceof IModelWrapper)
{
- model = ((IWrapModel)model).getNestedModel();
+ model = ((IModelWrapper)model).getNestedModel();
}
- if (model instanceof IInheritableModel)
+ if (model instanceof IComponentInheritedModel)
{
// we turn off versioning as we share the model with another
// component that is the owner of the model (that component
@@ -2593,7 +2578,7 @@
setVersioned(false);
// return the shared inherited
- model = ((IInheritableModel)model).wrapOnInheritance(this);
+ model = ((IComponentInheritedModel)model).wrapOnInheritance(this);
return model;
}
}
@@ -3129,6 +3114,22 @@
{
setFlag(FLAG_AUTO, auto);
}
+
+ /**
+ * @param model The model to wrap if need be
+ * @return The wrapped model
+ */
+ protected final IModel wrap(final IModel model)
+ {
+ if (model instanceof IComponentAssignedModel)
+ {
+ return ((IComponentAssignedModel)model).wrapOnAssignment(this);
+ }
+ else
+ {
+ return model;
+ }
+ }
/**
* Sets the id of this component. This method is private because the only
@@ -3180,12 +3181,12 @@
* The model
* @return The root object
*/
- private final IModel getRootModel(final IModel model)
+ protected final IModel getRootModel(final IModel model)
{
IModel nested = model;
- while (nested != null && nested instanceof IWrapModel)
+ while (nested != null && nested instanceof IModelWrapper)
{
- final IModel next = ((IWrapModel)nested).getNestedModel();
+ final IModel next = ((IModelWrapper)nested).getNestedModel();
if (nested == next)
{
throw new WicketRuntimeException("Model for " + nested + " is self-referential");
@@ -3193,6 +3194,14 @@
nested = next;
}
return nested;
+ }
+
+ /**
+ * @return Root model for this component
+ */
+ public final IModel getRootModel()
+ {
+ return getRootModel(getModel());
}
/**
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=525588&r1=525587&r2=525588
==============================================================================
--- 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 Wed Apr 4 12:29:52 2007
@@ -34,9 +34,9 @@
import wicket.markup.MarkupStream;
import wicket.markup.WicketTag;
import wicket.markup.resolver.IComponentResolver;
-import wicket.model.IInheritableModel;
+import wicket.model.IComponentInheritedModel;
import wicket.model.IModel;
-import wicket.model.IWrapModel;
+import wicket.model.IModelWrapper;
import wicket.util.resource.IResourceStream;
import wicket.util.string.Strings;
import wicket.version.undo.Change;
@@ -677,16 +677,16 @@
{
final IModel previous = getModel();
super.setModel(model);
- if (previous instanceof IInheritableModel)
+ if (previous instanceof IComponentInheritedModel)
{
visitChildren(new IVisitor()
{
public Object component(Component component)
{
IModel compModel = component.getModel();
- if (compModel instanceof IWrapModel)
+ if (compModel instanceof IModelWrapper)
{
- compModel = ((IWrapModel)compModel).getNestedModel();
+ compModel = ((IModelWrapper)compModel).getNestedModel();
}
if (compModel == previous)
{
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java?view=diff&rev=525588&r1=525587&r2=525588
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java Wed Apr 4 12:29:52 2007
@@ -31,7 +31,7 @@
import wicket.WicketRuntimeException;
import wicket.markup.ComponentTag;
import wicket.markup.html.WebMarkupContainer;
-import wicket.model.IAssignmentAwareModel;
+import wicket.model.IComponentAssignedModel;
import wicket.model.IModel;
import wicket.util.convert.ConversionException;
import wicket.util.convert.IConverter;
@@ -613,9 +613,9 @@
*/
public FormComponent setLabel(IModel labelModel)
{
- if (labelModel instanceof IAssignmentAwareModel)
+ if (labelModel instanceof IComponentAssignedModel)
{
- labelModel = ((IAssignmentAwareModel)labelModel).wrapOnAssignment(this);
+ labelModel = ((IComponentAssignedModel)labelModel).wrapOnAssignment(this);
}
this.labelModel = labelModel;
return this;
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/link/ExternalLink.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/link/ExternalLink.java?view=diff&rev=525588&r1=525587&r2=525588
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/link/ExternalLink.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/link/ExternalLink.java Wed Apr 4 12:29:52 2007
@@ -94,8 +94,8 @@
{
super(id);
- this.href = href;
- this.label = label;
+ this.href = wrap(href);
+ this.label = wrap(label);
}
/**
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=525588&r1=525587&r2=525588
==============================================================================
--- 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 Wed Apr 4 12:29:52 2007
@@ -17,13 +17,13 @@
package wicket.model;
/**
- * Simple base class for IWrapModel objects see {@link IAssignmentAwareModel}
- * or {@link IInheritableModel} so that you don't have to have empty methods
+ * Simple base class for IModelWrapper 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 IWrapModel
+public abstract class AbstractWrapModel implements IModelWrapper
{
/**
* @see wicket.model.IModel#getObject()
Added: 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=auto&rev=525588
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ComponentPropertyModel.java (added)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ComponentPropertyModel.java Wed Apr 4 12:29:52 2007
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package wicket.model;
+
+import wicket.Component;
+import wicket.util.lang.PropertyResolver;
+
+/**
+ * A model that references a property by name on the current root model of the
+ * component it is bound to.
+ *
+ * @author Jonathan Locke
+ */
+public class ComponentPropertyModel extends AbstractReadOnlyModel
+ implements
+ IComponentAssignedModel
+{
+ private static final long serialVersionUID = 1L;
+
+ /** Name of property to read */
+ private final String propertyName;
+
+ /**
+ * Constructor
+ *
+ * @param propertyName
+ * The name of the property to reference
+ */
+ public ComponentPropertyModel(final String propertyName)
+ {
+ this.propertyName = propertyName;
+ }
+
+ /**
+ * @see wicket.model.AbstractReadOnlyModel#getObject()
+ */
+ public Object getObject()
+ {
+ throw new IllegalStateException("Wrapper should have been called");
+ }
+
+ /**
+ * @see wicket.model.IComponentAssignedModel#wrapOnAssignment(wicket.Component)
+ */
+ public IModelWrapper wrapOnAssignment(final Component component)
+ {
+ return new AssignmentWrapper(component, propertyName);
+ }
+
+ /**
+ * Wrapper used when assigning a ComponentPropertyModel to a component.
+ */
+ static private class AssignmentWrapper extends AbstractReadOnlyModel implements IModelWrapper
+ {
+ private static final long serialVersionUID = 1L;
+
+ private final Component component;
+
+ private final String propertyName;
+
+ AssignmentWrapper(final Component component, final String propertyName)
+ {
+ this.component = component;
+ this.propertyName = propertyName;
+ }
+
+ /**
+ * @see wicket.model.IModelWrapper#getNestedModel()
+ */
+ public IModel getNestedModel()
+ {
+ return component.getModel();
+ }
+
+ protected String propertyExpression()
+ {
+ return propertyName;
+ }
+
+ public Object getObject()
+ {
+ return PropertyResolver.getValue(propertyName, component.getRootModel().getObject());
+ }
+ }
+}
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=525588&r1=525587&r2=525588
==============================================================================
--- 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 Wed Apr 4 12:29:52 2007
@@ -29,7 +29,7 @@
*
* @author Jonathan Locke
*/
-public class CompoundPropertyModel implements IInheritableModel
+public class CompoundPropertyModel implements IComponentInheritedModel
{
private static final long serialVersionUID = 1L;
@@ -56,6 +56,11 @@
}
return target;
}
+
+ public Object getTarget()
+ {
+ return target;
+ }
/**
* @see wicket.model.IModel#setObject(java.lang.Object)
@@ -89,9 +94,9 @@
}
/**
- * @see wicket.model.IInheritableModel#wrapOnInheritance(wicket.Component)
+ * @see wicket.model.IComponentInheritedModel#wrapOnInheritance(wicket.Component)
*/
- public IWrapModel wrapOnInheritance(Component component)
+ public IModelWrapper wrapOnInheritance(Component component)
{
return new AttachedCompoundPropertyModel(component);
}
@@ -104,8 +109,8 @@
*/
private class AttachedCompoundPropertyModel extends AbstractPropertyModel
implements
- IWrapModel,
- IInheritableModel
+ IModelWrapper,
+ IComponentInheritedModel
{
private static final long serialVersionUID = 1L;
@@ -132,7 +137,7 @@
}
/**
- * @see wicket.model.IWrapModel#getNestedModel()
+ * @see wicket.model.IModelWrapper#getNestedModel()
*/
public IModel getNestedModel()
{
@@ -140,9 +145,9 @@
}
/**
- * @see wicket.model.IInheritableModel#wrapOnInheritance(wicket.Component)
+ * @see wicket.model.IComponentInheritedModel#wrapOnInheritance(wicket.Component)
*/
- public IWrapModel wrapOnInheritance(Component component)
+ public IModelWrapper wrapOnInheritance(Component component)
{
return new AttachedCompoundPropertyModel(component);
};
@@ -155,7 +160,6 @@
super.detach();
CompoundPropertyModel.this.detach();
}
-
}
/**
Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentAssignedModel.java (from r525261, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IAssignmentAwareModel.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=525588&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IAssignmentAwareModel.java&r1=525261&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentAssignedModel.java&r2=525588
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IAssignmentAwareModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentAssignedModel.java Wed Apr 4 12:29:52 2007
@@ -30,9 +30,9 @@
* <pre>
* void Component.setModel(IModel model)
* {
- * if (model instanceof IAssignementAware)
+ * if (model instanceof IComponentAssignedModel)
* {
- * this.model = ((IAssignmentAware)model).wrapOnAssignment(this);
+ * this.model = ((IComponentAssignedModel)model).wrapOnAssignment(this);
* }
* else
* {
@@ -46,11 +46,11 @@
* @author jcompagner
* @author Igor Vaynberg (ivaynberg)
*/
-public interface IAssignmentAwareModel extends IModel
+public interface IComponentAssignedModel extends IModel
{
/**
* @param component
* @return The WrapModel that wraps this model
*/
- IWrapModel wrapOnAssignment(Component component);
+ IModelWrapper wrapOnAssignment(Component component);
}
Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java (from r525261, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IInheritableModel.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=525588&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IInheritableModel.java&r1=525261&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java&r2=525588
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IInheritableModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java Wed Apr 4 12:29:52 2007
@@ -34,11 +34,11 @@
* @author jcompagner
* @author Igor Vaynberg (ivaynberg)
*/
-public interface IInheritableModel extends IModel
+public interface IComponentInheritedModel extends IModel
{
/**
* @param component
* @return The WrapModel that wraps this model
*/
- IWrapModel wrapOnInheritance(Component component);
+ IModelWrapper wrapOnInheritance(Component component);
}
Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IModelWrapper.java (from r525261, 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/IModelWrapper.java?view=diff&rev=525588&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IWrapModel.java&r1=525261&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IModelWrapper.java&r2=525588
==============================================================================
--- 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/IModelWrapper.java Wed Apr 4 12:29:52 2007
@@ -19,7 +19,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 IAssignmentAwareModel#wrapOnAssignment(wicket.Component)} and
+ * {@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
@@ -36,7 +36,7 @@
* @author jcompagner
* @author Igor Vaynberg (ivaynberg)
*/
-public interface IWrapModel extends IModel
+public interface IModelWrapper extends IModel
{
/**
* Gets the nested model.
@@ -44,5 +44,4 @@
* @return The nested model object.
*/
IModel getNestedModel();
-
}
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=525588&r1=525587&r2=525588
==============================================================================
--- 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 Wed Apr 4 12:29:52 2007
@@ -32,7 +32,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class ResourceModel extends AbstractReadOnlyModel implements IAssignmentAwareModel
+public class ResourceModel extends AbstractReadOnlyModel implements IComponentAssignedModel
{
private static final long serialVersionUID = 1L;
@@ -78,9 +78,9 @@
/**
- * @see wicket.model.IAssignmentAwareModel#wrapOnAssignment(wicket.Component)
+ * @see wicket.model.IComponentAssignedModel#wrapOnAssignment(wicket.Component)
*/
- public IWrapModel wrapOnAssignment(final Component component)
+ public IModelWrapper wrapOnAssignment(final Component component)
{
return new AssignmentWrapper(resourceKey, defaultValue, component);
}
@@ -88,7 +88,7 @@
/**
*
*/
- private class AssignmentWrapper extends ResourceModel implements IWrapModel
+ private class AssignmentWrapper extends ResourceModel implements IModelWrapper
{
private static final long serialVersionUID = 1L;
@@ -108,7 +108,7 @@
}
/**
- * @see wicket.model.IWrapModel#getNestedModel()
+ * @see wicket.model.IModelWrapper#getNestedModel()
*/
public IModel getNestedModel()
{