You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by an...@apache.org on 2012/03/16 22:11:14 UTC
svn commit: r1301766 - in
/myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal:
application/ViewHandlerImpl.java skin/pregen/SkinPregenerationService.java
Author: andys
Date: Fri Mar 16 21:11:13 2012
New Revision: 1301766
URL: http://svn.apache.org/viewvc?rev=1301766&view=rev
Log:
Checkpoint: minor tweak - replaced public VIEW_ID constant with SkinPregenerationService.isPregenerationRequest()
Modified:
myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/pregen/SkinPregenerationService.java
Modified: myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java?rev=1301766&r1=1301765&r2=1301766&view=diff
==============================================================================
--- myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java (original)
+++ myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java Fri Mar 16 21:11:13 2012
@@ -419,7 +419,7 @@ public class ViewHandlerImpl extends Vie
// are allowed.
private void _checkSkinPregeneration(FacesContext context, String viewId)
{
- if (_skinPregenerationEnabled && !SkinPregenerationService.VIEW_ID.equals(viewId))
+ if (_skinPregenerationEnabled && !SkinPregenerationService.isPregenerationRequest(viewId))
{
ExternalContext external = context.getExternalContext();
String message = _LOG.getMessage("SKIN_PREGEN_ENABLED");
Modified: myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/pregen/SkinPregenerationService.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/pregen/SkinPregenerationService.java?rev=1301766&r1=1301765&r2=1301766&view=diff
==============================================================================
--- myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/pregen/SkinPregenerationService.java (original)
+++ myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/pregen/SkinPregenerationService.java Fri Mar 16 21:11:13 2012
@@ -109,12 +109,7 @@ import org.apache.myfaces.trinidadintern
* can only be used for this single purpose.
*/
public class SkinPregenerationService extends InternalView
-{
- /**
- * The view id for the pregeneration service.
- */
- public static final String VIEW_ID = "/-pregenerate-skins";
-
+{
/**
* Tests whether the pregeneration service is enabled.
*/
@@ -123,6 +118,14 @@ public class SkinPregenerationService ex
return (_getServiceStatus() == ServiceStatus.ON);
}
+ /**
+ * Tests whether the view id corresponds to a skin pregeneration request.
+ */
+ public static boolean isPregenerationRequest(String viewId)
+ {
+ return _VIEW_ID.equals(viewId);
+ }
+
@Override
public UIViewRoot createView(FacesContext context, String viewId)
{
@@ -368,6 +371,9 @@ public class SkinPregenerationService ex
private static final String _RESPONSE_DOCTYPE =
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">";
+ // The view id for the pregeneration service.
+ private static final String _VIEW_ID = "/-pregenerate-skins";
+
private static final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(SkinPregenerationService.class);
}