You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shale.apache.org by cr...@apache.org on 2006/09/01 09:06:40 UTC
svn commit: r439215 - in /shale/sandbox:
shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/
shale-dialog2-legacy/src/main/resources/META-INF/
shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/
shale-dialog2-scxml/src/mai...
Author: craigmcc
Date: Fri Sep 1 00:06:39 2006
New Revision: 439215
URL: http://svn.apache.org/viewvc?rev=439215&view=rev
Log:
Implement agreed-upon name changes:
* Context --> DialogContext
* Contexts --> DialogContextManager
* ScxmlFoo --> SCXMLFoo
Added:
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyDialogContext.java
- copied, changed from r439188, shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyContext.java
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyDialogManager.java
- copied, changed from r439188, shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyContexts.java
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogContext.java
- copied, changed from r439203, shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ScxmlContext.java
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogManager.java
- copied, changed from r439203, shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ScxmlContexts.java
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/DialogContext.java
- copied, changed from r439188, shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Context.java
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/DialogContextManager.java
- copied, changed from r439188, shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Contexts.java
Removed:
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyContext.java
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyContexts.java
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ScxmlContext.java
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ScxmlContexts.java
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Context.java
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Contexts.java
Modified:
shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/ (props changed)
shale/sandbox/shale-dialog2-legacy/src/main/resources/META-INF/faces-config.xml
shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ (props changed)
shale/sandbox/shale-dialog2-scxml/src/main/resources/META-INF/faces-config.xml
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Constants.java
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/ (props changed)
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java
shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java
Propchange: shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep 1 00:06:39 2006
@@ -0,0 +1,2 @@
+.LCKLegacyContext.java~
+.LCKLegacyContexts.java~
Copied: shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyDialogContext.java (from r439188, shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyContext.java)
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyDialogContext.java?p2=shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyDialogContext.java&p1=shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyContext.java&r1=439188&r2=439215&rev=439215&view=diff
==============================================================================
--- shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyContext.java (original)
+++ shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyDialogContext.java Fri Sep 1 00:06:39 2006
@@ -24,8 +24,8 @@
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
-import org.apache.shale.dialog2.Context;
-import org.apache.shale.dialog2.Contexts;
+import org.apache.shale.dialog2.DialogContext;
+import org.apache.shale.dialog2.DialogContextManager;
import org.apache.shale.dialog2.legacy.config.ConfigurationParser;
import org.apache.shale.dialog2.legacy.model.ActionState;
import org.apache.shale.dialog2.legacy.model.Dialog;
@@ -36,16 +36,17 @@
import org.apache.shale.dialog2.legacy.model.ViewState;
/**
- * <p>Implementation of {@link Contexts} for integrating
+ * <p>Implementation of {@link DialogContext} for integrating
* legacy dialog support into the Shale Dialog Manager.</p>
- *
+ *
* <p><strong>IMPLEMENTATION NOTE</strong> - Takes on the responsibilities
* of the <code>org.apache.shale.dialog.Status</code> implementation in the
* original approach.</p>
*
+ *
* @since 1.0.4
*/
-final class LegacyContext implements Context, Serializable {
+final class LegacyDialogContext implements DialogContext, Serializable {
// ------------------------------------------------------------ Constructors
@@ -54,13 +55,14 @@
/**
* <p>Construct a new instance.</p>
*
- * @param instances {@link Contexts} instance that owns us
+ *
+ * @param manager {@link DialogContextManager} instance that owns us
* @param dialog Configured dialog definition we will be following
* @param id Dialog identifier assigned to this instance
*/
- LegacyContext(Contexts instances, Dialog dialog, String id) {
+ LegacyDialogContext(DialogContextManager manager, Dialog dialog, String id) {
- this.instances = instances;
+ this.manager = manager;
this.dialog = dialog;
this.id = id;
@@ -69,11 +71,11 @@
}
- // ------------------------------------------------------ Context Variables
+ // ------------------------------------------------------ DialogContext Variables
/**
- * <p>Flag indicating that this {@link Context} is currently active.</p>
+ * <p>Flag indicating that this {@link DialogContext} is currently active.</p>
*/
private boolean active = true;
@@ -103,9 +105,9 @@
/**
- * <p>{@link Contexts} instance that owns us.</p>
+ * <p>{@link DialogContextManager} instance that owns us.</p>
*/
- private Contexts instances = null;
+ private DialogContextManager manager = null;
/**
@@ -138,7 +140,7 @@
private static final Class[] ACTION_STATE_SIGNATURE = new Class[0];
- // ----------------------------------------------------- Context Properties
+ // ----------------------------------------------------- DialogContext Properties
/** {@inheritDoc} */
@@ -201,7 +203,7 @@
}
- // -------------------------------------------------------- Context Methods
+ // -------------------------------------------------------- DialogContext Methods
/** {@inheritDoc} */
@@ -254,9 +256,9 @@
/**
- * <p>Mark this {@link Context} as being deactivated. This should only
+ * <p>Mark this {@link DialogContext} as being deactivated. This should only
* be called by the <code>remove()</code> method on our associated
- * {@link Contexts}.</p>
+ * {@link DialogContextManager}.</p>
*/
void deactivate() {
Copied: shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyDialogManager.java (from r439188, shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyContexts.java)
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyDialogManager.java?p2=shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyDialogManager.java&p1=shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyContexts.java&r1=439188&r2=439215&rev=439215&view=diff
==============================================================================
--- shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyContexts.java (original)
+++ shale/sandbox/shale-dialog2-legacy/src/main/java/org/apache/shale/dialog2/legacy/LegacyDialogManager.java Fri Sep 1 00:06:39 2006
@@ -22,21 +22,22 @@
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
import org.apache.shale.dialog2.Constants;
-import org.apache.shale.dialog2.Context;
-import org.apache.shale.dialog2.Contexts;
+import org.apache.shale.dialog2.DialogContext;
+import org.apache.shale.dialog2.DialogContextManager;
import org.apache.shale.dialog2.legacy.config.ConfigurationParser;
import org.apache.shale.dialog2.legacy.model.Dialog;
/**
- * <p>Implementation of {@link Contexts} for integrating
+ * <p>Implementation of {@link DialogContextManager} for integrating
* legacy dialog support into the Shale Dialog Manager.</p>
*
+ *
* @since 1.0.4
*/
-public final class LegacyContexts implements Contexts, Serializable {
+public final class LegacyDialogManager implements DialogContextManager, Serializable {
- // ------------------------------------------------------ Context Variables
+ // ------------------------------------------------------ DialogContext Variables
/**
@@ -47,7 +48,7 @@
/**
- * <p>Map containing all currently active {@link Context} instances for
+ * <p>Map containing all currently active {@link DialogContext} instances for
* the current user.</p>
*/
private final HashMap map = new HashMap();
@@ -59,11 +60,11 @@
private int serial = 0;
- // ------------------------------------------------------- Contexts Methods
+ // ------------------------------------------------------- DialogContextManager Methods
/** {@inheritDoc} */
- public Context create(FacesContext context, String name) {
+ public DialogContext create(FacesContext context, String name) {
// Look up the specified dialog configuration
Map dialogs = dialogs(context);
@@ -73,8 +74,8 @@
+ name + "' can be found");
}
- // Configure a new LegacyContext instance
- LegacyContext instance = new LegacyContext(this, dialog, generateId());
+ // Configure a new LegacyDialogContext instance
+ LegacyDialogContext instance = new LegacyDialogContext(this, dialog, generateId());
instance.setData(new HashMap());
map.put(instance.getId(), instance);
context.getExternalContext().getRequestMap().put(Constants.CONTEXT_BEAN, instance);
@@ -84,15 +85,15 @@
/** @{inheritDoc} */
- public Context get(String id) {
- return (Context) map.get(id);
+ public DialogContext get(String id) {
+ return (DialogContext) map.get(id);
}
/** @{inheritDoc} */
- public void remove(Context instance) {
+ public void remove(DialogContext instance) {
if (map.remove(instance.getId()) == instance) {
- ((LegacyContext) instance).deactivate();
+ ((LegacyDialogContext) instance).deactivate();
}
}
Modified: shale/sandbox/shale-dialog2-legacy/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-legacy/src/main/resources/META-INF/faces-config.xml?rev=439215&r1=439214&r2=439215&view=diff
==============================================================================
--- shale/sandbox/shale-dialog2-legacy/src/main/resources/META-INF/faces-config.xml (original)
+++ shale/sandbox/shale-dialog2-legacy/src/main/resources/META-INF/faces-config.xml Fri Sep 1 00:06:39 2006
@@ -28,8 +28,8 @@
<faces-config>
<managed-bean>
- <managed-bean-name>org.apache.shale.dialog2.CONTEXTS</managed-bean-name>
- <managed-bean-class>org.apache.shale.dialog2.legacy.LegacyContexts</managed-bean-class>
+ <managed-bean-name>org.apache.shale.dialog2.MANAGER</managed-bean-name>
+ <managed-bean-class>org.apache.shale.dialog2.legacy.LegacyDialogManager</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
Propchange: shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep 1 00:06:39 2006
@@ -0,0 +1,2 @@
+.LCKScxmlContexts.java~
+.LCKScxmlContext.java~
Copied: shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogContext.java (from r439203, shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ScxmlContext.java)
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogContext.java?p2=shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogContext.java&p1=shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ScxmlContext.java&r1=439203&r2=439215&rev=439215&view=diff
==============================================================================
--- shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ScxmlContext.java (original)
+++ shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogContext.java Fri Sep 1 00:06:39 2006
@@ -29,16 +29,17 @@
import org.apache.commons.scxml.model.ModelException;
import org.apache.commons.scxml.model.SCXML;
import org.apache.commons.scxml.model.State;
-import org.apache.shale.dialog2.Context;
-import org.apache.shale.dialog2.Contexts;
+import org.apache.shale.dialog2.DialogContext;
+import org.apache.shale.dialog2.DialogContextManager;
/**
- * <p>Implementation of {@link Contexts} for integrating
+ * <p>Implementation of {@link DialogContextManager} for integrating
* Commons SCXML into the Shale Dialog Manager.</p>
*
+ *
* @since 1.0.4
*/
-final class ScxmlContext implements Context, Serializable {
+final class SCXMLDialogContext implements DialogContext, Serializable {
// ------------------------------------------------------------ Constructors
@@ -47,14 +48,14 @@
/**
* <p>Construct a new instance.</p>
*
- * @param instances {@link IContexts instance that owns us
+ * @param manager {@link DialogContextManager} instance that owns us
* @param dialog The dialog's state machine (whose executable instance needs
* to be created)
* @param name The dialog's logical name
* @param id Dialog identifier assigned to this instance
*/
- ScxmlContext(Contexts instances, SCXML dialog, String name, String id) {
- this.instances = instances;
+ SCXMLDialogContext(DialogContextManager instances, SCXML dialog, String name, String id) {
+ this.manager = manager;
this.name = name;
this.id = id;
@@ -76,11 +77,11 @@
}
- // ------------------------------------------------------ Context Variables
+ // ------------------------------------------------------ DialogContext Variables
/**
- * <p>Flag indicating that this {@link Context} is currently active.</p>
+ * <p>Flag indicating that this {@link DialogContext} is currently active.</p>
*/
private boolean active = true;
@@ -98,9 +99,9 @@
/**
- * <p>{@link Contexts} instance that owns us.</p>
+ * <p>{@link DialogContextManager} instance that owns us.</p>
*/
- private Contexts instances = null;
+ private DialogContextManager manager = null;
/**
@@ -116,7 +117,7 @@
private SCXMLExecutor executor = null;
- // ----------------------------------------------------- Context Properties
+ // ----------------------------------------------------- DialogContext Properties
/** {@inheritDoc} */
@@ -150,7 +151,7 @@
}
- // -------------------------------------------------------- Context Methods
+ // -------------------------------------------------------- DialogContext Methods
/** {@inheritDoc} */
@@ -181,9 +182,9 @@
/**
- * <p>Mark this {@link Context} as being deactivated. This should only
+ * <p>Mark this {@link DialogContext} as being deactivated. This should only
* be called by the <code>remove()</code> method on our associated
- * {@link Contexts}.</p>
+ * {@link DialogContextManager}.</p>
*/
void deactivate() {
this.active = false;
Copied: shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogManager.java (from r439203, shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ScxmlContexts.java)
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogManager.java?p2=shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogManager.java&p1=shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ScxmlContexts.java&r1=439203&r2=439215&rev=439215&view=diff
==============================================================================
--- shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/ScxmlContexts.java (original)
+++ shale/sandbox/shale-dialog2-scxml/src/main/java/org/apache/shale/dialog2/scxml/SCXMLDialogManager.java Fri Sep 1 00:06:39 2006
@@ -25,20 +25,20 @@
import org.apache.commons.scxml.model.SCXML;
import org.apache.shale.dialog2.Constants;
-import org.apache.shale.dialog2.Context;
-import org.apache.shale.dialog2.Contexts;
+import org.apache.shale.dialog2.DialogContext;
+import org.apache.shale.dialog2.DialogContextManager;
import org.apache.shale.dialog2.scxml.config.ConfigurationParser;
/**
- * <p>Implementation of {@link Contexts} for integrating
+ * <p>Implementation of {@link DialogContextManager} for integrating
* Commons SCXML into the Shale Dialog Manager.</p>
*
* @since 1.0.4
*/
-public final class ScxmlContexts implements Contexts, Serializable {
+public final class SCXMLDialogManager implements DialogContextManager, Serializable {
- // ------------------------------------------------------ Context Variables
+ // ------------------------------------------------------ DialogContext Variables
/**
@@ -49,7 +49,7 @@
/**
- * <p>Map containing all currently active {@link Context} instances for
+ * <p>Map containing all currently active {@link DialogContext} instances for
* the current user.</p>
*/
private final Map map = new HashMap();
@@ -61,11 +61,11 @@
private int serial = 0;
- // -------------------------------------------------------- Contexts Methods
+ // -------------------------------------------------------- DialogContextManager Methods
/** {@inheritDoc} */
- public Context create(FacesContext context, String name) {
+ public DialogContext create(FacesContext context, String name) {
// Look up the specified dialog configuration
Map dialogs = dialogs(context);
@@ -75,8 +75,8 @@
+ name + "' can be found");
}
- // Configure a new ScxmlContext instance
- ScxmlContext instance = new ScxmlContext(this, dialog, name, generateId());
+ // Configure a new SCXMLDialogContext instance
+ SCXMLDialogContext instance = new SCXMLDialogContext(this, dialog, name, generateId());
instance.setData(new HashMap());
map.put(instance.getId(), instance);
context.getExternalContext().getRequestMap().put(Constants.CONTEXT_BEAN, instance);
@@ -85,15 +85,15 @@
/** @{inheritDoc} */
- public Context get(String id) {
- return (Context) map.get(id);
+ public DialogContext get(String id) {
+ return (DialogContext) map.get(id);
}
/** @{inheritDoc} */
- public void remove(Context instance) {
+ public void remove(DialogContext instance) {
if (map.remove(instance.getId()) == instance) {
- ((ScxmlContext) instance).deactivate();
+ ((SCXMLDialogContext) instance).deactivate();
}
}
Modified: shale/sandbox/shale-dialog2-scxml/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2-scxml/src/main/resources/META-INF/faces-config.xml?rev=439215&r1=439214&r2=439215&view=diff
==============================================================================
--- shale/sandbox/shale-dialog2-scxml/src/main/resources/META-INF/faces-config.xml (original)
+++ shale/sandbox/shale-dialog2-scxml/src/main/resources/META-INF/faces-config.xml Fri Sep 1 00:06:39 2006
@@ -28,8 +28,8 @@
<faces-config>
<managed-bean>
- <managed-bean-name>org.apache.shale.dialog2.CONTEXTS</managed-bean-name>
- <managed-bean-class>org.apache.shale.dialog2.scxml.ScxmlContexts</managed-bean-class>
+ <managed-bean-name>org.apache.shale.dialog2.MANAGER</managed-bean-name>
+ <managed-bean-class>org.apache.shale.dialog2.scxml.ScxmlDialogManager</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
Modified: shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Constants.java
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Constants.java?rev=439215&r1=439214&r2=439215&view=diff
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Constants.java (original)
+++ shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Constants.java Fri Sep 1 00:06:39 2006
@@ -26,7 +26,7 @@
/**
- * <p>Request scoped attribute under which the {@link Context} instance
+ * <p>Request scoped attribute under which the {@link DialogContext} instance
* for the dialog that is active for this view (if any) is stored.</p>
*
* <p>FIXME - review this value if this class is promoted out of
@@ -36,16 +36,6 @@
/**
- * <p>Session scoped attribute under which the {@link Contexts} instance
- * for this user (if any) is stored. A particular integration will
- * typically declare itself to be a session scoped managed bean with
- * this name.</p>
- */
- public static final String CONTEXTS_BEAN =
- "org.apache.shale.dialog2.CONTEXTS";
-
-
- /**
* <p>Generic attribute name (on the view root component of the current
* JSF component tree) under which the context identifier for the
* dialog instance that is current for this view (if any) should be
@@ -63,6 +53,16 @@
* should be initiated.</p>
*/
public static final String DIALOG_PREFIX = "dialog2:";
+
+
+ /**
+ * <p>Session scoped attribute under which the {@link DialogContextManager}
+ * instance for this user (if any) is stored. A particular integration will
+ * typically declare itself to be a session scoped managed bean with
+ * this name.</p>
+ */
+ public static final String MANAGER_BEAN =
+ "org.apache.shale.dialog2.MANAGER";
}
Copied: shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/DialogContext.java (from r439188, shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Context.java)
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/DialogContext.java?p2=shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/DialogContext.java&p1=shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Context.java&r1=439188&r2=439215&rev=439215&view=diff
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Context.java (original)
+++ shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/DialogContext.java Fri Sep 1 00:06:39 2006
@@ -19,24 +19,25 @@
import javax.faces.context.FacesContext;
/**
- * <p>Interface describing the current state of a particular dialog manager
- * {@link Context}. If successful, it is likely that this
+ * <p>Interface describing the current state of a particular dialog
+ * context instance. If successful, it is likely that this
* interface would be defined in the <code>org.apache.shale.dialog</code>
* package.</p>
*
* <p><strong>IMPLEMENTATION NOTE</strong> - Implementations of this interface
* will be stored in session scope, so they should be serializable.</p>
*
+ *
* @since 1.0.4
*/
-public interface Context {
+public interface DialogContext {
- // ----------------------------------------------------- Context Properties
+ // ------------------------------------------------ DialogContext Properties
/**
- * <p>Return <code>true</code> if this {@link Context} is currently
+ * <p>Return <code>true</code> if this {@link DialogContext} is currently
* active (created but not yet removed).</p>
*/
public boolean isActive();
@@ -72,12 +73,12 @@
public String getName();
- // -------------------------------------------------------- Context Methods
+ // --------------------------------------------------- DialogContext Methods
/**
* <p>Advance the execution of the state machine underlying this dialog
- * instance, until an interaction with the user is required. At that
+ * context instance, until an interaction with the user is required. At that
* point, return the view identifier to which navigation should occur.</p>
*
* @param context FacesContext for the current request
Copied: shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/DialogContextManager.java (from r439188, shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Contexts.java)
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/DialogContextManager.java?p2=shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/DialogContextManager.java&p1=shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Contexts.java&r1=439188&r2=439215&rev=439215&view=diff
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Contexts.java (original)
+++ shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/DialogContextManager.java Fri Sep 1 00:06:39 2006
@@ -19,15 +19,15 @@
import javax.faces.context.FacesContext;
/**
- * <p>Accessor utility for the various {@link Context} instances that have
- * been activated within the scope of the current user's session.</p>
+ * <p>Management functions for the {@link DialogContext} instances related
+ * to a particular user's session.</p>
*
* <p><strong>IMPLEMENTATION NOTE</strong> - Implementations of this interface
* will be stored in session scope, so they should be serializable.</p>
*
* @since 1.0.4
*/
-public interface Contexts {
+public interface DialogContextManager {
/**
@@ -36,36 +36,38 @@
* <code>id</code> property guaranteed to be unique among all active
* instances for the current user. It shall also have been stored as
* a request scope attribute under key <code>Constants.INSTANCE_BEAN</code>.
- * For ease of development, the newly created {@link Context} SHOULD
+ * For ease of development, the newly created {@link DialogContext} SHOULD
* have been assigned a <code>data<code> property of an empty
* <code>java.util.Map</code> (unless a particular dialog implementation
* prefers to provide some more implementation specific default).</p>
*
+ *
* @param context FacesContext for the current request
* @param name Logical name of the dialog to be executed
- *
* @exception IllegalArgumentException if no dialog definition
* can be found for the specified logical name
*/
- public Context create(FacesContext context, String name);
+ public DialogContext create(FacesContext context, String name);
/**
- * <p>Return the {@link Context} for the specified dialog identifier;
+ * <p>Return the {@link DialogContext} for the specified dialog identifier;
* otherwise, return null.</p>
*
+ *
* @param id Dialog identifier for which to return an instance
*/
- public Context get(String id);
+ public DialogContext get(String id);
/**
- * <p>Remove the specified {@link Context} from the set of active
+ * <p>Remove the specified {@link DialogContext} from the set of active
* instances for the current user.</p>
*
- * @param instance Context to be removed
+ *
+ * @param instance DialogContext to be removed
*/
- public void remove(Context instance);
+ public void remove(DialogContext instance);
}
Propchange: shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep 1 00:06:39 2006
@@ -0,0 +1 @@
+.LCKDialog2PhaseListener.java~
Modified: shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java?rev=439215&r1=439214&r2=439215&view=diff
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java (original)
+++ shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java Fri Sep 1 00:06:39 2006
@@ -21,11 +21,11 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import org.apache.shale.dialog2.Constants;
-import org.apache.shale.dialog2.Context;
-import org.apache.shale.dialog2.Contexts;
+import org.apache.shale.dialog2.DialogContext;
+import org.apache.shale.dialog2.DialogContextManager;
/**
- * <p><code>NavigationHandler</code> implementation that allows dialogs to
+ * <p><code>Dialog2NavigationHandler</code> implementation that allows dialogs to
* be started via a logical outcome that returns with a specified prefix.
* This is not the only way to start a dialog (applications can also do this
* programmatically), but it is convenient in many cases.</p>
@@ -49,7 +49,7 @@
}
- // ------------------------------------------------------ Context Variables
+ // ------------------------------------------------------ DialogContext Variables
/**
@@ -66,7 +66,7 @@
* rules are applied:</p>
* <ul>
* <li>If this view is <strong>NOT</strong> currently executing
- * a dialog {@link Context}:
+ * a dialog {@link DialogContext}:
* <ul>
* <li>If the logical outcome begins with the prefix identified
* by <code>Constants.DIALOG_PREFIX</code>, create a new
@@ -76,12 +76,13 @@
* <li>Otherwise, delegate control to the original navigation
* handler passed to our constructor.</li>
* </ul></li>
- * <li>If this view is currently executing a dialog {@link Context},
+ * <li>If this view is currently executing a {@link DialogContext},
* advance its progress until it returns a view identifier that should
* be displayed. A corresponding view is created, and control is
* returned to the application.</li>
* </ul>
*
+ *
* @param context FacesContext for the current request
* @param fromAction Action that was invoked
* @param outcome Logical outcome from the invoked action
@@ -90,18 +91,18 @@
String outcome) {
String viewId = null;
- Context instance = (Context)
+ DialogContext dcontext = (DialogContext)
context.getExternalContext().getRequestMap().get(Constants.CONTEXT_BEAN);
- if (instance == null) {
+ if (dcontext == null) {
if ((outcome != null) && outcome.startsWith(Constants.DIALOG_PREFIX)) {
- instance = create(context, outcome.substring(Constants.DIALOG_PREFIX.length()));
- viewId = advance(context, instance, null);
+ dcontext = create(context, outcome.substring(Constants.DIALOG_PREFIX.length()));
+ viewId = advance(context, dcontext, null);
} else {
original.handleNavigation(context, fromAction, outcome);
return;
}
} else {
- viewId = advance(context, instance, outcome);
+ viewId = advance(context, dcontext, outcome);
}
navigate(context, viewId);
@@ -112,34 +113,35 @@
/**
- * <p>Advance the progress of the specified {@link Context}, until it
+ * <p>Advance the progress of the specified {@link DialogContext}, until it
* returns a view identifier to which we should navigate.</p>
*
+ *
* @param context FacesContext for the current request
- * @param instance Dialog instance being processed
+ * @param dcontext Dialog instance being processed
* @param outcome Logical outcome to drive this advance
*/
- private String advance(FacesContext context, Context instance, String outcome) {
+ private String advance(FacesContext context, DialogContext dcontext, String outcome) {
- return instance.advance(context, outcome);
+ return dcontext.advance(context, outcome);
}
/**
- * <p>Create a new dialog {@link Context}, returning it for further
+ * <p>Create a new {@link DialogContext}, returning it for further
* processing.</p>
*
* @param context FacesContext for the current request
* @param name Logical name of the dialog to be started
*/
- private Context create(FacesContext context, String name) {
+ private DialogContext create(FacesContext context, String name) {
- Contexts instances = (Contexts)
+ DialogContextManager manager = (DialogContextManager)
context.getApplication().getVariableResolver().
- resolveVariable(context, Constants.CONTEXTS_BEAN);
- if (instances != null) {
- return instances.create(context, name);
+ resolveVariable(context, Constants.MANAGER_BEAN);
+ if (manager != null) {
+ return manager.create(context, name);
} else {
return null;
}
Modified: shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java?rev=439215&r1=439214&r2=439215&view=diff
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java (original)
+++ shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java Fri Sep 1 00:06:39 2006
@@ -22,8 +22,8 @@
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
import org.apache.shale.dialog2.Constants;
-import org.apache.shale.dialog2.Context;
-import org.apache.shale.dialog2.Contexts;
+import org.apache.shale.dialog2.DialogContext;
+import org.apache.shale.dialog2.DialogContextManager;
/**
* <p>Phase listener that saves and restores the dialog identifier for the
@@ -45,7 +45,8 @@
/**
* <p>After the <em>Restore View</em> phase, retrieve the current
* dialog identifier (if any), and restore the corresponding
- * {@link Context}.</p>
+ * {@link DialogContext}.</p>
+ *
*
* @param event The phase event to be processed
*/
@@ -58,17 +59,17 @@
if (id == null) {
return;
}
- Contexts instances = (Contexts)
+ DialogContextManager manager = (DialogContextManager)
context.getApplication().getVariableResolver().
- resolveVariable(context, Constants.CONTEXTS_BEAN);
- if (instances == null) {
+ resolveVariable(context, Constants.MANAGER_BEAN);
+ if (manager == null) {
return;
}
- Context instance = instances.get(id);
- if (instance == null) {
+ DialogContext dcontext = manager.get(id);
+ if (dcontext == null) {
return;
}
- context.getExternalContext().getRequestMap().put(Constants.CONTEXT_BEAN, instance);
+ context.getExternalContext().getRequestMap().put(Constants.CONTEXT_BEAN, dcontext);
}
}
@@ -84,7 +85,7 @@
if (PhaseId.RENDER_RESPONSE.equals(event.getPhaseId())) {
FacesContext context = event.getFacesContext();
- Context instance = (Context)
+ DialogContext instance = (DialogContext)
context.getExternalContext().getRequestMap().get(Constants.CONTEXT_BEAN);
Map map = context.getViewRoot().getAttributes();
if ((instance != null) && instance.isActive()) {