JBoss Rich Faces SVN: r5106 - trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-29 09:16:29 -0500 (Sat, 29 Dec 2007)
New Revision: 5106
Added:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java
Removed:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxImage.java
Log:
Added: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java (rev 0)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxArrowImage.java 2007-12-29 14:16:29 UTC (rev 5106)
@@ -0,0 +1,73 @@
+package org.richfaces.renderkit.images;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.util.Date;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.resource.GifRenderer;
+import org.ajax4jsf.resource.InternetResourceBuilder;
+import org.ajax4jsf.resource.Java2Dresource;
+import org.ajax4jsf.resource.ResourceContext;
+import org.ajax4jsf.util.HtmlColor;
+import org.ajax4jsf.util.Zipper2;
+import org.richfaces.skin.Skin;
+import org.richfaces.skin.SkinFactory;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public class ComboBoxArrowImage extends Java2Dresource{
+
+ private static final Dimension dimensions = new Dimension(15, 15);
+
+ public ComboBoxArrowImage() {
+ setRenderer(new GifRenderer());
+ setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
+ }
+
+ protected Dimension getDimensions(ResourceContext resourceContext) {
+ return dimensions;
+ }
+ public Dimension getDimensions(FacesContext facesContext, Object data) {
+ return dimensions;
+ }
+
+ protected Object deserializeData(byte[] objectArray) {
+ if (objectArray == null) {
+ return null;
+ }
+ return new Integer(new Zipper2(objectArray).nextIntColor());
+ }
+
+ protected Object getDataToStore(FacesContext context, Object data) {
+ Skin skin = SkinFactory.getInstance().getSkin(context);
+ String skinParameter = "headerTextColor";
+ String headerTextColor = (String) skin.getParameter(context, skinParameter);
+ if (null == headerTextColor || "".equals(headerTextColor)) {
+ Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
+ headerTextColor = (String) defaultSkin.getParameter(context, skinParameter);
+ }
+
+ int intValue = HtmlColor.decode( headerTextColor == null ? "#000000":headerTextColor ).getRGB();
+ byte[] ret = new byte[3];
+ new Zipper2(ret).addColor(intValue);
+
+ return ret;
+ }
+
+ protected void paint(ResourceContext context, Graphics2D g2d) {
+ Integer color = (Integer) restoreData(context);
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.setColor(new Color(color.intValue()));
+ g2d.drawLine(4,5,10,5);
+ g2d.drawLine(5,6,9,6);
+ g2d.drawLine(6,7,8,7);
+ g2d.drawLine(7,8,7,8);
+ }
+
+}
Deleted: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxImage.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxImage.java 2007-12-29 14:12:44 UTC (rev 5105)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxImage.java 2007-12-29 14:16:29 UTC (rev 5106)
@@ -1,73 +0,0 @@
-package org.richfaces.renderkit.images;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.util.Date;
-
-import javax.faces.context.FacesContext;
-
-import org.ajax4jsf.resource.GifRenderer;
-import org.ajax4jsf.resource.InternetResourceBuilder;
-import org.ajax4jsf.resource.Java2Dresource;
-import org.ajax4jsf.resource.ResourceContext;
-import org.ajax4jsf.util.HtmlColor;
-import org.ajax4jsf.util.Zipper2;
-import org.richfaces.skin.Skin;
-import org.richfaces.skin.SkinFactory;
-
-/**
- * @author Anton Belevich
- *
- */
-public class ComboBoxImage extends Java2Dresource{
-
- private static final Dimension dimensions = new Dimension(15, 15);
-
- public ComboBoxImage() {
- setRenderer(new GifRenderer());
- setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
- }
-
- protected Dimension getDimensions(ResourceContext resourceContext) {
- return dimensions;
- }
- public Dimension getDimensions(FacesContext facesContext, Object data) {
- return dimensions;
- }
-
- protected Object deserializeData(byte[] objectArray) {
- if (objectArray == null) {
- return null;
- }
- return new Integer(new Zipper2(objectArray).nextIntColor());
- }
-
- protected Object getDataToStore(FacesContext context, Object data) {
- Skin skin = SkinFactory.getInstance().getSkin(context);
- String skinParameter = "headerTextColor";
- String headerTextColor = (String) skin.getParameter(context, skinParameter);
- if (null == headerTextColor || "".equals(headerTextColor)) {
- Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
- headerTextColor = (String) defaultSkin.getParameter(context, skinParameter);
- }
-
- int intValue = HtmlColor.decode( headerTextColor == null ? "#000000":headerTextColor ).getRGB();
- byte[] ret = new byte[3];
- new Zipper2(ret).addColor(intValue);
-
- return ret;
- }
-
- protected void paint(ResourceContext context, Graphics2D g2d) {
- Integer color = (Integer) restoreData(context);
- g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
- g2d.setColor(new Color(color.intValue()));
- g2d.drawLine(4,5,10,5);
- g2d.drawLine(5,6,9,6);
- g2d.drawLine(6,7,8,7);
- g2d.drawLine(7,8,7,8);
- }
-
-}
17 years, 2 months
JBoss Rich Faces SVN: r5105 - trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-29 09:12:44 -0500 (Sat, 29 Dec 2007)
New Revision: 5105
Added:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java
Removed:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxBtnGradient.java
Log:
Deleted: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxBtnGradient.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxBtnGradient.java 2007-12-29 14:11:14 UTC (rev 5104)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxBtnGradient.java 2007-12-29 14:12:44 UTC (rev 5105)
@@ -1,16 +0,0 @@
-/**
- *
- */
-package org.richfaces.renderkit.images;
-
-import org.richfaces.renderkit.html.BaseGradient;
-
-/**
- * @author Anton Belevich
- *
- */
-public class ComboBoxBtnGradient extends BaseGradient {
- public ComboBoxBtnGradient() {
- super(30,50 , 20,"generalBackgroundColor", "tabBackgroundColor");
- }
-}
Added: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java (rev 0)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxButtonGradient.java 2007-12-29 14:12:44 UTC (rev 5105)
@@ -0,0 +1,16 @@
+/**
+ *
+ */
+package org.richfaces.renderkit.images;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public class ComboBoxButtonGradient extends BaseGradient {
+ public ComboBoxButtonGradient() {
+ super(30,50 , 20,"generalBackgroundColor", "tabBackgroundColor");
+ }
+}
17 years, 2 months
JBoss Rich Faces SVN: r5104 - in management/design: pickList and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2007-12-29 09:11:14 -0500 (Sat, 29 Dec 2007)
New Revision: 5104
Added:
management/design/pickList/
management/design/pickList/images/
management/design/pickList/images/back.gif
management/design/pickList/images/bg_header.png
management/design/pickList/images/bg_press.png
management/design/pickList/images/move.gif
management/design/pickList/pickList.html
Log:
Added: management/design/pickList/images/back.gif
===================================================================
(Binary files differ)
Property changes on: management/design/pickList/images/back.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design/pickList/images/bg_header.png
===================================================================
(Binary files differ)
Property changes on: management/design/pickList/images/bg_header.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design/pickList/images/bg_press.png
===================================================================
(Binary files differ)
Property changes on: management/design/pickList/images/bg_press.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design/pickList/images/move.gif
===================================================================
(Binary files differ)
Property changes on: management/design/pickList/images/move.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design/pickList/pickList.html
===================================================================
--- management/design/pickList/pickList.html (rev 0)
+++ management/design/pickList/pickList.html 2007-12-29 14:11:14 UTC (rev 5104)
@@ -0,0 +1,74 @@
+
+<html>
+<head>
+<title>pickList</title>
+<style>
+
+ .pick_list{
+ font-family : Arial;
+ font-size :11px;
+ width : 200px;
+ height : 150px;
+ background : #FFFFFF; /*tableBackgroundColor*/
+ border : 1px solid #C0C0C0; /*tableBorderColor*/
+ }
+
+ .pick_button{
+ background : url(images/bg_header.png) /*from additionalBackgroundColor to trimColor*/ top left #C6D6EA /*trimColor*/ repeat-x;
+ cursor : pointer;
+ font-family : Arial;
+ font-size :11px;
+ border : 1px solid #c0c0c0; /*selectControlColor*/
+ padding : 0px 0px 0px 0px;
+ margin : 3px;
+ }
+ .pick_button_light{
+ background : url(images/bg_header.png) /*from additionalBackgroundColor to headerGradientColor*/ top left #C6D6EA /*trimColor*/ repeat-x;
+ cursor : pointer;
+ font-family : Arial;
+ font-size :11px;
+ border : 1px solid #E79A00; /*selectControlColor*/
+ padding : 0px 0px 0px 0px;
+ margin : 3px;
+ }
+ .pick_button_press{
+ background : url(images/bg_press.png) /*from additionalBackgroundColor to trimColor*/ top left repeat-x #EAF0F8; /* additionalBackgroundColor*/
+ cursor : pointer;
+ font-family : Arial;
+ font-size :11px;
+ border : 1px solid #E79A00; /*selectControlColor*/
+ padding : 0px 0px 0px 0px;
+ margin : 3px;
+ }
+</style>
+</head>
+
+<body style="padding : 20px">
+
+<table>
+ <tr>
+ <td>
+ <select class="pick_list pick_outputlist" id="" name="" multiple="true" size="5">
+ <option value="polecat">polecat</option>
+ <option value="suricate">suricate</option>
+ </select>
+ </td>
+ <td>
+ <button class="pick_button" onmouseover="this.className='pick_button_light'" onmousedown="this.className='pick_button_press'" onmouseup="this.className='pick_button'" onmouseout="this.className='pick_button'"><img src="images/move.gif" width="15" height="15" alt="" border="0"></button><br/>
+ <button class="pick_button" onmouseover="this.className='pick_button_light'" onmousedown="this.className='pick_button_press'" onmouseup="this.className='pick_button'" onmouseout="this.className='pick_button'"><img src="images/back.gif" width="15" height="15" alt="" border="0"></button>
+ </td>
+ <td>
+ <select class="pick_list pick_outputlist" id="" name="" multiple="true" size="5">
+ <option value="cat">cat</option> <option value="dog">dog</option>
+ <option value="marshotter">marshotter</option></select>
+ </select>
+ </td>
+ </tr>
+</table>
+
+
+
+
+
+</body>
+</html>
17 years, 2 months
JBoss Rich Faces SVN: r5103 - in trunk/sandbox/ui/combobox/src/main: java/org/richfaces/renderkit/images and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-29 09:11:08 -0500 (Sat, 29 Dec 2007)
New Revision: 5103
Added:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxBtnGradient.java
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxInputGradient.java
Removed:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxGradient.java
Modified:
trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxImage.java
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
new mockup
Modified: trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml
===================================================================
--- trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml 2007-12-29 13:42:29 UTC (rev 5102)
+++ trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml 2007-12-29 14:11:08 UTC (rev 5103)
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<resource-config>
- <resource class="org.richfaces.renderkit.images.ComboBoxGradient">
- <name>org.richfaces.renderkit.images.ComboBoxGradient</name>
+ <resource class="org.richfaces.renderkit.images.ComboBoxBtnGradient">
+ <name>org.richfaces.renderkit.images.ComboBoxBtnGradient</name>
</resource>
+ <resource class="org.richfaces.renderkit.images.ComboBoxInputGradient">
+ <name>org.richfaces.renderkit.images.ComboBoxInputGradient</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.images.ComboBoxImage">
+ <name>org.richfaces.renderkit.images.ComboBoxImage</name>
+ </resource>
</resource-config>
Added: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxBtnGradient.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxBtnGradient.java (rev 0)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxBtnGradient.java 2007-12-29 14:11:08 UTC (rev 5103)
@@ -0,0 +1,16 @@
+/**
+ *
+ */
+package org.richfaces.renderkit.images;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public class ComboBoxBtnGradient extends BaseGradient {
+ public ComboBoxBtnGradient() {
+ super(30,50 , 20,"generalBackgroundColor", "tabBackgroundColor");
+ }
+}
Deleted: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxGradient.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxGradient.java 2007-12-29 13:42:29 UTC (rev 5102)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxGradient.java 2007-12-29 14:11:08 UTC (rev 5103)
@@ -1,16 +0,0 @@
-/**
- *
- */
-package org.richfaces.renderkit.images;
-
-import org.richfaces.renderkit.html.BaseGradient;
-
-/**
- * @author Anton Belevich
- *
- */
-public class ComboBoxGradient extends BaseGradient {
- public ComboBoxGradient() {
- super(30, 50, 20,"headerGradientColor", "headerBackgroundColor");
- }
-}
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxImage.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxImage.java 2007-12-29 13:42:29 UTC (rev 5102)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxImage.java 2007-12-29 14:11:08 UTC (rev 5103)
@@ -64,10 +64,10 @@
Integer color = (Integer) restoreData(context);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setColor(new Color(color.intValue()));
- g2d.drawLine(5,5,11,5);
- g2d.drawLine(6,6,10,6);
- g2d.drawLine(7,7,9,7);
- g2d.drawLine(8,8,8,8);
+ g2d.drawLine(4,5,10,5);
+ g2d.drawLine(5,6,9,6);
+ g2d.drawLine(6,7,8,7);
+ g2d.drawLine(7,8,7,8);
}
}
Added: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxInputGradient.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxInputGradient.java (rev 0)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxInputGradient.java 2007-12-29 14:11:08 UTC (rev 5103)
@@ -0,0 +1,16 @@
+/**
+ *
+ */
+package org.richfaces.renderkit.images;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public class ComboBoxInputGradient extends BaseGradient {
+ public ComboBoxInputGradient() {
+ super(30, 50, 12, "additionalBackgroundColor", "controlBackgroundColor");
+ }
+}
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2007-12-29 13:42:29 UTC (rev 5102)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2007-12-29 14:11:08 UTC (rev 5103)
@@ -37,6 +37,81 @@
cursor:pointer;
}
+
+.rich_cb_width {
+ width : 150px;
+}
+
+.rich_cb_font {
+ font-size : 11px/*generalSizeFont*/; font-family : arial/*generalFamilyFont*/; color : #000000/*generalTextColor*/
+}
+
+.rich_cb_strut {
+ position : relative;
+ visibility : hidden;
+ margin : 0px; padding : 2px;
+}
+
+.rich_cb_shell {
+ position : relative;
+}
+
+.rich_cb_field {
+ position : absolute;
+ top : 0px; left : 0;
+ padding-right :20px;
+ padding-left :3px;
+ margin : 0px;
+ border : 1px solid #c0c0c0;
+ background-position:left top;
+ background-repeat:repeat-x;
+ border-color: #BED6F8 rgb(255, 255, 255) #BED6F8 rgb(190, 214, 248);
+} /*panelBorderColor*/
+
+.rich_cb_button {
+ position : absolute;
+ top : 0px;
+ right : 0;
+ width : 17px;
+ margin : 0px;
+ border : 1px solid #c0c0c0;
+ border-color: #BED6F8 rgb(190, 214, 248) #BED6F8 rgb(190, 214, 248);
+} /*panelBorderColor*/
+
+.rich_cb_button_bg {
+ background : top repeat-x #C7D7EC;
+}
+
+.rich_cb_button_bg_press {
+ background : url(images/bg_press.png) repeat-x bottom #C7D7EC
+} /*gradient - from tabBackgroundColor to generalBackgroundColor, background-color - tabBackgroundColor*/
+
+.rich_cb_button_arrow {
+ background : center no-repeat; cursor : pointer;
+}
+
+
]]>
+
</f:verbatim>
+ /*gradient - from generalBackgroundColor to tabBackgroundColor, background-color - tabBackgroundColor*/
+ <u:selector name=".rich_cb_button_bg">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.images.ComboBoxBtnGradient" />
+ </u:style>
+ </u:selector>
+
+ <u:selector name=".rich_cb_field">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.images.ComboBoxInputGradient" />
+ </u:style>
+ </u:selector>
+
+ <u:selector name=".rich_cb_button_arrow">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.images.ComboBoxImage" />
+ </u:style>
+ </u:selector>
+
+
</f:template>
\ No newline at end of file
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-29 13:42:29 UTC (rev 5102)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-29 14:11:08 UTC (rev 5103)
@@ -17,21 +17,24 @@
scripts/comboboxUtils.js,
scripts/combobox.js
</h:scripts>
-
- <f:resource name="org.richfaces.renderkit.html.images.SpinnerButtonDown" var="down_arrow" />
-
+
<f:clientid var="clientId" />
- <div id="#{clientId}">
- <div id="comboboxControl#{clientId}" class="" style="position:relative;">
- <input id="comboboxField#{clientId}" class="" type="text" size="20" autocomplete="off"/>
- <img id="comboboxButton#{clientId}" class="" style="position:absolute; top:0pt; border:1px solid black;" src="#{combo_img}"/>
+
+ <div id="comboboxControl#{clientId}" class="rich_cb_width rich_cb_font rich_cb_shell">
+ <input id="comboboxField#{clientId}" class="rich_cb_width rich_cb_font rich_cb_field" type="text" size="20" autocomplete="off">
+ </input>
+ <input readonly="" type="text" value="" class="rich_cb_button rich_cb_font rich_cb_button_bg">
+ </input>
+ <input id="comboboxButton#{clientId}" readonly="" type="text" value="" class="rich_cb_button rich_cb_font rich_cb_button_arrow">
+ </input>
+ <input type="text" class="rich_cb_width rich_cb_strut rich_cb_font">
+ </input>
+ <div id="list#{clientId}" style="display:none" class="rich-combobox-list">
+ <f:call name="encodeItems"/>
</div>
- <div id="listParent#{clientId}" style="display:none" class="rich-combobox-list">
- <div id="list#{clientId}">
- <f:call name="encodeItems"/>
- </div>
- </div>
</div>
+
+
<script type="text/javascript">
var combobox = new Richfaces.ComboBox("#{clientId}",
"list#{clientId}",
17 years, 2 months
JBoss Rich Faces SVN: r5102 - branches/3.1.x/ui/tooltip/src/test/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-29 08:42:29 -0500 (Sat, 29 Dec 2007)
New Revision: 5102
Modified:
branches/3.1.x/ui/tooltip/src/test/java/org/richfaces/renderkit/html/ToolTipRendererTest.java
Log:
failing build fixed
Modified: branches/3.1.x/ui/tooltip/src/test/java/org/richfaces/renderkit/html/ToolTipRendererTest.java
===================================================================
--- branches/3.1.x/ui/tooltip/src/test/java/org/richfaces/renderkit/html/ToolTipRendererTest.java 2007-12-29 11:07:41 UTC (rev 5101)
+++ branches/3.1.x/ui/tooltip/src/test/java/org/richfaces/renderkit/html/ToolTipRendererTest.java 2007-12-29 13:42:29 UTC (rev 5102)
@@ -1,13 +1,10 @@
package org.richfaces.renderkit.html;
-import java.io.IOException;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.faces.component.UIComponent;
import javax.faces.component.html.HtmlOutputText;
-import javax.faces.context.FacesContext;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.richfaces.component.UIToolTip;
@@ -104,7 +101,8 @@
public void testBuildEventOptions(){
- Map eventOptions = renderer.buildEventOptions(facesContext, toolTip);
+ Map eventOptions = renderer.buildEventOptions(facesContext, toolTip,
+ toolTip.getParent().getClientId(facesContext));
assertNotNull(eventOptions);
assertNotNull(eventOptions.get("oncomplete"));
}
17 years, 2 months
JBoss Rich Faces SVN: r5101 - branches/3.1.x/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-12-29 06:07:41 -0500 (Sat, 29 Dec 2007)
New Revision: 5101
Modified:
branches/3.1.x/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss
Log:
RF-1802
Modified: branches/3.1.x/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss
===================================================================
--- branches/3.1.x/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss 2007-12-29 11:07:15 UTC (rev 5100)
+++ branches/3.1.x/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss 2007-12-29 11:07:41 UTC (rev 5101)
@@ -10,7 +10,8 @@
margin: 0px;
background-position: left top;
background-repeat: repeat-x;
- border: 1px solid;
+ border-style: solid;
+ border-width: 1px 0px 1px 1px;
}
.dr-spnr-i {
17 years, 2 months
JBoss Rich Faces SVN: r5100 - trunk/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-12-29 06:07:15 -0500 (Sat, 29 Dec 2007)
New Revision: 5100
Modified:
trunk/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss
Log:
RF-1802
Modified: trunk/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss
===================================================================
--- trunk/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss 2007-12-28 21:04:53 UTC (rev 5099)
+++ trunk/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/css/spinner.xcss 2007-12-29 11:07:15 UTC (rev 5100)
@@ -10,7 +10,8 @@
margin: 0px;
background-position: left top;
background-repeat: repeat-x;
- border: 1px solid;
+ border-style: solid;
+ border-width: 1px 0px 1px 1px;
}
.dr-spnr-i {
17 years, 2 months
JBoss Rich Faces SVN: r5099 - trunk/sandbox/samples/combobox-sample/src/main/java/org/richfaces/samples.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-12-28 16:04:53 -0500 (Fri, 28 Dec 2007)
New Revision: 5099
Modified:
trunk/sandbox/samples/combobox-sample/src/main/java/org/richfaces/samples/Bean.java
Log:
test data
Modified: trunk/sandbox/samples/combobox-sample/src/main/java/org/richfaces/samples/Bean.java
===================================================================
--- trunk/sandbox/samples/combobox-sample/src/main/java/org/richfaces/samples/Bean.java 2007-12-28 21:00:53 UTC (rev 5098)
+++ trunk/sandbox/samples/combobox-sample/src/main/java/org/richfaces/samples/Bean.java 2007-12-28 21:04:53 UTC (rev 5099)
@@ -21,7 +21,8 @@
package org.richfaces.samples;
-import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
/**
@@ -30,20 +31,19 @@
*/
public class Bean {
- List suggestions = new ArrayList() ;
+ String suggestions = "Alabama,Alaska,Arizona,Arkansas,California,Colorado,Connecticut,Delaware,Florida,Maryland,Massachusetts,Michigan,Georgia,Hawaii,Idaho,Indiana,Iowa,Kansas,Kentucky,Louisiana,Maine,Minnesota,Mississippi,Missouri,Montana,Nebraska";
public Bean() {
- for (int i = 0; i < 10; i++) {
- suggestions.add("suggestion: " + i );
- }
}
public List getSuggestions() {
- return suggestions;
+ List result = Arrays.asList(suggestions.split(","));
+ Collections.shuffle(result);
+ return result;
}
public void setSuggestions(List suggestions) {
- this.suggestions = suggestions;
+ //this.suggestions = suggestions;
}
}
\ No newline at end of file
17 years, 2 months
JBoss Rich Faces SVN: r5098 - in trunk/sandbox/ui/combobox/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-12-28 16:00:53 -0500 (Fri, 28 Dec 2007)
New Revision: 5098
Modified:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
filtering of data was added
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2007-12-28 20:57:43 UTC (rev 5097)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2007-12-28 21:00:53 UTC (rev 5098)
@@ -12,6 +12,9 @@
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.javascript.JSFunction;
+import org.ajax4jsf.javascript.JSFunctionDefinition;
+import org.ajax4jsf.javascript.JSReference;
+import org.ajax4jsf.javascript.ScriptString;
import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
@@ -97,4 +100,23 @@
Collections.sort(suggestionValues); //FIXME
return ScriptUtils.toScript(suggestionValues);
}
+
+ public String getAsEventHandler(FacesContext context, UIComponent component, String attributeName) {
+ String event = (String) component.getAttributes().get(attributeName);
+ ScriptString result = JSReference.NULL;
+
+ if (event != null) {
+ event = event.trim();
+
+ if (event.length() != 0) {
+ JSFunctionDefinition function = new JSFunctionDefinition();
+ function.addParameter("event");
+ function.addToBody(event);
+
+ result = function;
+ }
+ }
+
+ return ScriptUtils.toScript(result);
+ }
}
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2007-12-28 20:57:43 UTC (rev 5097)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2007-12-28 21:00:53 UTC (rev 5098)
@@ -3,15 +3,19 @@
Richfaces.ComboBox.prototype = {
- initialize: function(combobox, listId, fieldId, buttonId, classes, listWidth, listHeight, itemsText, directInputSuggestions, filterNewValue) {
+ initialize: function(combobox, listId, fieldId, buttonId, classes, listWidth, listHeight, itemsText, directInputSuggestions, filterNewValue, onlistcall, onselected, defaultMessage) {
this.directInputSuggestions = directInputSuggestions;
this.filterNewValue = filterNewValue;
this.combobox = $(combobox);
- this.comboList = new Richfaces.ComboBoxList(listId, classes, listWidth, listHeight, itemsText);
+ this.comboList = new Richfaces.ComboBoxList(listId, classes, listWidth, listHeight, itemsText, onlistcall);
this.field = $(fieldId);
this.button = $(buttonId);
+ this.defaultMessage = defaultMessage;
+
+ this.onselected = onselected;
+
this.initCombobox();
},
@@ -23,6 +27,10 @@
this.comboList.listParent.observe("mousemove", function(e){this.listListener(e)}.bindAsEventListener(this));
this.comboList.listParent.observe("click", function(e){this.valueHandler(e);}.bindAsEventListener(this));
+
+ if (this.onselected) {
+ this.combobox.observe("rich:onselected", this.onselected);
+ }
},
clickHandler : function(event) {
@@ -44,7 +52,7 @@
},
valueHandler : function(event) {
- this.setValue();
+ this.setValue(true);
this.comboList.hide();
},
@@ -53,6 +61,7 @@
var value = this.comboList.selectedItem.innerHTML;
if (toSetOnly) {
this.field.value = value;
+ this.combobox.fire("rich:onselected", {});
} else {
if (this.directInputSuggestions) {
var startInd = this.field.value.length;
@@ -64,16 +73,6 @@
},
keyboardManager : function(event) {
- /*if ((event.keyCode == Event.KEY_UP) || (event.keyCode == Event.KEY_DOWN)) {
- this.comboList.moveSelectedItem(event);
- } else if (event.keyCode == Event.KEY_RETURN) {
- this.setValue(true);
- this.comboList.hide();
- Event.stop(event);
- } else if (event.keyCode == Event.KEY_BACKSPACE) {
- this.comboList.hide();
- }*/
-
switch (event.keyCode) {
case Event.KEY_RETURN :
this.setValue(true);
@@ -96,6 +95,9 @@
focusHandler : function(event) {
this.comboList.hide();
+ if (this.field.value == "") {
+ this.field.value = this.defaultMessage;
+ }
},
dataUpdating : function(event) {
@@ -104,7 +106,14 @@
this.comboList.dataFilter(this.field.value);
this.comboList.show();
} else {
- //TODO
+ if (!this.comboList.visible()) {
+ this.comboList.show();
+ }
+ var item = this.comboList.findItemByText(this.field.value);
+ if (item) {
+ this.comboList.selectItem(this.comboList.findItemByText(this.field.value));
+ this.comboList.scrollingUpToSdItem();
+ }
}
if (event.keyCode != Event.KEY_BACKSPACE ) {
@@ -117,14 +126,18 @@
Richfaces.ComboBoxList = Class.create();
Richfaces.ComboBoxList.prototype = {
- initialize: function(listId, classes, width, height, itemsText) {
+ initialize: function(listId, classes, width, height, itemsText, onlistcall) {
this.list = $(listId);
this.listParent = this.list.parentNode;
this.itemsText = itemsText;
- //this.items = this.getItems();
+ this.onlistcall = onlistcall;
+ if (this.onlistcall) {
+ this.listParent.observe("rich:onlistcall", this.onlistcall);
+ }
+
this.classes = classes;
this.selectedItem = null;
@@ -150,6 +163,8 @@
this.selectItem(curItems[0]);
}
this.listParent.show();
+ this.listParent.fire("rich:onlistcall", {});
+
},
hide : function() {
@@ -187,6 +202,11 @@
Event.stop(event);
},
+ scrollingUpToSdItem : function() {
+ var increment = (Richfaces.ComboBoxList.getElemXY(this.selectedItem).top - this.listParent.scrollTop) - Richfaces.ComboBoxList.getElemXY(this.listParent).top;
+ this.listParent.scrollTop += increment;
+ },
+
/* items library*/
selectItem : function(item) {
if (this.selectedItem) {
@@ -258,6 +278,15 @@
return items;
},
+ findItemByText : function(text) {
+ for (var i = 0; i < this.itemsText.length; i++) {
+ var itText = this.itemsText[i];
+ if (itText.substr(0, text.length).toLowerCase() == text.toLowerCase()) { //FIXME: to optimaize
+ return this.list.childNodes[i];
+ }
+ }
+ },
+
createNewList : function(items) {
//TODO: write code for IE
var tempList = this.list.cloneNode(false);
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-28 20:57:43 UTC (rev 5097)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-28 21:00:53 UTC (rev 5098)
@@ -37,6 +37,8 @@
"list#{clientId}",
"comboboxField#{clientId}",
"comboboxButton#{clientId}", Richfaces.ComboBoxList.CLASSES, 100, 150,
- #{this:getItemsTextAsJSArray(context, component)}, true, true);
+ #{this:getItemsTextAsJSArray(context, component)}, false, false,
+ #{this:getAsEventHandler(context, component, "onlistcall")},
+ #{this:getAsEventHandler(context, component, "onselected")});
</script>
</f:root>
\ No newline at end of file
17 years, 2 months
JBoss Rich Faces SVN: r5097 - in branches/3.1.x: framework/impl/src/main/java/org/ajax4jsf/renderkit and 14 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-28 15:57:43 -0500 (Fri, 28 Dec 2007)
New Revision: 5097
Modified:
branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java
branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java
branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java
branches/3.1.x/framework/impl/src/main/java/org/richfaces/component/util/FormUtil.java
branches/3.1.x/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxStatus.java
branches/3.1.x/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java
branches/3.1.x/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
branches/3.1.x/ui/effect/src/main/java/org/richfaces/component/UIEffect.java
branches/3.1.x/ui/effect/src/main/java/org/richfaces/renderkit/EffectRendererBase.java
branches/3.1.x/ui/effect/src/main/templates/effect.jspx
branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java
branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
branches/3.1.x/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java
branches/3.1.x/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java
branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITree.java
branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
Log:
http://jira.jboss.com/jira/browse/RF-1325
Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/component/AjaxActionComponent.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -35,6 +35,7 @@
import org.ajax4jsf.event.AjaxListener;
import org.ajax4jsf.event.AjaxSingleEvent;
import org.ajax4jsf.event.AjaxSource;
+import org.ajax4jsf.renderkit.RendererUtils;
/**
* @author shura (latest modification by $Author: alexsmirnov $)
@@ -73,9 +74,10 @@
String focus = getFocus();
if (null != focus) {
// search for component in tree.
- // TODO - use more pourful search, as in h:outputLabel
+ // XXX - use more pourful search, as in h:outputLabel
// component.
- UIComponent focusComponent = findComponent(focus);
+ UIComponent focusComponent = RendererUtils.getInstance().
+ findComponentFor(this, focus);
if (null != focusComponent) {
focus = focusComponent.getClientId(context);
}
Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererBase.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -55,7 +55,7 @@
*/
protected static final String JAVASCRIPT_NAMESPACE = "Exadel";
private static final Log log = LogFactory.getLog(RendererBase.class);
- private static final RendererUtils utils = new RendererUtils();
+ private static final RendererUtils utils = RendererUtils.getInstance();
private SkinFactory skinFactory = null;
private InternetResourceBuilder resourceBuilder = null;
Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -55,11 +55,10 @@
*
*/
public class RendererUtils {
-
- //we'd better use this instance multithreadly quickly
- private static final RendererUtils instance = new RendererUtils();
-
-
+
+ //we'd better use this instance multithreadly quickly
+ private static final RendererUtils instance = new RendererUtils();
+
public static final String DUMMY_FORM_ID = ":_form";
/**
* Substitutions for components properies names and HTML attributes names.
@@ -73,13 +72,19 @@
Arrays.sort(HTML.PASS_THRU_URI);
}
- /**
- * Use this method to get singleton instance of RendererUtils
- * @return singleton instance
- */
- public static RendererUtils getInstance() {
- return instance;
- }
+ //can be created by subclasses;
+ //administratively restricted to be created by package members ;)
+ protected RendererUtils() {
+ super();
+ }
+
+ /**
+ * Use this method to get singleton instance of RendererUtils
+ * @return singleton instance
+ */
+ public static RendererUtils getInstance() {
+ return instance;
+ }
/**
* Common HTML elements and attributes names.
Modified: branches/3.1.x/framework/impl/src/main/java/org/richfaces/component/util/FormUtil.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/richfaces/component/util/FormUtil.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/framework/impl/src/main/java/org/richfaces/component/util/FormUtil.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -36,12 +36,8 @@
*/
public class FormUtil {
- //TODO nick -> nick - howto get rid of this static instance?
- private static RendererUtils rendererUtils = new RendererUtils();
-
public static void throwEnclFormReqExceptionIfNeed(FacesContext context, UIComponent component) throws EnclosingFormRequiredException {
- //RendererUtils rendererUtils = new RendererUtils();
- UIForm form= rendererUtils.getNestingForm(context, component);
+ UIForm form= RendererUtils.getInstance().getNestingForm(context, component);
//TODO nick -> nick - switchType checking can be harmful here
String switchType = (String) component.getAttributes().get("switchType");
boolean isSwitchTypeClient = switchType == null ? false : switchType.equalsIgnoreCase("client") ;
Modified: branches/3.1.x/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxStatus.java
===================================================================
--- branches/3.1.x/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxStatus.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxStatus.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -31,6 +31,7 @@
import org.ajax4jsf.Messages;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.RendererUtils;
/**
@@ -242,7 +243,7 @@
String forValue = getFor();
UIComponent container;
if (null != forValue) {
- container = findComponent(forValue);
+ container = RendererUtils.getInstance().findComponentFor(this, forValue);
// 'for' attribute must be pointed to real container in view tree
if (null == container || !(container instanceof AjaxContainer)) {
throw new FacesException(
Modified: branches/3.1.x/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java
===================================================================
--- branches/3.1.x/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -35,6 +35,7 @@
import javax.faces.event.FacesEvent;
import javax.faces.model.ListDataModel;
+import org.ajax4jsf.renderkit.RendererUtils;
import org.richfaces.event.DataFilterSliderAdapter;
import org.richfaces.event.DataFilterSliderEvent;
import org.richfaces.event.DataFilterSliderListener;
@@ -139,7 +140,7 @@
// DataScroller may be a child of uiData
forComp = getParent();
} else {
- forComp = findComponent(forAttribute);
+ forComp = RendererUtils.getInstance().findComponentFor(this, forAttribute);
}
if (forComp == null) {
throw new IllegalArgumentException("could not find dataTable with id '"
Modified: branches/3.1.x/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
===================================================================
--- branches/3.1.x/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -21,12 +21,6 @@
package org.richfaces.component;
-import org.ajax4jsf.component.AjaxActionComponent;
-import org.ajax4jsf.renderkit.AjaxRendererUtils;
-import org.richfaces.event.DataScrollerEvent;
-import org.richfaces.event.DataScrollerListener;
-import org.richfaces.event.DataScrollerSource;
-
import javax.faces.FacesException;
import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
@@ -36,7 +30,14 @@
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
+import org.ajax4jsf.component.AjaxActionComponent;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.RendererUtils;
+import org.richfaces.event.DataScrollerEvent;
+import org.richfaces.event.DataScrollerListener;
+import org.richfaces.event.DataScrollerSource;
+
/** JSF component class */
//xxxx nick -> alex - extend UIComponentBase and
//create event listener & event classes to define PageSwitchEvent
@@ -201,7 +202,7 @@
throw new FacesException(
"could not find dataTable for datascroller " + this.getId());
} else {
- forComp = findComponent(forAttribute);
+ forComp = RendererUtils.getInstance().findComponentFor(this, forAttribute);
}
if (forComp == null) {
throw new IllegalArgumentException("could not find dataTable with id '"
Modified: branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
===================================================================
--- branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -30,6 +30,7 @@
import org.ajax4jsf.javascript.DnDScript;
import org.ajax4jsf.javascript.PrototypeScript;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.RendererUtils;
import org.richfaces.component.Draggable;
import org.richfaces.component.Dropzone;
import org.richfaces.event.DnDEvent;
@@ -143,7 +144,7 @@
if (indicatorId == null) {
String simpleId = draggable.getDragIndicator();
if (simpleId != null) {
- UIComponent indicator = component.findComponent(simpleId);
+ UIComponent indicator = RendererUtils.getInstance().findComponentFor(component, simpleId);
if (indicator != null) {
indicatorId = indicator.getClientId(context);
}
Modified: branches/3.1.x/ui/effect/src/main/java/org/richfaces/component/UIEffect.java
===================================================================
--- branches/3.1.x/ui/effect/src/main/java/org/richfaces/component/UIEffect.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/effect/src/main/java/org/richfaces/component/UIEffect.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -46,8 +46,6 @@
private static final Log log = LogFactory.getLog(UIEffect.class);
- private static RendererUtils rendererUtils = new RendererUtils();
-
/**
* @return JavaScript eventString. Rebuild on every call, since
* can be in loop ( as in dataTable ) with different parameters.
@@ -61,7 +59,7 @@
UIComponent targetComponent=null;
if (!"".equals(targetId)) {
- targetComponent=rendererUtils.findComponentFor(FacesContext.getCurrentInstance(),this,targetId);
+ targetComponent=RendererUtils.getInstance().findComponentFor(this,targetId);
}
if (targetComponent!=null) {
targetPart = "{targetId:'"+targetComponent.getClientId(FacesContext.getCurrentInstance())+"'}";
Modified: branches/3.1.x/ui/effect/src/main/java/org/richfaces/renderkit/EffectRendererBase.java
===================================================================
--- branches/3.1.x/ui/effect/src/main/java/org/richfaces/renderkit/EffectRendererBase.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/effect/src/main/java/org/richfaces/renderkit/EffectRendererBase.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -11,6 +11,7 @@
import org.ajax4jsf.javascript.JSEncoder;
import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
+import org.ajax4jsf.renderkit.RendererUtils;
import org.richfaces.component.UIEffect;
import org.richfaces.json.JSONTokener;
@@ -98,7 +99,7 @@
if ("id".equals(key)) {
Object value = x.nextValue();
- UIComponent component = effect.findComponent(value.toString());
+ UIComponent component = RendererUtils.getInstance().findComponentFor(effect, value.toString());
if (component != null) {
value = component.getClientId(context);
}
Modified: branches/3.1.x/ui/effect/src/main/templates/effect.jspx
===================================================================
--- branches/3.1.x/ui/effect/src/main/templates/effect.jspx 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/effect/src/main/templates/effect.jspx 2007-12-28 20:57:43 UTC (rev 5097)
@@ -25,7 +25,7 @@
String sid = (String) variables.getVariable("for");
variables.setVariable("attachObj","''");
if (! "".equals(sid)) {
- UIComponent forcomp = getUtils().findComponentFor(context, (UIComponent)component,sid);
+ UIComponent forcomp = getUtils().findComponentFor((UIComponent)component,sid);
if (forcomp != null) {
String cid= forcomp.getClientId(context);
variables.setVariable("forPart",
@@ -43,7 +43,7 @@
String tid = (String) variables.getVariable("targetId");
variables.setVariable("targetObj","''");
if (! "".equals(tid)) {
- UIComponent targetcomp = getUtils().findComponentFor(context, (UIComponent)component,tid);
+ UIComponent targetcomp = getUtils().findComponentFor(component,tid);
if (targetcomp != null) {
variables.setVariable("targetPart","{targetId:'"+targetcomp.getClientId(context)+"'}");
} else {
Modified: branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java
===================================================================
--- branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -8,12 +8,12 @@
import javax.faces.application.FacesMessage;
import javax.faces.application.FacesMessage.Severity;
-import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
+import org.ajax4jsf.renderkit.RendererUtils;
import org.ajax4jsf.resource.InternetResource;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.logging.Log;
@@ -95,7 +95,8 @@
if(forClientId.length() != 0){
- UIComponent result = findForComponent(context, forClientId,component);
+ UIComponent result = RendererUtils.getInstance().
+ findComponentFor(component, forClientId);
if (result == null) {
msgIter = CollectionUtils.EMPTY_COLLECTION.iterator();
} else {
@@ -259,67 +260,6 @@
}
- protected UIComponent findForComponent(FacesContext context, String forClientId, UIComponent component) throws IOException{
-
- if(null == forClientId || forClientId.length() == 0){
- return null;
- }
-
- UIComponent result = null;
- UIComponent parent = component;
-
- while(parent != null){
- result = parent.findComponent(forClientId);
-
- if(result != null){
- break;
- }
- parent = parent.getParent();
- }
-
- if(result == null){
- result = findComponentBelow(context.getViewRoot(), forClientId);
- }
-
- if(result == null){
- if(log.isWarnEnabled()){
- log.warn(COMPONENT_NOT_FOUND_IN_VIEW_WARN_MESSAGE + ":"+ forClientId);
- }
- }
-
- return result;
- }
-
- protected UIComponent findComponentBelow(UIComponent startComponent, String forClientId){
-
- UIComponent retComp = null;
-
- if(startComponent.getChildCount() == 0){
- return null;
- }
-
- List children = startComponent.getChildren();
-
- for(int i = 0, size = children.size(); i < size; i++){
- UIComponent comp = (UIComponent) children.get(i);
-
- if(comp instanceof NamingContainer){
- retComp = comp.findComponent(forClientId);
- }
-
- if(retComp == null){
- if(comp.getChildCount() > 0){
- retComp = findComponentBelow(comp, forClientId);
- }
- }
-
- if(retComp != null)
- break;
- }
-
- return retComp;
- };
-
protected boolean isAcceptableMessage(FacesMessage message){
boolean accept = false;
Modified: branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
===================================================================
--- branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -21,39 +21,39 @@
package org.richfaces.renderkit.html;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import javax.faces.FacesException;
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIColumn;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIData;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
import org.ajax4jsf.context.AjaxContext;
+import org.ajax4jsf.javascript.JSFunction;
+import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.renderkit.AjaxComponentRendererBase;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.renderkit.RendererBase;
+import org.ajax4jsf.renderkit.RendererUtils;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.ajax4jsf.renderkit.compiler.HtmlCompiler;
import org.ajax4jsf.renderkit.compiler.PreparedTemplate;
import org.ajax4jsf.renderkit.compiler.TemplateContext;
import org.ajax4jsf.resource.InternetResource;
import org.ajax4jsf.resource.TemplateCSSResource;
+import org.richfaces.component.AjaxSuggestionEvent;
+import org.richfaces.component.UISuggestionBox;
import org.richfaces.skin.Skin;
import org.richfaces.skin.SkinFactory;
-import org.ajax4jsf.javascript.JSFunction;
-import org.ajax4jsf.javascript.JSFunctionDefinition;
-import org.richfaces.component.AjaxSuggestionEvent;
-import org.richfaces.component.UISuggestionBox;
-import javax.faces.FacesException;
-import javax.faces.component.NamingContainer;
-import javax.faces.component.UIColumn;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIData;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.el.MethodBinding;
-import javax.faces.event.FacesEvent;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
/**
* Renderer for SuggestionBox component.
*/
@@ -272,8 +272,8 @@
String target = ((UISuggestionBox) component).getFor();
if (null != target) {
// Use parent since UIData - naming container
- UIComponent targetComponent = component.getParent().findComponent(
- target);
+ UIComponent targetComponent = RendererUtils.getInstance().
+ findComponentFor(component, target);
if (null != targetComponent) {
return targetComponent;
} else {
Modified: branches/3.1.x/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java
===================================================================
--- branches/3.1.x/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/togglePanel/src/main/java/org/richfaces/component/UIToggleControl.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -27,7 +27,6 @@
import javax.faces.FacesException;
import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
import javax.faces.el.ValueBinding;
@@ -82,7 +81,7 @@
if (null != target) {
- UIComponent targetComponent = control.findComponent(target);
+ UIComponent targetComponent = RendererUtils.getInstance().findComponentFor(control, target);
if (null != targetComponent) {
return (UITogglePanel)targetComponent;
} else {
@@ -145,7 +144,7 @@
} else {
//xxxx by nick - nick - potential compatibility break?
- panel = this.findComponent(panelId);
+ panel = RendererUtils.getInstance().findComponentFor(context, this, panelId);
if(panel == null) {
//xxx by nick - denis - please replace all RuntimeException with more concrete FacesException
throw new FacesException("Panel with id=" + panelId + " has not been found.");
Modified: branches/3.1.x/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java
===================================================================
--- branches/3.1.x/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/togglePanel/src/main/java/org/richfaces/renderkit/html/ToggleControlRenderer.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -131,8 +131,7 @@
} else {
// Server
//xxx by nick - denis - use org.ajax4jsf.renderkit.RendererUtils#getNestingForm(FacesContext, UIComponent)
- RendererUtils rendererUtils = new RendererUtils();
- UIForm Form= rendererUtils.getNestingForm(context, component);
+ UIForm Form= getUtils().getNestingForm(context, component);
String formId=null;
if (Form!=null){
formId = Form.getClientId(context);
Modified: branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
===================================================================
--- branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -135,18 +135,19 @@
}
- public Map buildEventOptions(FacesContext context, UIComponent component){
+ public Map buildEventOptions(FacesContext context, UIComponent component, String targetId){
Map eventOptions = AjaxRendererUtils.buildEventOptions(context, component);
+ String jsVarName = "Richfaces.tooltips[\'" + targetId + "\']";
//after element is subsituted in DOM tree, we have to re-create
//it's JS-reference, cause old one is already invalid
- String refreshTooltipInDOM = ";" + getJsVarName(context, component) + ".toolTip = $('" + component.getClientId(context) + "');" +
- ";" + getJsVarName(context, component) + ".toolTipContent = $('" + component.getClientId(context) + "content');";
+ String refreshTooltipInDOM = ";" + jsVarName + ".toolTip = $('" + component.getClientId(context) + "');" +
+ ";" + jsVarName + ".toolTipContent = $('" + component.getClientId(context) + "content');";
- String showNewToolTip = ";" + getJsVarName(context, component) + ".displayDiv();";
+ String showNewToolTip = ";" + jsVarName + ".displayDiv();";
// before element will be substituted in DOM tree, we need to hide toolTipe to avoid blinking
- String fireBeforeUpdateDOM = ";" + getJsVarName(context, component) + ".toolTip.style.display = 'none';";
+ String fireBeforeUpdateDOM = ";" + jsVarName + ".toolTip.style.display = 'none';";
//enable ajaxSingle mode, i.e. we do not need to submit all form controls to get tooltip content
@@ -204,10 +205,14 @@
writer.write(ret.toString());
}
+
+ private String getTargetId(FacesContext context, UIComponent component) {
+ return component.getParent().getClientId(context);
+ }
public String constructJSVariable(FacesContext context, UIComponent component) {
UIToolTip toolTip = (UIToolTip)component;
- String parentClientId = toolTip.getParent().getClientId(context);
+ String targetClientId = getTargetId(context, component);
StringBuffer ret = new StringBuffer();
String comma = ",";
String quot = "\"";
@@ -229,10 +234,10 @@
function.addParameter(ref);
String ajaxFunc = function.toScript();
- Map ajaxOptions = buildEventOptions(context, toolTip);
+ Map ajaxOptions = buildEventOptions(context, toolTip, targetClientId);
ret.append("new ToolTip(" + ScriptUtils.toScript(eventsMap)).append(comma).append(quot).append( toolTip.getClientId(context)).append(quot).append(comma).
- append(quot).append(parentClientId).append(quot).append(comma).
+ append(quot).append(targetClientId).append(quot).append(comma).
append(quot).append(toolTip.getMode()).append(quot).append(comma).
append(toolTip.isDisabled()).append(comma).
append(quot).append(toolTip.getDirection()).append(quot).append(comma).
@@ -245,10 +250,6 @@
}
- private String getJsVarName(FacesContext context, UIComponent component){
- return "Richfaces.tooltips[\'" + component.getParent().getClientId(context) + "\']";
- }
-
protected void doDecode(FacesContext context, UIComponent component) {
UIToolTip tooltip = (UIToolTip)component;
Modified: branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITree.java
===================================================================
--- branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -46,6 +46,7 @@
import org.ajax4jsf.model.ExtendedDataModel;
import org.ajax4jsf.model.Range;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.RendererUtils;
import org.apache.commons.collections.iterators.SingletonIterator;
import org.richfaces.component.events.TreeEvents;
import org.richfaces.component.state.TreeState;
@@ -805,9 +806,9 @@
public String getResolvedDragIndicator(FacesContext facesContext) {
String dragIndicator = getDragIndicator();
- UIComponent parent = getParent();
- if (dragIndicator != null && parent != null) {
- UIComponent indicator = parent.findComponent(dragIndicator);
+ if (dragIndicator != null) {
+ UIComponent indicator = RendererUtils.getInstance().
+ findComponentFor(this, dragIndicator);
if (indicator != null) {
return indicator.getClientId(facesContext);
}
Modified: branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
===================================================================
--- branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-12-28 20:13:58 UTC (rev 5096)
+++ branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-12-28 20:57:43 UTC (rev 5097)
@@ -15,6 +15,7 @@
import org.ajax4jsf.component.AjaxComponent;
import org.ajax4jsf.event.AjaxEvent;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.RendererUtils;
import org.richfaces.component.events.TreeEvents;
import org.richfaces.event.DragEvent;
import org.richfaces.event.DragListener;
@@ -356,13 +357,10 @@
UITree tree = getUITree();
if (tree != null) {
if (indicatorId != null) {
- //tree is naming container
- UIComponent parent = tree.getParent();
- if (parent != null) {
- UIComponent indicator = parent.findComponent(indicatorId);
- if (indicator != null) {
- return indicator.getClientId(facesContext);
- }
+ UIComponent indicator = RendererUtils.getInstance().
+ findComponentFor(this, indicatorId);
+ if (indicator != null) {
+ return indicator.getClientId(facesContext);
}
} else {
return tree.getResolvedDragIndicator(facesContext);
17 years, 2 months