You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2017/09/17 12:30:04 UTC
[myfaces-trinidad] 23/30: Checkpoint: minor tweak - replaced public
VIEW_ID constant with SkinPregenerationService.isPregenerationRequest()
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch andys-skin-pregen
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad.git
commit 4103e853822d712c455c81f30bb9fbaf56a56e5c
Author: Andy Schwartz <an...@apache.org>
AuthorDate: Fri Mar 16 21:11:13 2012 +0000
Checkpoint: minor tweak - replaced public VIEW_ID constant with SkinPregenerationService.isPregenerationRequest()
---
.../trinidadinternal/application/ViewHandlerImpl.java | 2 +-
.../skin/pregen/SkinPregenerationService.java | 18 ++++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
index bc6886c..e84c331 100644
--- a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
+++ b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
@@ -419,7 +419,7 @@ public class ViewHandlerImpl extends ViewHandlerWrapper
// 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");
diff --git a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/pregen/SkinPregenerationService.java b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/pregen/SkinPregenerationService.java
index dcd8a60..4dca116 100644
--- a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/pregen/SkinPregenerationService.java
+++ b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/pregen/SkinPregenerationService.java
@@ -109,12 +109,7 @@ import org.apache.myfaces.trinidadinternal.skin.pregen.config.PregenConfig;
* 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 extends InternalView
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 extends InternalView
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);
}
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.