Download as
Browse Code »

Commit 791b218ec0f68dea2a67254473c9d0738443b21d

Authored by Thiago Soares
1 parent ba372f17
Exists in master

Retirado do Framework demoiselle a dependencia com classe 

"com.sun.faces.util.Util". Pois esta classe e especifica da
implementacao JSF de referencia da Sun.
Mantis numero 0000743.
Showing 2 changed files with 14 additions and 7 deletions   Show diff stats
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/template/AbstractEditPageBean.java
  Diff comments   View file @791b218
@@ -43,12 +43,11 @@ import javax.inject.Inject; @@ -43,12 +43,11 @@ import javax.inject.Inject;
43 import br.gov.frameworkdemoiselle.DemoiselleException; 43 import br.gov.frameworkdemoiselle.DemoiselleException;
44 import br.gov.frameworkdemoiselle.annotation.Name; 44 import br.gov.frameworkdemoiselle.annotation.Name;
45 import br.gov.frameworkdemoiselle.util.Beans; 45 import br.gov.frameworkdemoiselle.util.Beans;
  46 +import br.gov.frameworkdemoiselle.util.Faces;
46 import br.gov.frameworkdemoiselle.util.Parameter; 47 import br.gov.frameworkdemoiselle.util.Parameter;
47 import br.gov.frameworkdemoiselle.util.Reflections; 48 import br.gov.frameworkdemoiselle.util.Reflections;
48 import br.gov.frameworkdemoiselle.util.ResourceBundle; 49 import br.gov.frameworkdemoiselle.util.ResourceBundle;
49 50
50 -import com.sun.faces.util.Util;  
51 -  
52 public abstract class AbstractEditPageBean<T, I> extends AbstractPageBean implements EditPageBean<T> { 51 public abstract class AbstractEditPageBean<T, I> extends AbstractPageBean implements EditPageBean<T> {
53 52
54 private static final long serialVersionUID = 1L; 53 private static final long serialVersionUID = 1L;
@@ -120,7 +119,7 @@ public abstract class AbstractEditPageBean&lt;T, I&gt; extends AbstractPageBean implem @@ -120,7 +119,7 @@ public abstract class AbstractEditPageBean&lt;T, I&gt; extends AbstractPageBean implem
120 } 119 }
121 120
122 private Converter getIdConverter() { 121 private Converter getIdConverter() {
123 - return Util.getConverterForClass(getIdClass(), facesContext); 122 + return Faces.getConverter(getIdClass());
124 } 123 }
125 124
126 protected abstract void handleLoad(); 125 protected abstract void handleLoad();
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Faces.java
  Diff comments   View file @791b218
@@ -44,6 +44,7 @@ import static javax.faces.application.FacesMessage.SEVERITY_WARN; @@ -44,6 +44,7 @@ import static javax.faces.application.FacesMessage.SEVERITY_WARN;
44 import java.util.List; 44 import java.util.List;
45 import java.util.Map; 45 import java.util.Map;
46 46
  47 +import javax.faces.application.Application;
47 import javax.faces.application.FacesMessage; 48 import javax.faces.application.FacesMessage;
48 import javax.faces.application.FacesMessage.Severity; 49 import javax.faces.application.FacesMessage.Severity;
49 import javax.faces.component.UIViewRoot; 50 import javax.faces.component.UIViewRoot;
@@ -54,8 +55,6 @@ import br.gov.frameworkdemoiselle.exception.ApplicationException; @@ -54,8 +55,6 @@ import br.gov.frameworkdemoiselle.exception.ApplicationException;
54 import br.gov.frameworkdemoiselle.message.Message; 55 import br.gov.frameworkdemoiselle.message.Message;
55 import br.gov.frameworkdemoiselle.message.SeverityType; 56 import br.gov.frameworkdemoiselle.message.SeverityType;
56 57
57 -import com.sun.faces.util.Util;  
58 -  
59 public class Faces { 58 public class Faces {
60 59
61 public static void addMessages(final List<Message> messages) { 60 public static void addMessages(final List<Message> messages) {
@@ -147,9 +146,18 @@ public class Faces { @@ -147,9 +146,18 @@ public class Faces {
147 } 146 }
148 147
149 public static Converter getConverter(Class<?> clazz) { 148 public static Converter getConverter(Class<?> clazz) {
150 - return Util.getConverterForClass(clazz, getFacesContext()); 149 + FacesContext context = getFacesContext();
  150 + if (clazz == null) {
  151 + return null;
  152 + }
  153 + try {
  154 + Application application = context.getApplication();
  155 + return application.createConverter(clazz);
  156 + } catch (Exception e) {
  157 + return null;
  158 + }
151 } 159 }
152 - 160 +
153 public static Map<String, Object> getViewMap() { 161 public static Map<String, Object> getViewMap() {
154 UIViewRoot viewRoot = getFacesContext().getViewRoot(); 162 UIViewRoot viewRoot = getFacesContext().getViewRoot();
155 return viewRoot.getViewMap(true); 163 return viewRoot.getViewMap(true);