You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/03/12 22:35:55 UTC
wicket git commit: Cleanup - remove empty implementations of
IModel#detach(). It is a default method now
Repository: wicket
Updated Branches:
refs/heads/master 5a7a089d5 -> b87d37bfe
Cleanup - remove empty implementations of IModel#detach(). It is a default method now
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b87d37bf
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b87d37bf
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b87d37bf
Branch: refs/heads/master
Commit: b87d37bfea4be500caf29bccaa7cd1c0030d9e5b
Parents: 5a7a089
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Mar 12 22:34:40 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Mar 12 22:34:40 2016 +0100
----------------------------------------------------------------------
.../wicket/markup/html/list/ListItemModel.java | 13 --------
.../wicket/model/AbstractReadOnlyModel.java | 19 +----------
.../wicket/model/ComponentDetachableModel.java | 34 --------------------
.../org/apache/wicket/model/ComponentModel.java | 8 -----
.../apache/wicket/model/lambda/LambdaModel.java | 5 ---
.../wicket/util/tester/WicketTesterTest.java | 5 ---
.../examples/ajax/builtin/AutoCompletePage.java | 5 ---
.../tree/content/CheckedFolderContent.java | 7 +---
.../ajax/markup/html/AjaxEditableLabel.java | 1 -
.../data/table/filter/FilterStateModel.java | 15 ---------
.../extensions/model/AbstractCheckBoxModel.java | 8 -----
.../html/repeater/tree/table/NodeModelTest.java | 7 +---
12 files changed, 3 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListItemModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListItemModel.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListItemModel.java
index 0b8192b..173c2e5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListItemModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListItemModel.java
@@ -24,7 +24,6 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
* @see ListView
* @param <T>
* Model object type
- *
*/
public class ListItemModel<T> extends AbstractReadOnlyModel<T>
{
@@ -50,21 +49,9 @@ public class ListItemModel<T> extends AbstractReadOnlyModel<T>
this.index = index;
}
- /**
- * @see org.apache.wicket.model.IModel#getObject()
- */
@Override
public T getObject()
{
return listView.getModelObject().get(index);
}
-
- /**
- * @see org.apache.wicket.model.IDetachable#detach()
- */
- @Override
- public void detach()
- {
- // Do nothing. ListView will detach its own model object.
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-core/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java b/wicket-core/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java
index c7d9a5d..6a3dd1b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java
@@ -31,12 +31,6 @@ public abstract class AbstractReadOnlyModel<T> implements IModel<T>
private static final long serialVersionUID = 1L;
/**
- * @see IModel#getObject()
- */
- @Override
- public abstract T getObject();
-
- /**
* This default implementation of setObject unconditionally throws an
* UnsupportedOperationException. Since the method is final, any subclass is effectively a
* read-only model.
@@ -52,9 +46,6 @@ public abstract class AbstractReadOnlyModel<T> implements IModel<T>
" does not support setObject(Object)");
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString()
{
@@ -62,12 +53,4 @@ public abstract class AbstractReadOnlyModel<T> implements IModel<T>
sb.append(getClass().getName()).append("]");
return sb.toString();
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void detach()
- {
- }
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-core/src/main/java/org/apache/wicket/model/ComponentDetachableModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/ComponentDetachableModel.java b/wicket-core/src/main/java/org/apache/wicket/model/ComponentDetachableModel.java
index 1c03453..a985cc3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/ComponentDetachableModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/ComponentDetachableModel.java
@@ -76,16 +76,6 @@ public class ComponentDetachableModel<T> implements IModel<T>, IComponentAssigne
attached = true;
}
-
- /**
- * Detaches from the current request. Implement this method with custom behavior, such as
- * setting the model object to null.
- */
- @Override
- public void detach()
- {
- }
-
/**
* Attaches to the current request. Implement this method with custom behavior, such as loading
* the model object.
@@ -121,9 +111,6 @@ public class ComponentDetachableModel<T> implements IModel<T>, IComponentAssigne
{
}
- /**
- * @see org.apache.wicket.model.IComponentAssignedModel#wrapOnAssignment(org.apache.wicket.Component)
- */
@Override
public IWrapModel<T> wrapOnAssignment(Component comp)
{
@@ -144,9 +131,6 @@ public class ComponentDetachableModel<T> implements IModel<T>, IComponentAssigne
component = comp;
}
- /**
- * @see org.apache.wicket.model.IWrapModel#getWrappedModel()
- */
@Override
public IModel<T> getWrappedModel()
{
@@ -165,9 +149,6 @@ public class ComponentDetachableModel<T> implements IModel<T>, IComponentAssigne
}
}
- /**
- * @see org.apache.wicket.model.IModel#getObject()
- */
@Override
public T getObject()
{
@@ -175,9 +156,6 @@ public class ComponentDetachableModel<T> implements IModel<T>, IComponentAssigne
return ComponentDetachableModel.this.getObject(component);
}
- /**
- * @see org.apache.wicket.model.IModel#setObject(java.lang.Object)
- */
@Override
public void setObject(T object)
{
@@ -185,9 +163,6 @@ public class ComponentDetachableModel<T> implements IModel<T>, IComponentAssigne
ComponentDetachableModel.this.setObject(component, object);
}
- /**
- * @see org.apache.wicket.model.IDetachable#detach()
- */
@Override
public void detach()
{
@@ -196,15 +171,6 @@ public class ComponentDetachableModel<T> implements IModel<T>, IComponentAssigne
attached = false;
ComponentDetachableModel.this.detach();
}
-
-// IModel nestedModel = getChainedModel();
-// if (nestedModel != null)
-// {
-// // do detach the nested model because this one could be attached
-// // if the model is used not through this compound model
-// nestedModel.detach();
-// }
}
-
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-core/src/main/java/org/apache/wicket/model/ComponentModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/ComponentModel.java b/wicket-core/src/main/java/org/apache/wicket/model/ComponentModel.java
index 44110d4..2bcab32 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/ComponentModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/ComponentModel.java
@@ -76,14 +76,6 @@ public class ComponentModel<T> implements IModel<T>, IComponentAssignedModel<T>
}
/**
- * @see org.apache.wicket.model.IDetachable#detach()
- */
- @Override
- public void detach()
- {
- }
-
- /**
* @see org.apache.wicket.model.IComponentAssignedModel#wrapOnAssignment(org.apache.wicket.Component)
*/
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-core/src/main/java/org/apache/wicket/model/lambda/LambdaModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/lambda/LambdaModel.java b/wicket-core/src/main/java/org/apache/wicket/model/lambda/LambdaModel.java
index 2620680..1c0d7e9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/lambda/LambdaModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/lambda/LambdaModel.java
@@ -68,11 +68,6 @@ public class LambdaModel<T> implements IModel<T>
}
@Override
- public void detach()
- {
- }
-
- @Override
public int hashCode()
{
return org.apache.wicket.util.lang.Objects.hashCode(getter, setter);
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
index d5f5bb0..1a619fd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
@@ -526,11 +526,6 @@ public class WicketTesterTest extends WicketTestCase
{
value = object;
}
-
- @Override
- public void detach()
- {
- }
};
labelModel.setObject("Label 1");
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
index beab5e5..6b0d2a2 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
@@ -68,11 +68,6 @@ public class AutoCompletePage extends BasePage
values.append("\n");
values.append(value);
}
-
- @Override
- public void detach()
- {
- }
};
final AutoCompleteTextField<String> field = new AutoCompleteTextField<String>("ac", model)
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java
index 5360964..17efb3d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java
@@ -87,13 +87,8 @@ public class CheckedFolderContent extends Content
{
check(model.getObject(), object);
}
-
- @Override
- public void detach()
- {
- }
};
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
index 52e3666..2c4752e 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
@@ -571,7 +571,6 @@ public class AjaxEditableLabel<T> extends Panel implements IGenericComponent<T,
public void detach()
{
getParentModel().detach();
-
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java
index 3a7a5b8..a370e8c 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterStateModel.java
@@ -52,30 +52,15 @@ class FilterStateModel<T> implements IModel<T>
this.locator = locator;
}
- /**
- * @see org.apache.wicket.model.IModel#getObject()
- */
@Override
public T getObject()
{
return locator.getFilterState();
}
- /**
- * @see org.apache.wicket.model.IModel#setObject(java.lang.Object)
- */
@Override
public void setObject(final T object)
{
locator.setFilterState(object);
}
-
- /**
- * @see org.apache.wicket.model.IDetachable#detach()
- */
- @Override
- public void detach()
- {
- }
-
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java
index 980bd25..83957e0 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/model/AbstractCheckBoxModel.java
@@ -29,14 +29,6 @@ public abstract class AbstractCheckBoxModel implements IModel<Boolean>
private static final long serialVersionUID = 1L;
/**
- * Detach model.
- */
- @Override
- public void detach()
- {
- }
-
- /**
* @return true to indicate the checkbox should be selected, false otherwise
*/
public abstract boolean isSelected();
http://git-wip-us.apache.org/repos/asf/wicket/blob/b87d37bf/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
index 15bb8b7..221c8ba 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeModelTest.java
@@ -71,11 +71,6 @@ public class NodeModelTest extends Assert
}
@Override
- public void detach()
- {
- }
-
- @Override
public boolean equals(Object obj)
{
if (obj instanceof StringModel)
@@ -86,4 +81,4 @@ public class NodeModelTest extends Assert
return false;
}
}
-}
\ No newline at end of file
+}