Author: rahul
Date: Mon Dec 4 19:11:09 2006
New Revision: 482470
URL: http://svn.apache.org/viewvc?view=rev&rev=482470
Log:
Revert part of r482449 such that the base classes recommend (via javadoc), but
do not implement, the Serializable interface (concrete classes in the two
dialog implementations do). This leaves the option of serializability to the
concrete impls. Thanks to Craig McClanahan.
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogManager.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContext.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextListener.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextManager.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextManagerListener.java
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java?view=diff&rev=482470&r1=482469&r2=482470
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
Mon Dec 4 19:11:09 2006
@@ -18,20 +18,21 @@
package org.apache.shale.dialog.basic;
import java.io.IOException;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.faces.FacesException;
+import javax.faces.FacesException;
import javax.faces.application.ViewHandler;
import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shale.dialog.Constants;
-
import org.apache.shale.dialog.DialogContext;
import org.apache.shale.dialog.DialogContextListener;
import org.apache.shale.dialog.DialogContextManager;
@@ -54,7 +55,8 @@
*
* @since 1.0.4
*/
-final class BasicDialogContext extends AbstractDialogContext {
+final class BasicDialogContext extends AbstractDialogContext
+ implements Serializable {
// ------------------------------------------------------------
Constructors
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java?view=diff&rev=482470&r1=482469&r2=482470
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java
Mon Dec 4 19:11:09 2006
@@ -17,6 +17,7 @@
package org.apache.shale.dialog.basic;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@@ -36,7 +37,8 @@
*
* @since 1.0.4
*/
-public final class BasicDialogManager extends AbstractDialogContextManager {
+public final class BasicDialogManager extends AbstractDialogContextManager
+ implements Serializable {
// ------------------------------------------------- DialogContext
Variables
Modified:
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java?view=diff&rev=482470&r1=482469&r2=482470
==============================================================================
---
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
(original)
+++
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
Mon Dec 4 19:11:09 2006
@@ -18,6 +18,7 @@
package org.apache.shale.dialog.scxml;
import java.io.IOException;
+import java.io.Serializable;
import java.util.Iterator;
import javax.faces.FacesException;
@@ -53,7 +54,8 @@
*
* @since 1.0.4
*/
-final class SCXMLDialogContext extends AbstractDialogContext {
+final class SCXMLDialogContext extends AbstractDialogContext
+ implements Serializable {
// ------------------------------------------------------------
Constructors
Modified:
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogManager.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogManager.java?view=diff&rev=482470&r1=482469&r2=482470
==============================================================================
---
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogManager.java
(original)
+++
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogManager.java
Mon Dec 4 19:11:09 2006
@@ -17,6 +17,7 @@
package org.apache.shale.dialog.scxml;
+import java.io.Serializable;
import java.net.URL;
import java.util.Enumeration;
import java.util.HashMap;
@@ -41,7 +42,8 @@
*
* @since 1.0.4
*/
-public final class SCXMLDialogManager extends AbstractDialogContextManager {
+public final class SCXMLDialogManager extends AbstractDialogContextManager
+ implements Serializable {
// ------------------------------------------------------
SCXMLDialogManager Variables
Modified:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContext.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContext.java?view=diff&rev=482470&r1=482469&r2=482470
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContext.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContext.java
Mon Dec 4 19:11:09 2006
@@ -17,7 +17,6 @@
package org.apache.shale.dialog.base;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -28,11 +27,12 @@
/**
* <p>Convenience abstract [EMAIL PROTECTED] DialogContext} implementation.
- * Provides listener registration and convenience event firing methods.</p>
+ * Provides listener registration and convenience event firing methods.
+ * Subclasses are expected to be serializable.</p>
*
* @since 1.0.4
*/
-public abstract class AbstractDialogContext implements DialogContext,
Serializable {
+public abstract class AbstractDialogContext implements DialogContext {
// --------------------------------------------------------------
Properties
Modified:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextListener.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextListener.java?view=diff&rev=482470&r1=482469&r2=482470
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextListener.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextListener.java
Mon Dec 4 19:11:09 2006
@@ -17,8 +17,6 @@
package org.apache.shale.dialog.base;
-import java.io.Serializable;
-
import org.apache.shale.dialog.DialogContext;
import org.apache.shale.dialog.DialogContextListener;
@@ -28,7 +26,7 @@
*
* @since 1.0.4
*/
-public abstract class AbstractDialogContextListener implements
DialogContextListener, Serializable {
+public abstract class AbstractDialogContextListener implements
DialogContextListener {
//------------------------------------------------------------- Properties
Modified:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextManager.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextManager.java?view=diff&rev=482470&r1=482469&r2=482470
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextManager.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextManager.java
Mon Dec 4 19:11:09 2006
@@ -17,7 +17,6 @@
package org.apache.shale.dialog.base;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -33,12 +32,13 @@
/**
* <p>Abstract base class for [EMAIL PROTECTED] DialogContextManager}
implementations.
- * Provides listener registration and event firing convenience methods.</p>
+ * Provides listener registration and event firing convenience methods.
+ * Subclasses are expected to be serializable.</p>
*
* @since 1.0.4
*/
public abstract class AbstractDialogContextManager
- implements DialogContextManager, HttpSessionBindingListener, Serializable {
+ implements DialogContextManager, HttpSessionBindingListener {
// ------------------------------------------------------ Instance
Variables
Modified:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextManagerListener.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextManagerListener.java?view=diff&rev=482470&r1=482469&r2=482470
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextManagerListener.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogContextManagerListener.java
Mon Dec 4 19:11:09 2006
@@ -17,20 +17,19 @@
package org.apache.shale.dialog.base;
-import java.io.Serializable;
-
import org.apache.shale.dialog.DialogContext;
import org.apache.shale.dialog.DialogContextManager;
import org.apache.shale.dialog.DialogContextManagerListener;
/**
* <p>Convenience abstract base class for [EMAIL PROTECTED]
DialogContextManagerListener}
- * instances. The default event handling methods do nothing.</p>
+ * instances. The default event handling methods do nothing.
+ * Subclasses are expected to be serializable.</p>
*
* @since 1.0.4
*/
public abstract class AbstractDialogContextManagerListener
- implements DialogContextManagerListener, Serializable {
+ implements DialogContextManagerListener {
// ------------------------------------------------------ Instance
Variables
