diff options
author | gkessler | 2010-05-20 17:16:58 +0000 |
---|---|---|
committer | gkessler | 2010-05-20 17:16:58 +0000 |
commit | 916a51a3d9191d5dc841ff1a5c685962d8e7f542 (patch) | |
tree | 0ede4311f5510fe825a1b968959290066d06f88e /jsf | |
parent | 3fd3731292a9b93913b1b97d21b613b057367df3 (diff) | |
download | webtools.jsf-916a51a3d9191d5dc841ff1a5c685962d8e7f542.tar.gz webtools.jsf-916a51a3d9191d5dc841ff1a5c685962d8e7f542.tar.xz webtools.jsf-916a51a3d9191d5dc841ff1a5c685962d8e7f542.zip |
313166 - [JSF2.0] False warning for h:commandButton in a composite
Diffstat (limited to 'jsf')
-rw-r--r-- | jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/ContainmentValidatingStrategy.java | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/ContainmentValidatingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/ContainmentValidatingStrategy.java index f7062d5f0..0d4a5865a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/ContainmentValidatingStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/strategy/ContainmentValidatingStrategy.java @@ -58,8 +58,12 @@ public class ContainmentValidatingStrategy extends Messages.ContainmentValidatingStrategy_DisplayName; private final static ElementToTagIdentifierMapping elem2TagIdMapper = new ElementToTagIdentifierMapping(); + + private static final String ENABLE_CONTAINMENT_VALIDATION_KEY = "jsfCoreEnableContainmentValidation"; //$NON-NLS-1$ + private int _containmentValidationCount; // = 0; private final JSFValidationContext _jsfValidationContext; + private boolean _enabled; /** * @param jsfValidationContext @@ -69,9 +73,10 @@ public class ContainmentValidatingStrategy extends { super(ID, DISPLAY_NAME); _jsfValidationContext = jsfValidationContext; + _enabled = getEnablementProperty(); } - @Override + @Override public boolean isInteresting(DOMAdapter domAdapter) { return domAdapter instanceof Region2ElementAdapter; @@ -80,7 +85,8 @@ public class ContainmentValidatingStrategy extends @Override public void validate(DOMAdapter domAdapter) { - if (domAdapter instanceof Region2ElementAdapter) + if (_enabled + && domAdapter instanceof Region2ElementAdapter) { final Region2ElementAdapter elementAdapter = (Region2ElementAdapter) domAdapter; @@ -88,6 +94,15 @@ public class ContainmentValidatingStrategy extends } } + private boolean getEnablementProperty() { + String res = System.getProperty(ENABLE_CONTAINMENT_VALIDATION_KEY); + if (res == null) { + //check env var also + res = System.getenv(ENABLE_CONTAINMENT_VALIDATION_KEY); + } + return res != null; + } + private void validateContainment( final Region2ElementAdapter elementAdapter, final JSFValidationContext jsfValidationContext) |