Skip to content

Commit 3724b21

Browse files
committed
1 parent 52873de commit 3724b21

23 files changed

+288
-277
lines changed

src/main/java/org/primefaces/application/resource/DynamicResourcesPhaseListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void afterPhase(PhaseEvent event) {
5454
}
5555

5656
// JSF 2.3 contains a own dynamic resource handling
57-
if (PrimeApplicationContext.getCurrentInstance(context).getConfig().isAtLeastJSF23()) {
57+
if (PrimeApplicationContext.getCurrentInstance(context).getEnvironment().isAtLeastJsf23()) {
5858
return;
5959
}
6060

src/main/java/org/primefaces/application/resource/PrimeResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class PrimeResource extends ResourceWrapper {
3131
public PrimeResource(final Resource resource) {
3232
super();
3333
wrapped = resource;
34-
version = "&v=" + PrimeApplicationContext.getCurrentInstance(FacesContext.getCurrentInstance()).getConfig().getBuildVersion();
34+
version = "&v=" + PrimeApplicationContext.getCurrentInstance(FacesContext.getCurrentInstance()).getEnvironment().getBuildVersion();
3535
}
3636

3737
@Override

src/main/java/org/primefaces/behavior/ajax/AjaxBehaviorRenderer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import javax.faces.render.ClientBehaviorRenderer;
2828
import org.primefaces.component.api.ClientBehaviorRenderingMode;
2929

30-
import org.primefaces.context.RequestContext;
30+
import org.primefaces.context.PrimeRequestContext;
3131
import org.primefaces.expression.SearchExpressionFacade;
3232
import org.primefaces.util.AjaxRequestBuilder;
3333

@@ -75,7 +75,7 @@ public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior be
7575
process = "@this";
7676
}
7777

78-
AjaxRequestBuilder builder = RequestContext.getCurrentInstance().getAjaxRequestBuilder();
78+
AjaxRequestBuilder builder = PrimeRequestContext.getCurrentInstance().getAjaxRequestBuilder();
7979

8080
String request = builder.init()
8181
.source(source)

src/main/java/org/primefaces/behavior/base/AbstractBehaviorHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public String getFor() {
204204
protected void addAttachedObjectHandlerToMojarra(UIComponent component) {
205205

206206
String key = MOJARRA_ATTACHED_OBJECT_HANDLERS_KEY;
207-
if (PrimeApplicationContext.getCurrentInstance(FacesContext.getCurrentInstance()).getConfig().isAtLeastJSF22()) {
207+
if (PrimeApplicationContext.getCurrentInstance(FacesContext.getCurrentInstance()).getEnvironment().isAtLeastJsf22()) {
208208
key = MOJARRA_22_ATTACHED_OBJECT_HANDLERS_KEY;
209209
}
210210

src/main/java/org/primefaces/component/fileupload/FileUploadRenderer.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import javax.faces.context.FacesContext;
2323
import javax.faces.context.ResponseWriter;
2424
import javax.faces.convert.ConverterException;
25-
import org.primefaces.config.PrimeConfiguration;
2625
import org.primefaces.context.PrimeApplicationContext;
2726
import org.primefaces.expression.SearchExpressionFacade;
2827
import org.primefaces.renderkit.CoreRenderer;
@@ -41,9 +40,9 @@ public void decode(FacesContext context, UIComponent component) {
4140
FileUpload fileUpload = (FileUpload) component;
4241

4342
if (!fileUpload.isDisabled()) {
44-
PrimeConfiguration cc = PrimeApplicationContext.getCurrentInstance(context).getConfig();
45-
String uploader = cc.getUploader();
46-
boolean isAtLeastJSF22 = cc.isAtLeastJSF22();
43+
PrimeApplicationContext applicationContext = PrimeApplicationContext.getCurrentInstance(context);
44+
String uploader = applicationContext.getConfig().getUploader();
45+
boolean isAtLeastJSF22 = applicationContext.getEnvironment().isAtLeastJsf22();
4746
String inputToDecodeId = getSimpleInputDecodeId(fileUpload, context);
4847

4948
if (uploader.equals("auto")) {

src/main/java/org/primefaces/component/outputlabel/OutputLabelRenderer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import javax.validation.constraints.NotNull;
3333
import javax.validation.metadata.ConstraintDescriptor;
3434
import org.primefaces.component.api.InputHolder;
35-
import org.primefaces.config.PrimeConfiguration;
3635
import org.primefaces.context.PrimeApplicationContext;
3736
import org.primefaces.el.ValueExpressionAnalyzer;
3837
import org.primefaces.expression.SearchExpressionFacade;
@@ -112,8 +111,8 @@ public void invokeContextCallback(FacesContext context, UIComponent target) {
112111

113112
// fallback if required=false
114113
if (!state.isRequired()) {
115-
PrimeConfiguration config = PrimeApplicationContext.getCurrentInstance(context).getConfig();
116-
if (config.isBeanValidationAvailable() && isBeanValidationDefined(input, context)) {
114+
PrimeApplicationContext applicationContext = PrimeApplicationContext.getCurrentInstance(context);
115+
if (applicationContext.getConfig().isBeanValidationEnabled() && isBeanValidationDefined(input, context)) {
117116
state.setRequired(true);
118117
}
119118
}

0 commit comments

Comments
 (0)