You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/09/15 21:01:35 UTC
svn commit: r815450 - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/markup/html/tree/
main/java/org/apache/wicket/resource/loader/
main/java/org/apache/wicket/util/lang/ test/java/org/apache/wicket/ajax/
test/java/org/apache/wicket/ajax/mark...
Author: jdonnerstag
Date: Tue Sep 15 19:01:34 2009
New Revision: 815450
URL: http://svn.apache.org/viewvc?rev=815450&view=rev
Log:
added serialVersionUID where missing
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/WicketTreeModel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/MyPanel.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/WicketTreeModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/WicketTreeModel.java?rev=815450&r1=815449&r2=815450&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/WicketTreeModel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/WicketTreeModel.java Tue Sep 15 19:01:34 2009
@@ -25,6 +25,8 @@
*/
public class WicketTreeModel extends GenericBaseModel<TreeModel>
{
+ private static final long serialVersionUID = 1L;
+
@Override
protected TreeModel createSerializableVersionOf(TreeModel object)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java?rev=815450&r1=815449&r2=815450&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java Tue Sep 15 19:01:34 2009
@@ -231,9 +231,6 @@
// walk it downwards starting with Page down to the Component
List<Class<?>> searchStack = getComponentStack(component);
- // TODO Should be changed to false in 1.5
- final boolean old = true;
-
// Walk the component hierarchy down from page to the component
for (int i = searchStack.size() - 1; (i >= 0) && (string == null); i--)
{
@@ -250,18 +247,11 @@
prefix = Strings.afterFirst(prefix, '.');
}
}
-
- // If not found, than check if a property with the 'key' provided by
- // the user can be found.
- if ((string == null) && old)
- {
- string = loadStringResource(clazz, key, locale, style);
- }
}
// If not found, than check if a property with the 'key' provided by
// the user can be found.
- if ((string == null) && !old)
+ if (string == null)
{
// Walk the component hierarchy down from page to the component
for (int i = searchStack.size() - 1; (i >= 0) && (string == null); i--)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=815450&r1=815449&r2=815450&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java Tue Sep 15 19:01:34 2009
@@ -1068,17 +1068,11 @@
return new Integer((int)value);
case FLOAT :
- if (value == value)
- {
- return new Float(value);
- }
- // else fall through:
+ return new Float(value);
+
case DOUBLE :
- if (value == value)
- {
- return new Double(value);
- }
- // else fall through:
+ return new Double(value);
+
case LONG :
return new Long(value);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java?rev=815450&r1=815449&r2=815450&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/HomePage2.java Tue Sep 15 19:01:34 2009
@@ -46,6 +46,8 @@
add(new Label("msg", new PropertyModel<String>(this, "_message")));
add(new AjaxLink("link")
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onClick(AjaxRequestTarget tgt)
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java?rev=815450&r1=815449&r2=815450&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/form/HomePage.java Tue Sep 15 19:01:34 2009
@@ -60,6 +60,8 @@
super(id);
add((new Button("cancel", Model.of("I am not empty label"))
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onSubmit()
{
@@ -69,6 +71,8 @@
add((submitButton = new AjaxButton("submit")
{
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java?rev=815450&r1=815449&r2=815450&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java Tue Sep 15 19:01:34 2009
@@ -39,6 +39,8 @@
super(name);
final WebMarkupContainer containerWrapper = new WebMarkupContainer("wrapper")
{
+ private static final long serialVersionUID = 1L;
+
@Override
public boolean isVisible()
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage.java?rev=815450&r1=815449&r2=815450&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage.java Tue Sep 15 19:01:34 2009
@@ -134,6 +134,8 @@
TextField expiryDate = new TextField("text", new PropertyModel(this, "myDate"), Date.class)
{
+ private static final long serialVersionUID = 1L;
+
@Override
public boolean isRequired()
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/MyPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/MyPanel.java?rev=815450&r1=815449&r2=815450&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/MyPanel.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/MyPanel.java Tue Sep 15 19:01:34 2009
@@ -52,6 +52,8 @@
form.add(new AbstractFormValidator()
{
+ private static final long serialVersionUID = 1L;
+
public FormComponent<?>[] getDependentFormComponents()
{
return null;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage.java?rev=815450&r1=815449&r2=815450&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage.java Tue Sep 15 19:01:34 2009
@@ -39,6 +39,8 @@
{
form = new Form("form")
{
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit()
{
@@ -51,6 +53,8 @@
add(new SubmitLink("link", form)
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onSubmit()
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2.java?rev=815450&r1=815449&r2=815450&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2.java Tue Sep 15 19:01:34 2009
@@ -39,6 +39,8 @@
{
form = new Form("form")
{
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit()
{
@@ -51,6 +53,8 @@
form.add(new SubmitLink("link", form)
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void onSubmit()
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java?rev=815450&r1=815449&r2=815450&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/HomePage.java Tue Sep 15 19:01:34 2009
@@ -55,6 +55,8 @@
form.add(new Button("hiddenButton").setVisible(false));
form.add(new AjaxButton("ajaxButton")
{
+ private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form)
{