You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mc...@apache.org on 2011/10/28 22:18:06 UTC
svn commit: r1190540 - in
/myfaces/trinidad/branches/jwaldman-offline-mode-branch:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/
Author: mcooper
Date: Fri Oct 28 20:18:06 2011
New Revision: 1190540
URL: http://svn.apache.org/viewvc?rev=1190540&view=rev
Log:
TRINIDAD-2140
Thanks to Pavitra for the patch.
Modified:
myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
Modified: myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java?rev=1190540&r1=1190539&r2=1190540&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java (original)
+++ myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java Fri Oct 28 20:18:06 2011
@@ -333,7 +333,7 @@ abstract public class RequestContext
public enum OutputMode
{
DEFAULT("default"), PORTLET("portlet"), PRINTABLE("printable"), EMAIL("email"),
- OFFLINE("offline"), WEB_CRAWLER("webcrawler");
+ ATTACHMENT("attachment"), WEB_CRAWLER("webcrawler");
private OutputMode(String id)
{
Modified: myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java?rev=1190540&r1=1190539&r2=1190540&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java (original)
+++ myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java Fri Oct 28 20:18:06 2011
@@ -112,10 +112,11 @@ public class CoreRenderKit extends Rende
static public final String OUTPUT_MODE_EMAIL = "email";
/**
- * An offline browser output mode. Render the content such that the output can be taken
- * offline. Interactions requiring server communication should be avoided.
+ * An attachment browser output mode. Render the content such that the output can be sent as an
+ * email attachment that can be viewed offline. Interactions requiring server communication
+ * should be completely avoided.
*/
- static public final String OUTPUT_MODE_OFFLINE = "offline";
+ static public final String OUTPUT_MODE_ATTACHMENT = "attachment";
/**
* Web Creawler output mode. Render the content for consumption by a web crawler
@@ -123,7 +124,7 @@ public class CoreRenderKit extends Rende
static public final String OUTPUT_MODE_WEB_CRAWLER = "webcrawler";
- public enum OutputMode {normal, portlet, printable, email, offline}
+ public enum OutputMode {normal, portlet, printable, email, attachment}
static public final String RETURN_PARAM = "rtrn";
Modified: myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java?rev=1190540&r1=1190539&r2=1190540&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java (original)
+++ myfaces/trinidad/branches/jwaldman-offline-mode-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java Fri Oct 28 20:18:06 2011
@@ -671,9 +671,9 @@ public class CoreRenderingContext extend
return AgentUtil.mergeCapabilities(agent, _PORTLET_CAPABILITIES);
}
}
- else if (CoreRenderKit.OUTPUT_MODE_OFFLINE.equals(outputMode))
+ else if (CoreRenderKit.OUTPUT_MODE_ATTACHMENT.equals(outputMode))
{
- return AgentUtil.mergeCapabilities(agent, _OFFLINE_CAPABILITIES);
+ return AgentUtil.mergeCapabilities(agent, _ATTACHMENT_CAPABILITIES);
}
else if (CoreRenderKit.OUTPUT_MODE_WEB_CRAWLER.equals(outputMode))
{
@@ -827,7 +827,7 @@ public class CoreRenderingContext extend
static private final Map<Object, Object> _ENHANCED_PORTLET_CAPABILITIES =
new HashMap<Object, Object>();
- static private final Map<Object, Object> _OFFLINE_CAPABILITIES =
+ static private final Map<Object, Object> _ATTACHMENT_CAPABILITIES =
new HashMap<Object, Object>();
static private final Map<Object, Object> _WEB_CRAWLER_CAPABILITIES =
@@ -885,7 +885,7 @@ public class CoreRenderingContext extend
Boolean.FALSE);
// turn off PPR
- _OFFLINE_CAPABILITIES.put(TrinidadAgent.CAP_PARTIAL_RENDERING, Boolean.FALSE);
+ _ATTACHMENT_CAPABILITIES.put(TrinidadAgent.CAP_PARTIAL_RENDERING, Boolean.FALSE);
}
static private final TrinidadLogger _LOG =