primefaces#3058

Author: tandraschko

src/main/java-templates/org/primefaces/component/accordionpanel/AccordionPanelTemplate.java

@@ -22,7 +22,6 @@
 import javax.faces.component.visit.VisitHint;
 import javax.faces.component.visit.VisitResult;
 import javax.faces.event.AbortProcessingException;
-import org.primefaces.context.RequestContext;
 import javax.faces.event.BehaviorEvent;
 import org.primefaces.PrimeFaces;
 

src/main/java-templates/org/primefaces/component/calendar/CalendarTemplate.java

@@ -21,7 +21,7 @@
 import javax.faces.event.AjaxBehaviorEvent;
 import javax.faces.event.FacesEvent;
 import javax.faces.event.PhaseId;
-import org.primefaces.context.RequestContext;
+import org.primefaces.context.PrimeApplicationContext;
 import org.primefaces.convert.DateTimeConverter;
 
     public final static String CONTAINER_CLASS = "ui-calendar";
@@ -187,7 +187,7 @@ public String getLabelledBy() {
     public Converter getConverter() {
         Converter converter = super.getConverter();
 
-        if(converter == null && RequestContext.getCurrentInstance(getFacesContext()).getApplicationContext().getConfig().isClientSideValidationEnabled()) {
+        if(converter == null && PrimeApplicationContext.getCurrentInstance(getFacesContext()).getConfig().isClientSideValidationEnabled()) {
             DateTimeConverter con = new DateTimeConverter();
             con.setPattern(this.calculatePattern());
             con.setTimeZone(this.calculateTimeZone());

src/main/java-templates/org/primefaces/component/captcha/CaptchaTemplate.java

@@ -9,7 +9,6 @@
 import javax.faces.application.FacesMessage;
 import javax.faces.FacesException;
 import org.primefaces.PrimeFaces;
-import org.primefaces.context.RequestContext;
 import org.primefaces.component.captcha.Captcha;
 import org.primefaces.context.PrimeExternalContext;
 import org.primefaces.json.JSONObject;

src/main/java-templates/org/primefaces/component/datagrid/DataGridTemplate.java

@@ -7,7 +7,6 @@
 import javax.faces.event.AjaxBehaviorEvent;
 import javax.faces.event.FacesEvent;
 import javax.faces.model.DataModel;
-import org.primefaces.context.RequestContext;
 import org.primefaces.event.SelectEvent;
 import org.primefaces.event.UnselectEvent;
 import org.primefaces.event.data.PageEvent;

src/main/java-templates/org/primefaces/component/datalist/DataListTemplate.java

@@ -6,7 +6,6 @@
 import javax.faces.event.FacesEvent;
 import javax.faces.event.FacesListener;
 import javax.faces.model.DataModel;
-import org.primefaces.context.RequestContext;
 import org.primefaces.model.LazyDataModel;
 import org.primefaces.event.SelectEvent;
 import java.util.Arrays;

src/main/java-templates/org/primefaces/component/datatable/DataTableTemplate.java

@@ -7,7 +7,6 @@
 import org.primefaces.component.contextmenu.ContextMenu;
 import org.primefaces.component.summaryrow.SummaryRow;
 import org.primefaces.component.headerrow.HeaderRow;
-import org.primefaces.context.RequestContext;
 import org.primefaces.util.Constants;
 import java.util.List;
 import java.util.ArrayList;

src/main/java-templates/org/primefaces/component/gmap/GMapTemplate.java

@@ -19,7 +19,6 @@
 import javax.faces.event.FacesEvent;
 import javax.faces.event.AjaxBehaviorEvent;
 import org.primefaces.util.Constants;
-import org.primefaces.context.RequestContext;
 import javax.faces.event.BehaviorEvent;
 import org.primefaces.PrimeFaces;
 

src/main/java-templates/org/primefaces/component/poll/PollTemplate.java

@@ -1,6 +1,5 @@
 import javax.el.ValueExpression;
 import org.primefaces.PrimeFaces;
-import org.primefaces.context.RequestContext;
 
     public void broadcast(javax.faces.event.FacesEvent event) throws javax.faces.event.AbortProcessingException {
 		super.broadcast(event); //backward compatibility

src/main/java-templates/org/primefaces/component/selectonemenu/SelectOneMenuTemplate.java

@@ -1,6 +1,6 @@
 import org.primefaces.component.column.Column;
+import org.primefaces.context.PrimeApplicationContext;
 import org.primefaces.config.PrimeConfiguration;
-import org.primefaces.context.RequestContext;
 import java.util.Collection;
 import java.util.List;
 import java.util.ArrayList;
@@ -107,7 +107,7 @@ protected void validateValue(FacesContext context, Object value) {
                 setValid(false);
             }
 
-            PrimeConfiguration config = RequestContext.getCurrentInstance(getFacesContext()).getApplicationContext().getConfig();
+            PrimeConfiguration config = PrimeApplicationContext.getCurrentInstance(getFacesContext()).getConfig();
 
             //other validators
             if(isValid() && (!isEmpty(value) || config.isValidateEmptyFields())) {

src/main/java-templates/org/primefaces/component/tree/TreeTemplate.java

@@ -24,7 +24,6 @@
 import org.primefaces.model.TreeNode;
 import javax.faces.event.BehaviorEvent;
 import org.primefaces.PrimeFaces;
-import org.primefaces.context.RequestContext;
 import org.primefaces.model.CheckboxTreeNode;
 import org.primefaces.model.DefaultTreeNode;
 import org.primefaces.model.filter.ContainsFilterConstraint;