myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r427657 [9/42] - in /myfaces: core/trunk/api/src/main/java/javax/faces/component/ core/trunk/api/src/test/java/javax/faces/ core/trunk/api/src/test/java/javax/faces/application/ core/trunk/api/src/test/java/javax/faces/component/ core/trunk...
Date Tue, 01 Aug 2006 17:44:01 GMT
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlInputSecret.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlInputSecret.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlInputSecret.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlInputSecret.java Tue Aug  1 10:43:28 2006
@@ -1,163 +1,163 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.component.html.ext;
-
-import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.html.util.HtmlComponentUtils;
-
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * @author Bruno Aranda
- * @version $Revision$ $Date: 2005-06-05 12:55:33 +0200 (Sun, 5 Jun 2005) $
- */
-public class HtmlInputSecret
-        extends javax.faces.component.html.HtmlInputSecret
-        implements UserRoleAware, DisplayValueOnlyCapable
-{
-
-    public String getClientId(FacesContext context)
-    {
-        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
-        if (clientId == null)
-        {
-            clientId = super.getClientId(context);
-        }
-
-        return clientId;
-    }
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlInputSecret";
-    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
-
-    private String _enabledOnUserRole = null;
-    private String _visibleOnUserRole = null;
-    private Boolean _displayValueOnly = null;
-    private String _displayValueOnlyStyle = null;
-    private String _displayValueOnlyStyleClass = null;
-
-    public HtmlInputSecret()
-    {
-    }
-
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public String getEnabledOnUserRole()
-    {
-        if (_enabledOnUserRole != null) return _enabledOnUserRole;
-        ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public String getVisibleOnUserRole()
-    {
-        if (_visibleOnUserRole != null) return _visibleOnUserRole;
-        ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnly(boolean displayValueOnly)
-    {
-        _displayValueOnly = Boolean.valueOf(displayValueOnly);
-    }
-
-    public boolean isDisplayValueOnly()
-    {
-        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
-    }
-
-
-    public boolean isSetDisplayValueOnly()
-    {
-        if (_displayValueOnly != null) return true;
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null;
-    }
-
-    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
-    {
-        _displayValueOnlyStyle = displayValueOnlyStyle;
-    }
-
-    public String getDisplayValueOnlyStyle()
-    {
-        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
-    {
-        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
-    }
-
-    public String getDisplayValueOnlyStyleClass()
-    {
-        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-
-    public boolean isRendered()
-    {
-        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
-        return super.isRendered();
-    }
-
-    public Object saveState(FacesContext context)
-    {
-        Object values[] = new Object[6];
-        values[0] = super.saveState(context);
-        values[1] = _enabledOnUserRole;
-        values[2] = _visibleOnUserRole;
-        values[3] = _displayValueOnly;
-        values[4] = _displayValueOnlyStyle;
-        values[5] = _displayValueOnlyStyleClass;
-        return ((Object) (values));
-    }
-
-    public void restoreState(FacesContext context, Object state)
-    {
-        Object values[] = (Object[])state;
-        super.restoreState(context, values[0]);
-        _enabledOnUserRole = (String)values[1];
-        _visibleOnUserRole = (String)values[2];
-        _displayValueOnly = (Boolean)values[3];
-        _displayValueOnlyStyle = (String)values[4];
-        _displayValueOnlyStyleClass = (String)values[5];
-    }
-    //------------------ GENERATED CODE END ---------------------------------------
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.component.html.ext;
+
+import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author Bruno Aranda
+ * @version $Revision$ $Date: 2005-06-05 12:55:33 +0200 (Sun, 5 Jun 2005) $
+ */
+public class HtmlInputSecret
+        extends javax.faces.component.html.HtmlInputSecret
+        implements UserRoleAware, DisplayValueOnlyCapable
+{
+
+    public String getClientId(FacesContext context)
+    {
+        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
+        if (clientId == null)
+        {
+            clientId = super.getClientId(context);
+        }
+
+        return clientId;
+    }
+
+    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
+
+    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlInputSecret";
+    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
+
+    private String _enabledOnUserRole = null;
+    private String _visibleOnUserRole = null;
+    private Boolean _displayValueOnly = null;
+    private String _displayValueOnlyStyle = null;
+    private String _displayValueOnlyStyleClass = null;
+
+    public HtmlInputSecret()
+    {
+    }
+
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public String getEnabledOnUserRole()
+    {
+        if (_enabledOnUserRole != null) return _enabledOnUserRole;
+        ValueBinding vb = getValueBinding("enabledOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+    public String getVisibleOnUserRole()
+    {
+        if (_visibleOnUserRole != null) return _visibleOnUserRole;
+        ValueBinding vb = getValueBinding("visibleOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnly(boolean displayValueOnly)
+    {
+        _displayValueOnly = Boolean.valueOf(displayValueOnly);
+    }
+
+    public boolean isDisplayValueOnly()
+    {
+        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
+    }
+
+
+    public boolean isSetDisplayValueOnly()
+    {
+        if (_displayValueOnly != null) return true;
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null;
+    }
+
+    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle)
+    {
+        _displayValueOnlyStyle = displayValueOnlyStyle;
+    }
+
+    public String getDisplayValueOnlyStyle()
+    {
+        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
+    {
+        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
+    }
+
+    public String getDisplayValueOnlyStyleClass()
+    {
+        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+
+    public boolean isRendered()
+    {
+        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
+        return super.isRendered();
+    }
+
+    public Object saveState(FacesContext context)
+    {
+        Object values[] = new Object[6];
+        values[0] = super.saveState(context);
+        values[1] = _enabledOnUserRole;
+        values[2] = _visibleOnUserRole;
+        values[3] = _displayValueOnly;
+        values[4] = _displayValueOnlyStyle;
+        values[5] = _displayValueOnlyStyleClass;
+        return ((Object) (values));
+    }
+
+    public void restoreState(FacesContext context, Object state)
+    {
+        Object values[] = (Object[])state;
+        super.restoreState(context, values[0]);
+        _enabledOnUserRole = (String)values[1];
+        _visibleOnUserRole = (String)values[2];
+        _displayValueOnly = (Boolean)values[3];
+        _displayValueOnlyStyle = (String)values[4];
+        _displayValueOnlyStyleClass = (String)values[5];
+    }
+    //------------------ GENERATED CODE END ---------------------------------------
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlInputSecret.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlPanelGrid.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlPanelGrid.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlPanelGrid.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlPanelGrid.java Tue Aug  1 10:43:28 2006
@@ -1,156 +1,156 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.component.html.ext;
-
-import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.html.util.HtmlComponentUtils;
-import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
-
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
- * @version $Revision: 170214 $ $Date: 2005-05-15 13:24:37 +0200 (Sun, 15 May 2005) $
- */
-public class HtmlPanelGrid
-        extends javax.faces.component.html.HtmlPanelGrid
-        implements UserRoleAware, DisplayValueOnlyCapable
-{
-    public String getClientId(FacesContext context)
-    {
-        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
-        if (clientId == null)
-        {
-            clientId = super.getClientId(context);
-        }
-
-        return clientId;
-    }
-
-    //private static final Log log = LogFactory.getLog(HtmlPanelGroup.class);
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlPanelGrid";
-    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
-
-    private String _enabledOnUserRole = null;
-    private String _visibleOnUserRole = null;
-    private Boolean _displayValueOnly = null;
-	private String _displayValueOnlyStyle = null;
-	private String _displayValueOnlyStyleClass = null;
-
-    public HtmlPanelGrid()
-    {
-    }
-
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public String getEnabledOnUserRole()
-    {
-        if (_enabledOnUserRole != null) return _enabledOnUserRole;
-        ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public String getVisibleOnUserRole()
-    {
-        if (_visibleOnUserRole != null) return _visibleOnUserRole;
-        ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public boolean isSetDisplayValueOnly() {
-        if (_displayValueOnly != null) return true;
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null;
-    }    
-
-    public boolean isDisplayValueOnly() {
-        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
-    }
-
-    public void setDisplayValueOnly(boolean displayValueOnly) {
-        _displayValueOnly = Boolean.valueOf(displayValueOnly);
-    }
-
-    public String getDisplayValueOnlyStyle() {
-        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
-        _displayValueOnlyStyle = displayValueOnlyStyle;
-    }
-
-    public String getDisplayValueOnlyStyleClass() {
-        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {
-        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
-    }
-
-
-    public boolean isRendered()
-    {
-        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
-        return super.isRendered();
-    }
-
-    public Object saveState(FacesContext context)
-    {
-        Object values[] = new Object[6];
-        values[0] = super.saveState(context);
-        values[1] = _enabledOnUserRole;
-        values[2] = _visibleOnUserRole;
-        values[3] = _displayValueOnly;
-        values[4] = _displayValueOnlyStyle;
-        values[5] = _displayValueOnlyStyleClass;
-        return ((Object) (values));
-    }
-
-    public void restoreState(FacesContext context, Object state)
-    {
-        Object values[] = (Object[])state;
-        super.restoreState(context, values[0]);
-        _enabledOnUserRole = (String)values[1];
-        _visibleOnUserRole = (String)values[2];
-        _displayValueOnly = (Boolean)values[3];
-        _displayValueOnlyStyle = (String)values[4];
-        _displayValueOnlyStyleClass = (String)values[5];
-    }
-    //------------------ GENERATED CODE END ---------------------------------------
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.component.html.ext;
+
+import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
+ * @version $Revision: 170214 $ $Date: 2005-05-15 13:24:37 +0200 (Sun, 15 May 2005) $
+ */
+public class HtmlPanelGrid
+        extends javax.faces.component.html.HtmlPanelGrid
+        implements UserRoleAware, DisplayValueOnlyCapable
+{
+    public String getClientId(FacesContext context)
+    {
+        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
+        if (clientId == null)
+        {
+            clientId = super.getClientId(context);
+        }
+
+        return clientId;
+    }
+
+    //private static final Log log = LogFactory.getLog(HtmlPanelGroup.class);
+
+    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
+
+    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlPanelGrid";
+    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
+
+    private String _enabledOnUserRole = null;
+    private String _visibleOnUserRole = null;
+    private Boolean _displayValueOnly = null;
+	private String _displayValueOnlyStyle = null;
+	private String _displayValueOnlyStyleClass = null;
+
+    public HtmlPanelGrid()
+    {
+    }
+
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public String getEnabledOnUserRole()
+    {
+        if (_enabledOnUserRole != null) return _enabledOnUserRole;
+        ValueBinding vb = getValueBinding("enabledOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+    public String getVisibleOnUserRole()
+    {
+        if (_visibleOnUserRole != null) return _visibleOnUserRole;
+        ValueBinding vb = getValueBinding("visibleOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public boolean isSetDisplayValueOnly() {
+        if (_displayValueOnly != null) return true;
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null;
+    }    
+
+    public boolean isDisplayValueOnly() {
+        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
+    }
+
+    public void setDisplayValueOnly(boolean displayValueOnly) {
+        _displayValueOnly = Boolean.valueOf(displayValueOnly);
+    }
+
+    public String getDisplayValueOnlyStyle() {
+        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
+        _displayValueOnlyStyle = displayValueOnlyStyle;
+    }
+
+    public String getDisplayValueOnlyStyleClass() {
+        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {
+        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
+    }
+
+
+    public boolean isRendered()
+    {
+        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
+        return super.isRendered();
+    }
+
+    public Object saveState(FacesContext context)
+    {
+        Object values[] = new Object[6];
+        values[0] = super.saveState(context);
+        values[1] = _enabledOnUserRole;
+        values[2] = _visibleOnUserRole;
+        values[3] = _displayValueOnly;
+        values[4] = _displayValueOnlyStyle;
+        values[5] = _displayValueOnlyStyleClass;
+        return ((Object) (values));
+    }
+
+    public void restoreState(FacesContext context, Object state)
+    {
+        Object values[] = (Object[])state;
+        super.restoreState(context, values[0]);
+        _enabledOnUserRole = (String)values[1];
+        _visibleOnUserRole = (String)values[2];
+        _displayValueOnly = (Boolean)values[3];
+        _displayValueOnlyStyle = (String)values[4];
+        _displayValueOnlyStyleClass = (String)values[5];
+    }
+    //------------------ GENERATED CODE END ---------------------------------------
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlPanelGrid.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java Tue Aug  1 10:43:28 2006
@@ -1,170 +1,170 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.component.html.ext;
-
-import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.shared_tomahawk.component.EscapeCapable;
-import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.html.util.HtmlComponentUtils;
-
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
- * @version $Revision: 170213 $ $Date: 2005-05-15 13:22:56 +0200 (Sun, 15 May 2005) $
- */
-public class HtmlSelectBooleanCheckbox
-        extends javax.faces.component.html.HtmlSelectBooleanCheckbox
-        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
-{
-
-
-    public String getClientId(FacesContext context)
-    {
-        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
-        if (clientId == null)
-        {
-            clientId = super.getClientId(context);
-        }
-
-        return clientId;
-    }
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectBooleanCheckbox";
-    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
-    private static final boolean DEFAULT_ESCAPE = true;
-
-    private String _enabledOnUserRole = null;
-    private String _visibleOnUserRole = null;
-    private Boolean _displayValueOnly = null;
-    private String _displayValueOnlyStyle = null;
-    private String _displayValueOnlyStyleClass = null;
-    private Boolean _escape = null;
-
-    public HtmlSelectBooleanCheckbox()
-    {
-    }
-
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public String getEnabledOnUserRole()
-    {
-        if (_enabledOnUserRole != null) return _enabledOnUserRole;
-        ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public String getVisibleOnUserRole()
-    {
-        if (_visibleOnUserRole != null) return _visibleOnUserRole;
-        ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public boolean isSetDisplayValueOnly() {
-        if (_displayValueOnly != null) return true;
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null;
-    }
-
-    public boolean isDisplayValueOnly() {
-        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
-    }
-
-    public void setDisplayValueOnly(boolean displayValueOnly) {
-        _displayValueOnly = Boolean.valueOf(displayValueOnly);
-    }
-
-    public String getDisplayValueOnlyStyle() {
-        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
-        _displayValueOnlyStyle = displayValueOnlyStyle;
-    }
-
-    public String getDisplayValueOnlyStyleClass() {
-        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {
-        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
-    }
-
-    public void setEscape(boolean escape)
-    {
-        _escape = Boolean.valueOf(escape);
-    }
-
-    public boolean isEscape()
-    {
-        if (_escape != null) return _escape.booleanValue();
-        ValueBinding vb = getValueBinding("escape");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
-    }
-    public boolean isRendered()
-    {
-        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
-        return super.isRendered();
-    }
-
-    public Object saveState(FacesContext context)
-    {
-        Object values[] = new Object[6];
-        values[0] = super.saveState(context);
-        values[1] = _enabledOnUserRole;
-        values[2] = _visibleOnUserRole;
-        values[3] = _displayValueOnly;
-        values[4] = _displayValueOnlyStyle;
-        values[5] = _displayValueOnlyStyleClass;
-        return ((Object) (values));
-    }
-
-    public void restoreState(FacesContext context, Object state)
-    {
-        Object values[] = (Object[])state;
-        super.restoreState(context, values[0]);
-        _enabledOnUserRole = (String)values[1];
-        _visibleOnUserRole = (String)values[2];
-        _displayValueOnly = (Boolean)values[3];
-        _displayValueOnlyStyle = (String)values[4];
-        _displayValueOnlyStyleClass = (String)values[5];
-    }
-    //------------------ GENERATED CODE END ---------------------------------------
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.component.html.ext;
+
+import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared_tomahawk.component.EscapeCapable;
+import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
+ * @version $Revision: 170213 $ $Date: 2005-05-15 13:22:56 +0200 (Sun, 15 May 2005) $
+ */
+public class HtmlSelectBooleanCheckbox
+        extends javax.faces.component.html.HtmlSelectBooleanCheckbox
+        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
+{
+
+
+    public String getClientId(FacesContext context)
+    {
+        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
+        if (clientId == null)
+        {
+            clientId = super.getClientId(context);
+        }
+
+        return clientId;
+    }
+
+    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
+
+    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectBooleanCheckbox";
+    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
+    private static final boolean DEFAULT_ESCAPE = true;
+
+    private String _enabledOnUserRole = null;
+    private String _visibleOnUserRole = null;
+    private Boolean _displayValueOnly = null;
+    private String _displayValueOnlyStyle = null;
+    private String _displayValueOnlyStyleClass = null;
+    private Boolean _escape = null;
+
+    public HtmlSelectBooleanCheckbox()
+    {
+    }
+
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public String getEnabledOnUserRole()
+    {
+        if (_enabledOnUserRole != null) return _enabledOnUserRole;
+        ValueBinding vb = getValueBinding("enabledOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+    public String getVisibleOnUserRole()
+    {
+        if (_visibleOnUserRole != null) return _visibleOnUserRole;
+        ValueBinding vb = getValueBinding("visibleOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public boolean isSetDisplayValueOnly() {
+        if (_displayValueOnly != null) return true;
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null;
+    }
+
+    public boolean isDisplayValueOnly() {
+        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
+    }
+
+    public void setDisplayValueOnly(boolean displayValueOnly) {
+        _displayValueOnly = Boolean.valueOf(displayValueOnly);
+    }
+
+    public String getDisplayValueOnlyStyle() {
+        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
+        _displayValueOnlyStyle = displayValueOnlyStyle;
+    }
+
+    public String getDisplayValueOnlyStyleClass() {
+        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {
+        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
+    }
+
+    public void setEscape(boolean escape)
+    {
+        _escape = Boolean.valueOf(escape);
+    }
+
+    public boolean isEscape()
+    {
+        if (_escape != null) return _escape.booleanValue();
+        ValueBinding vb = getValueBinding("escape");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
+    }
+    public boolean isRendered()
+    {
+        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
+        return super.isRendered();
+    }
+
+    public Object saveState(FacesContext context)
+    {
+        Object values[] = new Object[6];
+        values[0] = super.saveState(context);
+        values[1] = _enabledOnUserRole;
+        values[2] = _visibleOnUserRole;
+        values[3] = _displayValueOnly;
+        values[4] = _displayValueOnlyStyle;
+        values[5] = _displayValueOnlyStyleClass;
+        return ((Object) (values));
+    }
+
+    public void restoreState(FacesContext context, Object state)
+    {
+        Object values[] = (Object[])state;
+        super.restoreState(context, values[0]);
+        _enabledOnUserRole = (String)values[1];
+        _visibleOnUserRole = (String)values[2];
+        _displayValueOnly = (Boolean)values[3];
+        _displayValueOnlyStyle = (String)values[4];
+        _displayValueOnlyStyleClass = (String)values[5];
+    }
+    //------------------ GENERATED CODE END ---------------------------------------
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java Tue Aug  1 10:43:28 2006
@@ -1,170 +1,170 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.component.html.ext;
-
-import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.shared_tomahawk.component.EscapeCapable;
-import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.html.util.HtmlComponentUtils;
-
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
- * @version $Revision: 170213 $ $Date: 2005-05-15 13:22:56 +0200 (Sun, 15 May 2005) $
- */
-public class HtmlSelectManyListbox
-        extends javax.faces.component.html.HtmlSelectManyListbox
-        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
-{
-    public String getClientId(FacesContext context)
-    {
-        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
-        if (clientId == null)
-        {
-            clientId = super.getClientId(context);
-        }
-
-        return clientId;
-    }
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectManyListbox";
-    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
-
-    private String _enabledOnUserRole = null;
-    private String _visibleOnUserRole = null;
-    private Boolean _displayValueOnly = null;
-	private String _displayValueOnlyStyle = null;
-	private String _displayValueOnlyStyleClass = null;
-
-    public HtmlSelectManyListbox()
-    {
-    }
-
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public String getEnabledOnUserRole()
-    {
-        if (_enabledOnUserRole != null) return _enabledOnUserRole;
-        ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public String getVisibleOnUserRole()
-    {
-        if (_visibleOnUserRole != null) return _visibleOnUserRole;
-        ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public boolean isSetDisplayValueOnly() {
-        if (_displayValueOnly != null) return true;
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null;
-    }
-
-    public boolean isDisplayValueOnly() {
-        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
-    }
-
-    public void setDisplayValueOnly(boolean displayValueOnly) {
-        _displayValueOnly = Boolean.valueOf(displayValueOnly);
-    }
-
-    public String getDisplayValueOnlyStyle() {
-        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
-        _displayValueOnlyStyle = displayValueOnlyStyle;
-    }
-
-    public String getDisplayValueOnlyStyleClass() {
-        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {
-        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
-    }
-
-    public boolean isRendered()
-    {
-        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
-        return super.isRendered();
-    }
-
-    public Object saveState(FacesContext context)
-    {
-        Object values[] = new Object[6];
-        values[0] = super.saveState(context);
-        values[1] = _enabledOnUserRole;
-        values[2] = _visibleOnUserRole;
-        values[3] = _displayValueOnly;
-        values[4] = _displayValueOnlyStyle;
-        values[5] = _displayValueOnlyStyleClass;
-        return ((Object) (values));
-    }
-
-    public void restoreState(FacesContext context, Object state)
-    {
-        Object values[] = (Object[])state;
-        super.restoreState(context, values[0]);
-        _enabledOnUserRole = (String)values[1];
-        _visibleOnUserRole = (String)values[2];
-        _displayValueOnly = (Boolean)values[3];
-        _displayValueOnlyStyle = (String)values[4];
-        _displayValueOnlyStyleClass = (String)values[5];
-    }
-    //------------------ GENERATED CODE END ---------------------------------------
-
-    private Boolean _escape = null;
-    private static final boolean DEFAULT_ESCAPE = true;
-
-    public void setEscape(boolean escape)
-    {
-        _escape = Boolean.valueOf(escape);
-    }
-
-    public boolean isEscape()
-    {
-        if (_escape != null) return _escape.booleanValue();
-        ValueBinding vb = getValueBinding("escape");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.component.html.ext;
+
+import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared_tomahawk.component.EscapeCapable;
+import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
+ * @version $Revision: 170213 $ $Date: 2005-05-15 13:22:56 +0200 (Sun, 15 May 2005) $
+ */
+public class HtmlSelectManyListbox
+        extends javax.faces.component.html.HtmlSelectManyListbox
+        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
+{
+    public String getClientId(FacesContext context)
+    {
+        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
+        if (clientId == null)
+        {
+            clientId = super.getClientId(context);
+        }
+
+        return clientId;
+    }
+
+    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
+
+    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectManyListbox";
+    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
+
+    private String _enabledOnUserRole = null;
+    private String _visibleOnUserRole = null;
+    private Boolean _displayValueOnly = null;
+	private String _displayValueOnlyStyle = null;
+	private String _displayValueOnlyStyleClass = null;
+
+    public HtmlSelectManyListbox()
+    {
+    }
+
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public String getEnabledOnUserRole()
+    {
+        if (_enabledOnUserRole != null) return _enabledOnUserRole;
+        ValueBinding vb = getValueBinding("enabledOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+    public String getVisibleOnUserRole()
+    {
+        if (_visibleOnUserRole != null) return _visibleOnUserRole;
+        ValueBinding vb = getValueBinding("visibleOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public boolean isSetDisplayValueOnly() {
+        if (_displayValueOnly != null) return true;
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null;
+    }
+
+    public boolean isDisplayValueOnly() {
+        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
+    }
+
+    public void setDisplayValueOnly(boolean displayValueOnly) {
+        _displayValueOnly = Boolean.valueOf(displayValueOnly);
+    }
+
+    public String getDisplayValueOnlyStyle() {
+        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
+        _displayValueOnlyStyle = displayValueOnlyStyle;
+    }
+
+    public String getDisplayValueOnlyStyleClass() {
+        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {
+        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
+    }
+
+    public boolean isRendered()
+    {
+        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
+        return super.isRendered();
+    }
+
+    public Object saveState(FacesContext context)
+    {
+        Object values[] = new Object[6];
+        values[0] = super.saveState(context);
+        values[1] = _enabledOnUserRole;
+        values[2] = _visibleOnUserRole;
+        values[3] = _displayValueOnly;
+        values[4] = _displayValueOnlyStyle;
+        values[5] = _displayValueOnlyStyleClass;
+        return ((Object) (values));
+    }
+
+    public void restoreState(FacesContext context, Object state)
+    {
+        Object values[] = (Object[])state;
+        super.restoreState(context, values[0]);
+        _enabledOnUserRole = (String)values[1];
+        _visibleOnUserRole = (String)values[2];
+        _displayValueOnly = (Boolean)values[3];
+        _displayValueOnlyStyle = (String)values[4];
+        _displayValueOnlyStyleClass = (String)values[5];
+    }
+    //------------------ GENERATED CODE END ---------------------------------------
+
+    private Boolean _escape = null;
+    private static final boolean DEFAULT_ESCAPE = true;
+
+    public void setEscape(boolean escape)
+    {
+        _escape = Boolean.valueOf(escape);
+    }
+
+    public boolean isEscape()
+    {
+        if (_escape != null) return _escape.booleanValue();
+        ValueBinding vb = getValueBinding("escape");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
+    }
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java Tue Aug  1 10:43:28 2006
@@ -1,169 +1,169 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.component.html.ext;
-
-import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.shared_tomahawk.component.EscapeCapable;
-import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.html.util.HtmlComponentUtils;
-
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
- * @version $Revision: 170213 $ $Date: 2005-05-15 13:22:56 +0200 (Sun, 15 May 2005) $
- */
-public class HtmlSelectManyMenu
-        extends javax.faces.component.html.HtmlSelectManyMenu
-        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
-{
-    public String getClientId(FacesContext context)
-    {
-        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
-        if (clientId == null)
-        {
-            clientId = super.getClientId(context);
-        }
-
-        return clientId;
-    }
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectManyMenu";
-    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
-
-    private String _enabledOnUserRole = null;
-    private String _visibleOnUserRole = null;
-    private Boolean _displayValueOnly = null;
-	private String _displayValueOnlyStyle = null;
-	private String _displayValueOnlyStyleClass = null;
-
-    public HtmlSelectManyMenu()
-    {
-    }
-
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public String getEnabledOnUserRole()
-    {
-        if (_enabledOnUserRole != null) return _enabledOnUserRole;
-        ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public String getVisibleOnUserRole()
-    {
-        if (_visibleOnUserRole != null) return _visibleOnUserRole;
-        ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public boolean isSetDisplayValueOnly() {
-        if (_displayValueOnly != null) return true;
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null;
-    }
-
-    public boolean isDisplayValueOnly() {
-        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
-    }
-
-    public void setDisplayValueOnly(boolean displayValueOnly) {
-        _displayValueOnly = Boolean.valueOf(displayValueOnly);
-    }
-
-    public String getDisplayValueOnlyStyle() {
-        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
-        _displayValueOnlyStyle = displayValueOnlyStyle;
-    }
-
-    public String getDisplayValueOnlyStyleClass() {
-        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {
-        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
-    }
-
-    public boolean isRendered()
-    {
-        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
-        return super.isRendered();
-    }
-
-    public Object saveState(FacesContext context)
-    {
-        Object values[] = new Object[6];
-        values[0] = super.saveState(context);
-        values[1] = _enabledOnUserRole;
-        values[2] = _visibleOnUserRole;
-        values[3] = _displayValueOnly;
-        values[4] = _displayValueOnlyStyle;
-        values[5] = _displayValueOnlyStyleClass;
-        return ((Object) (values));
-    }
-
-    public void restoreState(FacesContext context, Object state)
-    {
-        Object values[] = (Object[])state;
-        super.restoreState(context, values[0]);
-        _enabledOnUserRole = (String)values[1];
-        _visibleOnUserRole = (String)values[2];
-        _displayValueOnly = (Boolean)values[3];
-        _displayValueOnlyStyle = (String)values[4];
-        _displayValueOnlyStyleClass = (String)values[5];
-    }
-    //------------------ GENERATED CODE END ---------------------------------------
-    private Boolean _escape = null;
-    private static final boolean DEFAULT_ESCAPE = true;
-
-    public void setEscape(boolean escape)
-    {
-        _escape = Boolean.valueOf(escape);
-    }
-
-    public boolean isEscape()
-    {
-        if (_escape != null) return _escape.booleanValue();
-        ValueBinding vb = getValueBinding("escape");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.component.html.ext;
+
+import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared_tomahawk.component.EscapeCapable;
+import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
+ * @version $Revision: 170213 $ $Date: 2005-05-15 13:22:56 +0200 (Sun, 15 May 2005) $
+ */
+public class HtmlSelectManyMenu
+        extends javax.faces.component.html.HtmlSelectManyMenu
+        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
+{
+    public String getClientId(FacesContext context)
+    {
+        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
+        if (clientId == null)
+        {
+            clientId = super.getClientId(context);
+        }
+
+        return clientId;
+    }
+
+    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
+
+    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectManyMenu";
+    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
+
+    private String _enabledOnUserRole = null;
+    private String _visibleOnUserRole = null;
+    private Boolean _displayValueOnly = null;
+	private String _displayValueOnlyStyle = null;
+	private String _displayValueOnlyStyleClass = null;
+
+    public HtmlSelectManyMenu()
+    {
+    }
+
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public String getEnabledOnUserRole()
+    {
+        if (_enabledOnUserRole != null) return _enabledOnUserRole;
+        ValueBinding vb = getValueBinding("enabledOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+    public String getVisibleOnUserRole()
+    {
+        if (_visibleOnUserRole != null) return _visibleOnUserRole;
+        ValueBinding vb = getValueBinding("visibleOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public boolean isSetDisplayValueOnly() {
+        if (_displayValueOnly != null) return true;
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null;
+    }
+
+    public boolean isDisplayValueOnly() {
+        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
+    }
+
+    public void setDisplayValueOnly(boolean displayValueOnly) {
+        _displayValueOnly = Boolean.valueOf(displayValueOnly);
+    }
+
+    public String getDisplayValueOnlyStyle() {
+        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
+        _displayValueOnlyStyle = displayValueOnlyStyle;
+    }
+
+    public String getDisplayValueOnlyStyleClass() {
+        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {
+        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
+    }
+
+    public boolean isRendered()
+    {
+        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
+        return super.isRendered();
+    }
+
+    public Object saveState(FacesContext context)
+    {
+        Object values[] = new Object[6];
+        values[0] = super.saveState(context);
+        values[1] = _enabledOnUserRole;
+        values[2] = _visibleOnUserRole;
+        values[3] = _displayValueOnly;
+        values[4] = _displayValueOnlyStyle;
+        values[5] = _displayValueOnlyStyleClass;
+        return ((Object) (values));
+    }
+
+    public void restoreState(FacesContext context, Object state)
+    {
+        Object values[] = (Object[])state;
+        super.restoreState(context, values[0]);
+        _enabledOnUserRole = (String)values[1];
+        _visibleOnUserRole = (String)values[2];
+        _displayValueOnly = (Boolean)values[3];
+        _displayValueOnlyStyle = (String)values[4];
+        _displayValueOnlyStyleClass = (String)values[5];
+    }
+    //------------------ GENERATED CODE END ---------------------------------------
+    private Boolean _escape = null;
+    private static final boolean DEFAULT_ESCAPE = true;
+
+    public void setEscape(boolean escape)
+    {
+        _escape = Boolean.valueOf(escape);
+    }
+
+    public boolean isEscape()
+    {
+        if (_escape != null) return _escape.booleanValue();
+        ValueBinding vb = getValueBinding("escape");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
+    }
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java?rev=427657&r1=427656&r2=427657&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java Tue Aug  1 10:43:28 2006
@@ -1,170 +1,170 @@
-/*
- * Copyright 2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.myfaces.component.html.ext;
-
-import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.shared_tomahawk.component.EscapeCapable;
-import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.html.util.HtmlComponentUtils;
-
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
- * @version $Revision: 170213 $ $Date: 2005-05-15 13:22:56 +0200 (Sun, 15 May 2005) $
- */
-public class HtmlSelectOneListbox
-        extends javax.faces.component.html.HtmlSelectOneListbox
-        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
-{
-    public String getClientId(FacesContext context)
-    {
-        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
-        if (clientId == null)
-        {
-            clientId = super.getClientId(context);
-        }
-
-        return clientId;
-    }
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectOneListbox";
-    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
-
-    private String _enabledOnUserRole = null;
-    private String _visibleOnUserRole = null;
-    private Boolean _displayValueOnly = null;
-	private String _displayValueOnlyStyle = null;
-	private String _displayValueOnlyStyleClass = null;
-
-    public HtmlSelectOneListbox()
-    {
-    }
-
-
-    public void setEnabledOnUserRole(String enabledOnUserRole)
-    {
-        _enabledOnUserRole = enabledOnUserRole;
-    }
-
-    public String getEnabledOnUserRole()
-    {
-        if (_enabledOnUserRole != null) return _enabledOnUserRole;
-        ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setVisibleOnUserRole(String visibleOnUserRole)
-    {
-        _visibleOnUserRole = visibleOnUserRole;
-    }
-
-    public String getVisibleOnUserRole()
-    {
-        if (_visibleOnUserRole != null) return _visibleOnUserRole;
-        ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public boolean isSetDisplayValueOnly() {
-        if (_displayValueOnly != null) return true;
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null;
-    }
-
-    public boolean isDisplayValueOnly() {
-        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
-        ValueBinding vb = getValueBinding("displayValueOnly");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
-    }
-
-    public void setDisplayValueOnly(boolean displayValueOnly) {
-        _displayValueOnly = Boolean.valueOf(displayValueOnly);
-    }
-
-    public String getDisplayValueOnlyStyle() {
-        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
-        _displayValueOnlyStyle = displayValueOnlyStyle;
-    }
-
-    public String getDisplayValueOnlyStyleClass() {
-        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
-        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
-    }
-
-    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {
-        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
-    }
-
-    public boolean isRendered()
-    {
-        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
-        return super.isRendered();
-    }
-
-    public Object saveState(FacesContext context)
-    {
-        Object values[] = new Object[6];
-        values[0] = super.saveState(context);
-        values[1] = _enabledOnUserRole;
-        values[2] = _visibleOnUserRole;
-        values[3] = _displayValueOnly;
-        values[4] = _displayValueOnlyStyle;
-        values[5] = _displayValueOnlyStyleClass;
-        return ((Object) (values));
-    }
-
-    public void restoreState(FacesContext context, Object state)
-    {
-        Object values[] = (Object[])state;
-        super.restoreState(context, values[0]);
-        _enabledOnUserRole = (String)values[1];
-        _visibleOnUserRole = (String)values[2];
-        _displayValueOnly = (Boolean)values[3];
-        _displayValueOnlyStyle = (String)values[4];
-        _displayValueOnlyStyleClass = (String)values[5];
-    }
-    //------------------ GENERATED CODE END ---------------------------------------
-
-    private Boolean _escape = null;
-    private static final boolean DEFAULT_ESCAPE = true;
-
-    public void setEscape(boolean escape)
-    {
-        _escape = Boolean.valueOf(escape);
-    }
-
-    public boolean isEscape()
-    {
-        if (_escape != null) return _escape.booleanValue();
-        ValueBinding vb = getValueBinding("escape");
-        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
-        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
-    }
-}
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.component.html.ext;
+
+import org.apache.myfaces.shared_tomahawk.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared_tomahawk.component.EscapeCapable;
+import org.apache.myfaces.shared_tomahawk.util._ComponentUtils;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author Martin Marinschek (latest modification by $Author: mmarinschek $)
+ * @version $Revision: 170213 $ $Date: 2005-05-15 13:22:56 +0200 (Sun, 15 May 2005) $
+ */
+public class HtmlSelectOneListbox
+        extends javax.faces.component.html.HtmlSelectOneListbox
+        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
+{
+    public String getClientId(FacesContext context)
+    {
+        String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
+        if (clientId == null)
+        {
+            clientId = super.getClientId(context);
+        }
+
+        return clientId;
+    }
+
+    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
+
+    public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectOneListbox";
+    private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
+
+    private String _enabledOnUserRole = null;
+    private String _visibleOnUserRole = null;
+    private Boolean _displayValueOnly = null;
+	private String _displayValueOnlyStyle = null;
+	private String _displayValueOnlyStyleClass = null;
+
+    public HtmlSelectOneListbox()
+    {
+    }
+
+
+    public void setEnabledOnUserRole(String enabledOnUserRole)
+    {
+        _enabledOnUserRole = enabledOnUserRole;
+    }
+
+    public String getEnabledOnUserRole()
+    {
+        if (_enabledOnUserRole != null) return _enabledOnUserRole;
+        ValueBinding vb = getValueBinding("enabledOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setVisibleOnUserRole(String visibleOnUserRole)
+    {
+        _visibleOnUserRole = visibleOnUserRole;
+    }
+
+    public String getVisibleOnUserRole()
+    {
+        if (_visibleOnUserRole != null) return _visibleOnUserRole;
+        ValueBinding vb = getValueBinding("visibleOnUserRole");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public boolean isSetDisplayValueOnly() {
+        if (_displayValueOnly != null) return true;
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null;
+    }
+
+    public boolean isDisplayValueOnly() {
+        if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
+        ValueBinding vb = getValueBinding("displayValueOnly");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_DISPLAYVALUEONLY;
+    }
+
+    public void setDisplayValueOnly(boolean displayValueOnly) {
+        _displayValueOnly = Boolean.valueOf(displayValueOnly);
+    }
+
+    public String getDisplayValueOnlyStyle() {
+        if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyle");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
+        _displayValueOnlyStyle = displayValueOnlyStyle;
+    }
+
+    public String getDisplayValueOnlyStyleClass() {
+        if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
+        ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+    }
+
+    public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {
+        _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
+    }
+
+    public boolean isRendered()
+    {
+        if (!UserRoleUtils.isVisibleOnUserRole(this)) return false;
+        return super.isRendered();
+    }
+
+    public Object saveState(FacesContext context)
+    {
+        Object values[] = new Object[6];
+        values[0] = super.saveState(context);
+        values[1] = _enabledOnUserRole;
+        values[2] = _visibleOnUserRole;
+        values[3] = _displayValueOnly;
+        values[4] = _displayValueOnlyStyle;
+        values[5] = _displayValueOnlyStyleClass;
+        return ((Object) (values));
+    }
+
+    public void restoreState(FacesContext context, Object state)
+    {
+        Object values[] = (Object[])state;
+        super.restoreState(context, values[0]);
+        _enabledOnUserRole = (String)values[1];
+        _visibleOnUserRole = (String)values[2];
+        _displayValueOnly = (Boolean)values[3];
+        _displayValueOnlyStyle = (String)values[4];
+        _displayValueOnlyStyleClass = (String)values[5];
+    }
+    //------------------ GENERATED CODE END ---------------------------------------
+
+    private Boolean _escape = null;
+    private static final boolean DEFAULT_ESCAPE = true;
+
+    public void setEscape(boolean escape)
+    {
+        _escape = Boolean.valueOf(escape);
+    }
+
+    public boolean isEscape()
+    {
+        if (_escape != null) return _escape.booleanValue();
+        ValueBinding vb = getValueBinding("escape");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
+    }
+}

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/SortCriterion.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/SortableModel.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message