Author: ehillenius
Date: Thu Apr 5 12:25:01 2007
New Revision: 525937
URL: http://svn.apache.org/viewvc?view=rev&rev=525937
Log:
fixed a bunch of warnings
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java
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=525937&r1=525936&r2=525937
==============================================================================
---
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 12:25:01 2007
@@ -22,11 +22,11 @@
/**
* A simple compound model which uses the component's name as the property
* expression to retrieve properties on the nested model object.
- *
+ *
* @see wicket.model.IModel
* @see wicket.model.Model
* @see wicket.model.AbstractDetachableModel
- *
+ *
* @author Jonathan Locke
*/
public class CompoundPropertyModel implements IComponentInheritedModel
@@ -37,7 +37,7 @@
/**
* Constructor
- *
+ *
* @param model
* The model object, which may or may not implement IModel
*/
@@ -45,6 +45,7 @@
{
target = model;
}
+
/**
* @see wicket.model.IModel#getObject()
*/
@@ -56,8 +57,8 @@
}
return target;
}
-
- public Object getTarget()
+
+ public Object getTarget()
{
return target;
}
@@ -84,7 +85,7 @@
/**
* Returns the property expression that should be used against the
target
* object
- *
+ *
* @param component
* @return property expression that should be used against the target
object
*/
@@ -104,7 +105,7 @@
/**
* Component aware variation of the [EMAIL PROTECTED]
CompoundPropertyModel} that
* components that inherit the model get
- *
+ *
* @author ivaynberg
*/
private class AttachedCompoundPropertyModel extends
AbstractPropertyModel
@@ -118,7 +119,7 @@
/**
* Constructor
- *
+ *
* @param owner
* component that this model has been attached to
*/
@@ -167,16 +168,32 @@
*/
public String toString()
{
- AppendingStringBuffer sb = new
AppendingStringBuffer().append("Model:classname=[" + getClass().getName() +
"]");
+ AppendingStringBuffer sb = new
AppendingStringBuffer().append("Model:classname=["
+ + getClass().getName() + "]");
sb.append(":nestedModel=[").append(target).append("]");
return sb.toString();
}
- // TODO These methods are for helping people upgrade. Remove after
deprecation release.
- /** @deprecated replace by [EMAIL PROTECTED] IModel#getObject()}. */
- public final Object getObject(Component component) { throw new
UnsupportedOperationException(); }
+ // TODO These methods are for helping people upgrade. Remove after
+ // deprecation release.
+ /**
+ * @param component
+ * @return
+ * @deprecated replace by [EMAIL PROTECTED] IModel#getObject()}.
+ */
+ public final Object getObject(Component component)
+ {
+ throw new UnsupportedOperationException();
+ }
- /** @deprecated replace by [EMAIL PROTECTED] IModel#setObject(Object)}.
*/
- public final void setObject(Component component, Object object) { throw
new UnsupportedOperationException(); }
+ /**
+ * @param component
+ * @param object
+ * @deprecated replace by [EMAIL PROTECTED] IModel#setObject(Object)}.
+ */
+ public final void setObject(Component component, Object object)
+ {
+ throw new UnsupportedOperationException();
+ }
}
