You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/03/01 07:21:36 UTC
svn commit: r513170 - in /incubator/wicket:
branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/
branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/breadcrumb/
branches/wicket-1.x/wicket...
Author: ehillenius
Date: Wed Feb 28 22:21:35 2007
New Revision: 513170
URL: http://svn.apache.org/viewvc?view=rev&rev=513170
Log:
WICKET-337
Modified:
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/util/SortParam.java
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/table/ColumnLocation.java
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/datepicker/DatePickerSettings.java
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/util/SortParam.java
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/TreeState.java
incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/proxy/LazyInitProxyFactory.java
Modified: incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java Wed Feb 28 22:21:35 2007
@@ -16,8 +16,7 @@
*/
package wicket.extensions.ajax.markup.html.form.upload;
-import java.io.Serializable;
-
+import wicket.IClusterable;
import wicket.util.lang.Bytes;
import wicket.util.time.Duration;
@@ -28,7 +27,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class UploadInfo implements Serializable
+public class UploadInfo implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java Wed Feb 28 22:21:35 2007
@@ -16,18 +16,19 @@
*/
package wicket.extensions.breadcrumb;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import wicket.IClusterable;
+
/**
* Utility class for working with
* {@link IBreadCrumbModelListener bread crumb model listeners}.
*
* @author Eelco Hillenius
*/
-public final class BreadCrumbModelListenerSupport implements Serializable
+public final class BreadCrumbModelListenerSupport implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/captcha/CaptchaImageResource.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/captcha/CaptchaImageResource.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/captcha/CaptchaImageResource.java Wed Feb 28 22:21:35 2007
@@ -26,13 +26,13 @@
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.awt.image.WritableRaster;
-import java.io.Serializable;
import java.lang.ref.SoftReference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
+import wicket.IClusterable;
import wicket.markup.html.image.resource.DynamicImageResource;
import wicket.util.time.Time;
@@ -52,7 +52,7 @@
* be instance variables here. If anyone knows a better way to do this,
* please let me know.
*/
- private static final class CharAttributes implements Serializable
+ private static final class CharAttributes implements IClusterable
{
private static final long serialVersionUID = 1L;
private char c;
Modified: incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/util/SortParam.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/util/SortParam.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/util/SortParam.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/util/SortParam.java Wed Feb 28 22:21:35 2007
@@ -16,14 +16,14 @@
*/
package wicket.extensions.markup.html.repeater.util;
-import java.io.Serializable;
+import wicket.IClusterable;
/**
* Represents sorting information of a property
*
* @author Igor Vaynberg ( ivaynberg )
*/
-public class SortParam implements Serializable
+public class SortParam implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/table/ColumnLocation.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/table/ColumnLocation.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/table/ColumnLocation.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/table/ColumnLocation.java Wed Feb 28 22:21:35 2007
@@ -16,8 +16,7 @@
*/
package wicket.extensions.markup.html.tree.table;
-import java.io.Serializable;
-
+import wicket.IClusterable;
import wicket.util.lang.EnumeratedType;
/**
@@ -46,7 +45,7 @@
*
* @author Matej Knopp
*/
-public class ColumnLocation implements Serializable
+public class ColumnLocation implements IClusterable
{
/**
* Alignment of the column.
Modified: incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java (original)
+++ incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java Wed Feb 28 22:21:35 2007
@@ -16,8 +16,7 @@
*/
package wicket.extensions.ajax.markup.html.form.upload;
-import java.io.Serializable;
-
+import wicket.IClusterable;
import wicket.util.lang.Bytes;
import wicket.util.time.Duration;
@@ -28,7 +27,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class UploadInfo implements Serializable
+public class UploadInfo implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original)
+++ incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Wed Feb 28 22:21:35 2007
@@ -16,6 +16,12 @@
*/
package wicket.extensions.ajax.markup.html.modal;
+import static wicket.extensions.ajax.markup.html.modal.ModalWindow.CSS_CLASS_BLUE;
+import static wicket.extensions.ajax.markup.html.modal.ModalWindow.CSS_CLASS_GRAY;
+import static wicket.extensions.ajax.markup.html.modal.ModalWindow.close;
+import static wicket.extensions.ajax.markup.html.modal.ModalWindow.MaskType.SEMI_TRANSPARENT;
+import static wicket.extensions.ajax.markup.html.modal.ModalWindow.MaskType.TRANSPARENT;
+
import java.io.Serializable;
import wicket.Application;
Modified: incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java (original)
+++ incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java Wed Feb 28 22:21:35 2007
@@ -16,17 +16,18 @@
*/
package wicket.extensions.breadcrumb;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import wicket.IClusterable;
+
/**
* Utility class for working with
* {@link IBreadCrumbModelListener bread crumb model listeners}.
*
* @author Eelco Hillenius
*/
-public final class BreadCrumbModelListenerSupport implements Serializable
+public final class BreadCrumbModelListenerSupport implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/captcha/CaptchaImageResource.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/captcha/CaptchaImageResource.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/captcha/CaptchaImageResource.java (original)
+++ incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/captcha/CaptchaImageResource.java Wed Feb 28 22:21:35 2007
@@ -26,13 +26,13 @@
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.awt.image.WritableRaster;
-import java.io.Serializable;
import java.lang.ref.SoftReference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
+import wicket.IClusterable;
import wicket.markup.html.image.resource.DynamicImageResource;
import wicket.util.time.Time;
@@ -52,7 +52,7 @@
* be instance variables here. If anyone knows a better way to do this,
* please let me know.
*/
- private static final class CharAttributes implements Serializable
+ private static final class CharAttributes implements IClusterable
{
private static final long serialVersionUID = 1L;
private char c;
Modified: incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/datepicker/DatePickerSettings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/datepicker/DatePickerSettings.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/datepicker/DatePickerSettings.java (original)
+++ incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/datepicker/DatePickerSettings.java Wed Feb 28 22:21:35 2007
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.io.Serializable;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -27,6 +26,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import wicket.IClusterable;
import wicket.ResourceReference;
/**
@@ -35,7 +35,7 @@
*
* @author Eelco Hillenius
*/
-public class DatePickerSettings implements Serializable
+public class DatePickerSettings implements IClusterable
{
/** all date formats. */
private static Properties dateformats = new Properties();
Modified: incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/util/SortParam.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/util/SortParam.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/util/SortParam.java (original)
+++ incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/repeater/util/SortParam.java Wed Feb 28 22:21:35 2007
@@ -16,14 +16,14 @@
*/
package wicket.extensions.markup.html.repeater.util;
-import java.io.Serializable;
+import wicket.IClusterable;
/**
* Represents sorting information of a property
*
* @author Igor Vaynberg ( ivaynberg )
*/
-public class SortParam implements Serializable
+public class SortParam implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/TreeState.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/TreeState.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/TreeState.java (original)
+++ incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/markup/html/tree/TreeState.java Wed Feb 28 22:21:35 2007
@@ -16,7 +16,6 @@
*/
package wicket.extensions.markup.html.tree;
-import java.io.Serializable;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.NoSuchElementException;
@@ -30,6 +29,7 @@
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
+import wicket.IClusterable;
import wicket.util.collections.ArrayListStack;
/**
@@ -45,12 +45,12 @@
* @author Eelco Hillenius
* @author Scott Violet (Sun, FixedHeightLayoutCache)
*/
-public final class TreeState implements Serializable, TreeModelListener, RowMapper
+public final class TreeState implements IClusterable, TreeModelListener, RowMapper
{
/**
* Used as a placeholder when getting the path in FHTreeStateNodes.
*/
- private final class SearchInfo implements Serializable
+ private final class SearchInfo implements IClusterable
{
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/proxy/LazyInitProxyFactory.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/proxy/LazyInitProxyFactory.java?view=diff&rev=513170&r1=513169&r2=513170
==============================================================================
--- incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/proxy/LazyInitProxyFactory.java (original)
+++ incubator/wicket/trunk/wicket-extensions/src/main/java/wicket/extensions/proxy/LazyInitProxyFactory.java Wed Feb 28 22:21:35 2007
@@ -27,6 +27,7 @@
import net.sf.cglib.proxy.Enhancer;
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
+import wicket.IClusterable;
import wicket.model.IModel;
/**
@@ -169,7 +170,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
- static class ProxyReplacement implements Serializable
+ static class ProxyReplacement implements IClusterable
{
/**
*