empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject empire-db git commit: EMPIREDB-235
Date Thu, 11 Feb 2016 16:22:51 GMT
Repository: empire-db
Updated Branches:
  refs/heads/master f57f8a57f -> 04d02f756


EMPIREDB-235

Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo
Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/04d02f75
Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/04d02f75
Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/04d02f75

Branch: refs/heads/master
Commit: 04d02f75644c5cfccc72d512a41874f0900a29ca
Parents: f57f8a5
Author: Rainer Döbele <doebele@apache.org>
Authored: Thu Feb 11 17:22:47 2016 +0100
Committer: Rainer Döbele <doebele@apache.org>
Committed: Thu Feb 11 17:22:47 2016 +0100

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/faces-config.xml          |  4 ++++
 .../org/apache/empire/jsf2/components/SelectTag.java  | 14 +++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/empire-db/blob/04d02f75/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/faces-config.xml
----------------------------------------------------------------------
diff --git a/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/faces-config.xml
b/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/faces-config.xml
index e97605b..6e43a4e 100644
--- a/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/faces-config.xml
+++ b/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/faces-config.xml
@@ -95,6 +95,10 @@
 		<component-class>org.apache.empire.jsf2.components.LinkTag</component-class>
 	</component>
 	<component>
+		<component-type>components.SelectTag</component-type>
+		<component-class>org.apache.empire.jsf2.components.SelectTag</component-class>
+	</component>	
+	<component>
 		<component-type>components.TitleTag</component-type>
 		<component-class>org.apache.empire.jsf2.components.TitleTag</component-class>
 	</component>

http://git-wip-us.apache.org/repos/asf/empire-db/blob/04d02f75/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java
----------------------------------------------------------------------
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java
index 635234b..af07dc3 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java
@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 
 import javax.faces.component.NamingContainer;
-import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
 import javax.faces.component.html.HtmlSelectOneMenu;
 import javax.faces.component.visit.VisitCallback;
@@ -46,6 +45,8 @@ public class SelectTag extends UIInput implements NamingContainer
 {
     // Logger
     private static final Logger log = LoggerFactory.getLogger(SelectTag.class);
+    
+    public static final String SELECT_COMPONENT_ID = "select";
 
     private SelectInputControl control = null;
     
@@ -128,16 +129,6 @@ public class SelectTag extends UIInput implements NamingContainer
     }
 
     @Override
-    public void decode(FacesContext context)
-    {
-        for (UIComponent c : getChildren())
-        {
-            c.decode(context);
-        }
-        super.decode(context);
-    }
-
-    @Override
     public void updateModel(FacesContext context)
     {
         // check read only
@@ -220,6 +211,7 @@ public class SelectTag extends UIInput implements NamingContainer
         input.setStyleClass(cssStyle);
         // other attributes
         copyAttributes(input);
+        input.setId(SELECT_COMPONENT_ID);
         // Options
         Options options = getOptionList();
         boolean addEmpty = isAllowNull() && !options.contains("");


Mime
View raw message