JBoss Rich Faces SVN: r5086 - branches/3.1.x/ui/core/src/main/java/org/ajax4jsf/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-12-28 12:00:17 -0500 (Fri, 28 Dec 2007)
New Revision: 5086
Modified:
branches/3.1.x/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-1355
Modified: branches/3.1.x/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java
===================================================================
--- branches/3.1.x/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java 2007-12-28 16:32:38 UTC (rev 5085)
+++ branches/3.1.x/ui/core/src/main/java/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.java 2007-12-28 17:00:17 UTC (rev 5086)
@@ -37,8 +37,9 @@
import org.ajax4jsf.Messages;
import org.ajax4jsf.javascript.JSFunction;
-import org.ajax4jsf.renderkit.RendererBase;
+import org.ajax4jsf.renderkit.AjaxComponentRendererBase;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
+import org.ajax4jsf.resource.InternetResource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -49,12 +50,19 @@
* @author shura
*
*/
-public class HtmlCommandLinkRenderer extends RendererBase {
-
+public class HtmlCommandLinkRenderer extends AjaxComponentRendererBase {
+
+ private InternetResource[] _scripts = { getResource("/org/ajax4jsf/javascript/scripts/form.js") };
+
private static final Log _log = LogFactory.getLog(HtmlCommandLinkRenderer.class);
private static final String[] LINK_EXCLUSIONS = {"onclick","target","href"};
+ protected InternetResource[] getAdditionalScripts() {
+ // TODO Auto-generated method stub
+ return _scripts;
+ }
+
/* (non-Javadoc)
* @see org.ajax4jsf.renderkit.RendererBase#doDecode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
*/
16 years, 4 months
JBoss Rich Faces SVN: r5085 - management/design/comboBox/markup.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2007-12-28 11:32:38 -0500 (Fri, 28 Dec 2007)
New Revision: 5085
Added:
management/design/comboBox/markup/ComboBox_long.html
Modified:
management/design/comboBox/markup/comboBox.html
Log:
http://jira.jboss.com/jira/browse/RF-1217
Added: management/design/comboBox/markup/ComboBox_long.html
===================================================================
--- management/design/comboBox/markup/ComboBox_long.html (rev 0)
+++ management/design/comboBox/markup/ComboBox_long.html 2007-12-28 16:32:38 UTC (rev 5085)
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+ <title>Untitled</title>
+<style>
+.cb_width{ width : 150px;}
+.cb_font{ font-size : 11px/*generalSizeFont*/; font-family : arial/*generalFamilyFont*/; color : #000000/*generalTextColor*/}
+.cb_shell{ position : relative;}
+.cb_field{ position : absolute; top : 0px; left : 0; padding-right :20px; padding-left :3px; margin : 0px; border : 1px solid #c0c0c0;} /*panelBorderColor*/
+.cb_strut{ position : relative; visibility : hidden; margin : 0px; padding : 2px;}
+.cb_button{ position : absolute; top : 0px; right : 0; width : 17px; margin : 0px; border : 1px solid #c0c0c0; } /*panelBorderColor*/
+.cb_button_bg{ background : url(images/bg_btn.png) top repeat-x #C7D7EC;} /*gradient - from generalBackgroundColor to tabBackgroundColor, background-color - tabBackgroundColor*/
+.cb_button_bg_press{ background : url(images/bg_press.png) repeat-x bottom #C7D7EC} /*gradient - from tabBackgroundColor to generalBackgroundColor, background-color - tabBackgroundColor*/
+.cb_button_arrow{ background : url(images/down.gif) center no-repeat; cursor : pointer;}
+
+.cb_list_cord{ position : relative; font-size : 0px;d!isplay : none}/*DDL is hidden!!!!!*/
+.cb_list_position{ position : absolute; top:-5px; left:0px;}
+.cb_list_decoration{border : 1px solid #c0c0c0 /*panelBorderColor*/; padding : 0px; background : #FFFFFF; /*tableBackgroundColor*/}
+.cb_list_scroll{ overflow : auto; overflow-x : hidden; height : 100;}
+.cb_option{ padding : 2px; white-space : nowrap;}
+.cb_select{ padding : 1px; width : 100%; background : #C7D7EC; border : 1px dotted #000000;/*generalTextColor*/}
+</style>
+</head>
+
+<body style="margin : 30px">
+
+<select class="cb_font cb_width">
+ <option>Item Item Item Item Item Item Item Item Item Item <option>
+ <option>Item<option>
+ <option>Item<option>
+ <option>Item<option>
+ <option>Item<option>
+</select>
+ <br><br>
+<div class="cb_width cb_font cb_shell">
+ <input type="Text" value="Input text or select option" class="cb_width cb_font cb_field">
+ <input readonly="" type="Text" value="" class="cb_button cb_font cb_button_bg">
+ <input readonly="" type="Text" value="" class="cb_button cb_font cb_button_arrow">
+ <input type="Text"class="cb_width cb_strut cb_font"><div class="cb_list_cord">
+ <div class="cb_list_position cb_width">
+ <div class="cb_list_decoration">
+ <div class="cb_list_scroll">
+ <div class="cb_option cb_font">Option Option Option Option Option Option Option 1</div>
+ <div class="cb_option cb_font">Option 2</div>
+ <div class="cb_option cb_font">Option 3</div>
+ <div class="cb_option cb_font">Option 4</div>
+ <div class="cb_option cb_font cb_select">Opt</div>
+ <div class="cb_option cb_font">Option 6</div>
+ <div class="cb_option cb_font">Option 7</div>
+ <div class="cb_option cb_font">Option 8</div>
+ <div class="cb_option cb_font">Option 9</div>
+ <div class="cb_option cb_font">Option 0</div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+
+
+</body>
+</html>
Modified: management/design/comboBox/markup/comboBox.html
===================================================================
--- management/design/comboBox/markup/comboBox.html 2007-12-28 16:14:31 UTC (rev 5084)
+++ management/design/comboBox/markup/comboBox.html 2007-12-28 16:32:38 UTC (rev 5085)
@@ -4,29 +4,35 @@
<head>
<title>Untitled</title>
<style>
-.cb_width{ width : 150px; }
+.cb_width{ width : 150px;}
.cb_font{ font-size : 11px/*generalSizeFont*/; font-family : arial/*generalFamilyFont*/; color : #000000/*generalTextColor*/}
.cb_shell{ position : relative;}
-.cb_field{ position : absolute; top : 0px; left : 0;padding :1px 20px 1px 2px; margin : 0px; border : 1px solid #c0c0c0;} /*panelBorderColor*/
-.cb_strut{ position : relative; visibility : hidden; margin : 0px; padding : 1px;}
-.cb_button{ position : absolute; top : 0px; right : 0; width : 18px; padding : 1px; margin : 0px; border : 1px solid #c0c0c0; } /*panelBorderColor*/
+.cb_field{ position : absolute; top : 0px; left : 0; padding-right :20px; padding-left :3px; margin : 0px; border : 1px solid #c0c0c0;} /*panelBorderColor*/
+.cb_strut{ position : relative; visibility : hidden; margin : 0px; padding : 2px;}
+.cb_button{ position : absolute; top : 0px; right : 0; width : 17px; margin : 0px; border : 1px solid #c0c0c0; } /*panelBorderColor*/
.cb_button_bg{ background : url(images/bg_btn.png) top repeat-x #C7D7EC;} /*gradient - from generalBackgroundColor to tabBackgroundColor, background-color - tabBackgroundColor*/
.cb_button_bg_press{ background : url(images/bg_press.png) repeat-x bottom #C7D7EC} /*gradient - from tabBackgroundColor to generalBackgroundColor, background-color - tabBackgroundColor*/
-.cb_button_arrow{ background : url(images/down.gif) center no-repeat; cursor : pointer;}
+.cb_button_arrow{ background : url(images/down.gif) center no-repeat; cursor : pointer;}
-.cb_list_cord{ position : relative; font-size : 0px; /*display:none;*/ top: 2px;}/*DDL is hidden!!!!!*/
+.cb_list_cord{ position : relative; font-size : 0px;d!isplay : none}/*DDL is hidden!!!!!*/
.cb_list_position{ position : absolute; top:-5px; left:0px;}
-.cb_list_decoration{ border : 1px solid #c0c0c0 /*panelBorderColor*/; padding : 0px; background : #FFFFFF; /*tableBackgroundColor*/}
-.cb_list_scroll{ overflow : auto; width : 100%; height : 100;}
+.cb_list_decoration{border : 1px solid #c0c0c0 /*panelBorderColor*/; padding : 0px; background : #FFFFFF; /*tableBackgroundColor*/}
+.cb_list_scroll{ overflow : auto; overflow-x : hidden; height : 100;}
.cb_option{ padding : 2px; white-space : nowrap;}
-.cb_select{ padding : 1px; background : #C7D7EC; border : 1px dotted #000000;/*generalTextColor*/}
+.cb_select{ padding : 1px; width : 100%; background : #C7D7EC; border : 1px dotted #000000;/*generalTextColor*/}
</style>
</head>
<body style="margin : 30px">
-
-
+<select class="cb_font cb_width">
+ <option>Item<option>
+ <option>Item<option>
+ <option>Item<option>
+ <option>Item<option>
+ <option>Item<option>
+</select>
+ <br><br>
<div class="cb_width cb_font cb_shell">
<input type="Text" value="Input text or select option" class="cb_width cb_font cb_field">
<input readonly="" type="Text" value="" class="cb_button cb_font cb_button_bg">
@@ -52,5 +58,7 @@
</div>
+
+
</body>
</html>
16 years, 4 months
JBoss Rich Faces SVN: r5084 - 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 11:14:31 -0500 (Fri, 28 Dec 2007)
New Revision: 5084
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 15:58:20 UTC (rev 5083)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2007-12-28 16:14:31 UTC (rev 5084)
@@ -1,6 +1,7 @@
package org.richfaces.renderkit;
import java.io.IOException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -11,6 +12,7 @@
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.javascript.JSFunction;
+import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.richfaces.component.UIComboBox;
@@ -57,7 +59,7 @@
UIComboBox comboBox = (UIComboBox)component;
List <String> suggestionValues = comboBox.getSuggestionValues();
ResponseWriter writer = context.getResponseWriter();
-
+ Collections.sort(suggestionValues);
if (suggestionValues != null) {
for (Iterator <String> iterator = suggestionValues.iterator(); iterator.hasNext();) {
String suggestion = iterator .next();
@@ -87,4 +89,12 @@
return (function.toString() + ";");
}*/
+
+ public String getItemsTextAsJSArray(FacesContext context, UIComponent component) {
+ UIComboBox comboBox = (UIComboBox)component;
+ List <String> suggestionValues = comboBox.getSuggestionValues();
+
+ Collections.sort(suggestionValues); //FIXME
+ return ScriptUtils.toScript(suggestionValues);
+ }
}
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 15:58:20 UTC (rev 5083)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2007-12-28 16:14:31 UTC (rev 5084)
@@ -2,9 +2,9 @@
Richfaces.ComboBox = Class.create();
Richfaces.ComboBox.prototype = {
- initialize: function(combobox, listId, fieldId, buttonId, classes, listWidth, listHeight) {
+ initialize: function(combobox, listId, fieldId, buttonId, classes, listWidth, listHeight, itemsText) {
this.combobox = $(combobox);
- this.comboList = new Richfaces.ComboBoxList(listId, classes, listWidth, listHeight);
+ this.comboList = new Richfaces.ComboBoxList(listId, classes, listWidth, listHeight, itemsText);
this.field = $(fieldId);
this.button = $(buttonId);
@@ -15,16 +15,17 @@
this.button.observe("click", function(e){this.clickHandler(e);}.bindAsEventListener(this));
this.field.observe("keydown", function(e){this.keyboardManager(e);}.bindAsEventListener(this));
//this.field.observe("blur", function(e){this.focusHandler(e);}.bindAsEventListener(this));
- this.field.observe("change", function(e){this.dataUpdating(e);}.bindAsEventListener(this));
+ this.field.observe("keyup", function(e){this.dataUpdating(e);}.bindAsEventListener(this));
- this.comboList.list.observe("mousemove", function(e){this.listListener(e)}.bindAsEventListener(this));
- this.comboList.list.observe("click", function(e){this.valueHandler(e);}.bindAsEventListener(this));
+ this.comboList.listParent.observe("mousemove", function(e){this.listListener(e)}.bindAsEventListener(this));
+ this.comboList.listParent.observe("click", function(e){this.valueHandler(e);}.bindAsEventListener(this));
},
clickHandler : function(event) {
if (this.comboList.visible()) {
this.comboList.hide();
} else {
+ this.comboList.createDefaultList();
this.comboList.show();
}
this.field.focus();
@@ -39,11 +40,15 @@
},
valueHandler : function(event) {
- this.field.value = this.comboList.selectedItem.innerHTML;
+ this.setValue();
this.comboList.hide();
},
+ setValue : function() {
+ this.field.value = this.comboList.selectedItem.innerHTML;
+ },
+
keyboardManager : function(event) {
if ((event.keyCode == Event.KEY_UP) || (event.keyCode == Event.KEY_DOWN)) {
this.comboList.moveSelectedItem(event);
@@ -54,68 +59,83 @@
this.comboList.hide();
},
- dataUpdating : function() {
- this.comboList.setItems(this.comboList.dataFilter(this.field.value));
- this.comboList.show();
+ dataUpdating : function(event) {
+ //this.comboList.setItems(this.comboList.dataFilter(this.field.value));
+ if ((event.keyCode != Event.KEY_UP) && (event.keyCode != Event.KEY_DOWN)) {
+ this.comboList.dataFilter(this.field.value);
+ this.comboList.show();
+ }
+ this.setValue();
}
};
Richfaces.ComboBoxList = Class.create();
Richfaces.ComboBoxList.prototype = {
- initialize: function(listId, classes, width, height) {
+ initialize: function(listId, classes, width, height, itemsText) {
this.list = $(listId);
- this.items = this.getItems();
+ this.listParent = this.list.parentNode;
- this.currentItems = this.items;
+ this.itemsText = itemsText;
+ //this.items = this.getItems();
+
this.classes = classes;
this.selectedItem = null;
this.setSize(width, height);
},
+ createDefaultList : function() {
+ var items = new Array();
+ for (var i = 0; i < this.itemsText.length; i++) {
+ items.push(this.createItem(this.itemsText[i], this.classes.ITEM.NORMAL));
+ }
+ this.createNewList(items);
+ },
+
getItems : function() {
return this.list.childNodes;
},
show : function() {
- if (this.currentItems.length != 0) {
- this.selectItem(this.currentItems[0]);
+ var curItems = this.getItems();
+ if (curItems.length != 0) {
+ this.selectItem(curItems[0]);
}
- this.list.show();
+ this.listParent.show();
},
hide : function() {
this.resetState();
- this.list.hide();
+ this.listParent.hide();
},
visible : function() {
- return this.list.visible();
+ return this.listParent.visible();
},
setSize : function(width, height) {
- this.list.style.width = width + "px";
- this.list.style.height = height + "px";
+ this.listParent.style.width = width + "px";
+ this.listParent.style.height = height + "px";
},
scrolling : function(event) {
var increment;
- var listTop = Richfaces.ComboBoxList.getElemXY(this.list).top;
- var scrollTop = this.list.scrollTop;
+ var listTop = Richfaces.ComboBoxList.getElemXY(this.listParent).top;
+ var scrollTop = this.listParent.scrollTop;
var itemTop = Richfaces.ComboBoxList.getElemXY(this.selectedItem).top;
if ((event.keyCode == Event.KEY_UP) || (event.keyCode == 33)) {
increment = (itemTop - scrollTop) - listTop;
if (increment < 0) {
- this.list.scrollTop += increment;
+ this.listParent.scrollTop += increment;
}
} else if ((event.keyCode == Event.KEY_DOWN) || (event.keyCode == 34)) {
var itemBottom = itemTop + this.selectedItem.offsetHeight;
- var increment = (itemBottom - scrollTop) - (listTop + this.list.clientHeight);
+ var increment = (itemBottom - scrollTop) - (listTop + this.listParent.clientHeight);
if (increment > 0) {
- this.list.scrollTop += increment;
+ this.listParent.scrollTop += increment;
}
}
Event.stop(event);
@@ -142,7 +162,7 @@
getEventItem : function(event) {
var item = Event.findElement(event, "div");
- if ((item == null) || (item.id == this.list.id)) {
+ if ((item == null) || (item.id == this.listParent.id)) {
return;
}
return item;
@@ -165,31 +185,46 @@
},
itemsRearrangement : function(item, newItem) {
- this.normalizeItem(item);
+ //this.normalizeItem(item);
this.selectItem(newItem);
},
resetState : function() {
- this.normalizeItem(this.selectedItem);
+ if (this.selectedItem) {
+ this.normalizeItem(this.selectedItem);
+ }
this.selectedItem = null;
},
- setItems : function(newItems) {
- this.currentItems = newItems;
-
- this.list.innerHTML = newItems.join(""); //FIXME: to optimaize
+ dataFilter : function(text) {
+ this.createNewList(this.getFilteredItems(text));
},
- dataFilter : function(text) {
- var filteredData = new Array();
- for (var i = 0; i < this.items.length; i++) {
- var item = this.items[i];
- if (item.innerHTML.substr(0, text.length).toLowerCase() == text.toLowerCase()) { //FIXME: to optimaize
- filteredData.push(item);
+ getFilteredItems : function(text) {
+
+ var items = new Array();
+ 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
+ items.push(this.createItem(itText, this.classes.ITEM.NORMAL));
}
}
- return filteredData;
+ return items;
},
+
+ createNewList : function(items) {
+ //TODO: write code for IE
+ var tempList = this.list.cloneNode(false);
+ this.listParent.removeChild(this.listParent.firstChild);
+
+ tempList.innerHTML = items.join("");
+ this.listParent.appendChild(tempList);
+ this.list = this.listParent.firstChild;
+ },
+
+ createItem : function(text, className) {
+ return "<div class=" + className+ ">" + text + "</div>";
+ }
}
Richfaces.ComboBoxList.getElemXY = function(elem) {
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-28 15:58:20 UTC (rev 5083)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-28 16:14:31 UTC (rev 5084)
@@ -25,14 +25,17 @@
<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>
- <div id="list#{clientId}" style="display:none" class="rich-combobox-list">
- <f:call name="encodeItems"/>
+ <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}",
"comboboxField#{clientId}",
- "comboboxButton#{clientId}", Richfaces.ComboBoxList.CLASSES, 100, 150);
+ "comboboxButton#{clientId}", Richfaces.ComboBoxList.CLASSES, 100, 150,
+ #{this:getItemsTextAsJSArray(context, component)});
</script>
</f:root>
\ No newline at end of file
16 years, 4 months
JBoss Rich Faces SVN: r5083 - in trunk: samples/scrollableDataTableDemo/src/main/java/org/richfaces/demo/datagrid/model and 31 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-12-28 10:58:20 -0500 (Fri, 28 Dec 2007)
New Revision: 5083
Added:
trunk/sandbox/samples/sortingFilteringDemo/
trunk/sandbox/samples/sortingFilteringDemo/pom.xml
trunk/sandbox/samples/sortingFilteringDemo/src/
trunk/sandbox/samples/sortingFilteringDemo/src/main/
trunk/sandbox/samples/sortingFilteringDemo/src/main/java/
trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/
trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/
trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/
trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java
trunk/sandbox/samples/sortingFilteringDemo/src/main/resources/
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/index.jsp
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.xhtml
trunk/sandbox/samples/sortingFilteringDemo/src/test/
trunk/sandbox/samples/sortingFilteringDemo/src/test/java/
trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/
trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/
trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/sandbox/
trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/sandbox/BeanTest.java
trunk/sandbox/ui/sortableHeader/pom.xml
trunk/sandbox/ui/sortableHeader/src/
trunk/sandbox/ui/sortableHeader/src/main/
trunk/sandbox/ui/sortableHeader/src/main/java/
Modified:
trunk/samples/pom.xml
trunk/samples/scrollableDataTableDemo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java
trunk/samples/scrollableDataTableDemo/src/main/webapp/pages/scrollable-grid.xhtml
trunk/sandbox/api/pom.xml
trunk/sandbox/impl/pom.xml
trunk/sandbox/samples/combobox-sample/
trunk/sandbox/samples/pickList-sample/
trunk/sandbox/samples/pom.xml
trunk/sandbox/samples/progressBarDemo/
trunk/sandbox/ui/combobox/
trunk/sandbox/ui/pickList/
trunk/sandbox/ui/pom.xml
trunk/sandbox/ui/progressBAR/
trunk/sandbox/ui/sortableHeader/
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
Log:
Initial check in of sorting and filtering
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2007-12-28 15:45:44 UTC (rev 5082)
+++ trunk/samples/pom.xml 2007-12-28 15:58:20 UTC (rev 5083)
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
@@ -29,8 +27,7 @@
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<connectors>
- <connector
- implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>8080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
@@ -364,7 +361,7 @@
<tomahawk>1.1.5</tomahawk>
</properties>
<build>
- <plugins />
+ <plugins/>
</build>
<dependencies>
<dependency>
@@ -454,8 +451,8 @@
-->
<module>panelmenu-sample</module>
<module>rich-message-demo</module>
+ <module>scrollableDataTableDemo</module>
<!--
- <module>scrollableDataTableDemo</module>
<module>richfaces-ear-demo</module>
-->
@@ -463,5 +460,5 @@
<module>orderingListDemo</module>
<module>listShuttleDemo</module>
<module>columnsDemo</module>
- </modules>
+ </modules>
</project>
\ No newline at end of file
Modified: trunk/samples/scrollableDataTableDemo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java
===================================================================
--- trunk/samples/scrollableDataTableDemo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java 2007-12-28 15:45:44 UTC (rev 5082)
+++ trunk/samples/scrollableDataTableDemo/src/main/java/org/richfaces/demo/datagrid/model/Channel.java 2007-12-28 15:58:20 UTC (rev 5083)
@@ -235,9 +235,9 @@
}
public void addIssue(Issue issue) {
- /*if (issues.size() > 5) {
+ if (issues.size() > 5) {
return;
- }*/
+ }
issues.add(issue);
index.put(issue.getIndex(), issue);
}
Modified: trunk/samples/scrollableDataTableDemo/src/main/webapp/pages/scrollable-grid.xhtml
===================================================================
--- trunk/samples/scrollableDataTableDemo/src/main/webapp/pages/scrollable-grid.xhtml 2007-12-28 15:45:44 UTC (rev 5082)
+++ trunk/samples/scrollableDataTableDemo/src/main/webapp/pages/scrollable-grid.xhtml 2007-12-28 15:58:20 UTC (rev 5083)
@@ -30,6 +30,9 @@
color: red;
}
+
+
+
</style>
</head>
Modified: trunk/sandbox/api/pom.xml
===================================================================
--- trunk/sandbox/api/pom.xml 2007-12-28 15:45:44 UTC (rev 5082)
+++ trunk/sandbox/api/pom.xml 2007-12-28 15:58:20 UTC (rev 5083)
@@ -15,12 +15,6 @@
<artifactId>richfaces-api</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_03</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
Modified: trunk/sandbox/impl/pom.xml
===================================================================
--- trunk/sandbox/impl/pom.xml 2007-12-28 15:45:44 UTC (rev 5082)
+++ trunk/sandbox/impl/pom.xml 2007-12-28 15:58:20 UTC (rev 5083)
@@ -25,12 +25,7 @@
<artifactId>richfaces-test</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_03</version>
- <scope>provided</scope>
- </dependency>
+
</dependencies>
Property changes on: trunk/sandbox/samples/combobox-sample
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Property changes on: trunk/sandbox/samples/pickList-sample
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Modified: trunk/sandbox/samples/pom.xml
===================================================================
--- trunk/sandbox/samples/pom.xml 2007-12-28 15:45:44 UTC (rev 5082)
+++ trunk/sandbox/samples/pom.xml 2007-12-28 15:58:20 UTC (rev 5083)
@@ -21,5 +21,6 @@
<module>combobox-sample</module>
<module>progressBarDemo</module>
<module>pickList-sample</module>
+ <module>sortingFilteringDemo</module>
</modules>
</project>
\ No newline at end of file
Property changes on: trunk/sandbox/samples/progressBarDemo
___________________________________________________________________
Name: svn:ignore
+ .classpath
.settings
.project
target
Property changes on: trunk/sandbox/samples/sortingFilteringDemo
___________________________________________________________________
Name: svn:ignore
+ .settings
target
.classpath
.project
Added: trunk/sandbox/samples/sortingFilteringDemo/pom.xml
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/pom.xml (rev 0)
+++ trunk/sandbox/samples/sortingFilteringDemo/pom.xml 2007-12-28 15:58:20 UTC (rev 5083)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.richfaces.sandbox</groupId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.sandbox</groupId>
+ <artifactId>sortingFilteringDemo</artifactId>
+ <packaging>war</packaging>
+ <name>sortingFilteringDemo Maven Webapp</name>
+ <version>3.2.0-SNAPSHOT</version>
+ <build>
+ <finalName>sortingFilteringDemo</finalName>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.sandbox.ui</groupId>
+ <artifactId>sortableHeader</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java (rev 0)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/main/java/org/richfaces/sandbox/Bean.java 2007-12-28 15:58:20 UTC (rev 5083)
@@ -0,0 +1,29 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.sandbox;
+/**
+ * @author $Autor$
+ *
+ */
+public class Bean {
+
+}
\ No newline at end of file
Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml (rev 0)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/faces-config.xml 2007-12-28 15:58:20 UTC (rev 5083)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>bean</managed-bean-name>
+ <managed-bean-class>org.richfaces.sandbox.Bean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml 2007-12-28 15:58:20 UTC (rev 5083)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>Archetype Created Web Application</display-name>
+ <context-param>
+ <param-name>javax.faces.CONFIG_FILES</param-name>
+ <param-value>/WEB-INF/faces-config.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+ <!--
+ -->
+ <filter>
+ <display-name>Ajax4jsf Filter</display-name>
+ <filter-name>ajax4jsf</filter-name>
+ <filter-class>org.ajax4jsf.Filter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>ajax4jsf</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
+ </filter-mapping>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/index.jsp
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/index.jsp (rev 0)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/index.jsp 2007-12-28 15:58:20 UTC (rev 5083)
@@ -0,0 +1,11 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+
+<html>
+
+<head></head>
+
+ <body>
+ <jsp:forward page="/pages/index.jsf" />
+ </body>
+
+</html>
\ No newline at end of file
Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp (rev 0)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp 2007-12-28 15:58:20 UTC (rev 5083)
@@ -0,0 +1,12 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+
+ </f:view>
+ </body>
+</html>
Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.xhtml (rev 0)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.xhtml 2007-12-28 15:58:20 UTC (rev 5083)
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ >
+ <f:view>
+
+ </f:view>
+</html>
\ No newline at end of file
Added: trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/sandbox/BeanTest.java
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/sandbox/BeanTest.java (rev 0)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/test/java/org/richfaces/sandbox/BeanTest.java 2007-12-28 15:58:20 UTC (rev 5083)
@@ -0,0 +1,46 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.sandbox;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+*/
+public class BeanTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public BeanTest( String testName )
+ {
+ super( testName );
+ }
+
+ public void testStub() throws Exception {
+
+ }
+}
Property changes on: trunk/sandbox/ui/combobox
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: trunk/sandbox/ui/pickList
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Modified: trunk/sandbox/ui/pom.xml
===================================================================
--- trunk/sandbox/ui/pom.xml 2007-12-28 15:45:44 UTC (rev 5082)
+++ trunk/sandbox/ui/pom.xml 2007-12-28 15:58:20 UTC (rev 5083)
@@ -18,7 +18,7 @@
<module>rex-resizable</module>
<module>rex-messageBox</module>
<!--module>rex-button</module-->
- <!--module>contextMenu</module-->
+ <module>sortableHeader</module>
<module>fileUpload</module>
<module>combobox</module>
<module>progressBar</module>
Property changes on: trunk/sandbox/ui/progressBAR
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: trunk/sandbox/ui/sortableHeader
___________________________________________________________________
Name: svn:ignore
+ .settings
target
.classpath
.project
Added: trunk/sandbox/ui/sortableHeader/pom.xml
===================================================================
--- trunk/sandbox/ui/sortableHeader/pom.xml (rev 0)
+++ trunk/sandbox/ui/sortableHeader/pom.xml 2007-12-28 15:58:20 UTC (rev 5083)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>ui</artifactId>
+ <groupId>org.richfaces.sandbox</groupId>
+ <version>3.2.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.sandbox.ui</groupId>
+ <artifactId>sortableHeader</artifactId>
+ <name>sortableHeader</name>
+ <version>3.2.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.sandbox</groupId>
+ <artifactId>richfaces-sandbox-api</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.sandbox</groupId>
+ <artifactId>richfaces-sandbox-impl</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-12-28 15:45:44 UTC (rev 5082)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-12-28 15:58:20 UTC (rev 5083)
@@ -263,6 +263,7 @@
if(grid.isRowAvailable() || state.isFake()){
String row_id;
+ String fakeClass = state.isFake() ? "fake " : "";
int index = state.getRowIndex();
@@ -280,7 +281,8 @@
writer.startElement(HTML.TR_ELEMENT, grid);
state.setFrozenColumnCount(ScrollableDataTableUtils.getFrozenColumnsCount(grid));
getUtils().writeAttribute(writer, "id",row_id);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass(index));
+
+ getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + fakeClass + state.getRowClass(index));
addRowJavascriptEvents(writer, grid);
if (log.isDebugEnabled()) {
log.debug("rowIndex : " + index);
Modified: trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
===================================================================
--- trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2007-12-28 15:45:44 UTC (rev 5082)
+++ trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2007-12-28 15:58:20 UTC (rev 5083)
@@ -237,6 +237,8 @@
display: block;
overflow: hidden;
}
+
+
</f:verbatim>
<u:selector name=".dr-sdt">
16 years, 4 months
JBoss Rich Faces SVN: r5082 - in trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit: images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-28 10:45:44 -0500 (Fri, 28 Dec 2007)
New Revision: 5082
Added:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxGradient.java
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxImage.java
Log:
initial commit for images
Added: 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 (rev 0)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxGradient.java 2007-12-28 15:45:44 UTC (rev 5082)
@@ -0,0 +1,16 @@
+/**
+ *
+ */
+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");
+ }
+}
Added: 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 (rev 0)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/images/ComboBoxImage.java 2007-12-28 15:45:44 UTC (rev 5082)
@@ -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 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(5,5,11,5);
+ g2d.drawLine(6,6,10,6);
+ g2d.drawLine(7,7,9,7);
+ g2d.drawLine(8,8,8,8);
+ }
+
+}
16 years, 4 months
JBoss Rich Faces SVN: r5081 - in trunk/sandbox/ui/combobox/src/main/config: resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-28 10:45:03 -0500 (Fri, 28 Dec 2007)
New Revision: 5081
Added:
trunk/sandbox/ui/combobox/src/main/config/resources/
trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml
Log:
Added: trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml
===================================================================
--- trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml (rev 0)
+++ trunk/sandbox/ui/combobox/src/main/config/resources/resource-config.xml 2007-12-28 15:45:03 UTC (rev 5081)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+ <resource class="org.richfaces.renderkit.images.ComboBoxGradient">
+ <name>org.richfaces.renderkit.images.ComboBoxGradient</name>
+ </resource>
+</resource-config>
16 years, 4 months
JBoss Rich Faces SVN: r5080 - in trunk/sandbox/ui/combobox/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-28 10:44:39 -0500 (Fri, 28 Dec 2007)
New Revision: 5080
Modified:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
remove encode script
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 15:25:00 UTC (rev 5079)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2007-12-28 15:44:39 UTC (rev 5080)
@@ -20,13 +20,13 @@
*
*/
public class ComboBoxBaseRenderer extends HeaderResourcesRendererBase {
-
- private static final String INPUT = "_input";
+//
+// private static final String INPUT = "_input";
+//
+// private static final String BUTTON = "_button";
+//
+// private static final String POPUP = "_popup";
- private static final String BUTTON = "_button";
-
- private static final String POPUP = "_popup";
-
protected Class<UIComboBox> getComponentClass() {
return UIComboBox.class;
}
@@ -72,7 +72,7 @@
writer.endElement(HTML.DIV_ELEM);
}
- private String encodeScript(FacesContext context, UIComponent component, String popupId){
+ /*private String encodeScript(FacesContext context, UIComponent component, String popupId){
UIComboBox comboBox = (UIComboBox) component;
JSFunction function = new JSFunction("new Richfaces.ComboBox");
@@ -86,5 +86,5 @@
function.addParameter(options);
return (function.toString() + ";");
- }
+ }*/
}
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-28 15:25:00 UTC (rev 5079)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2007-12-28 15:44:39 UTC (rev 5080)
@@ -10,7 +10,8 @@
class="org.richfaces.renderkit.html.ComboBoxRenderer"
component="org.richfaces.component.UIComboBox">
- <h:styles>css/combobox.xcss</h:styles>
+ <h:styles>css/combobox.xcss</h:styles>
+ <f:resource name="org.richfaces.renderkit.images.ComboBoxImage" var="combo_img" />
<h:scripts>
new org.ajax4jsf.javascript.PrototypeScript(),
scripts/combobox.js
@@ -22,7 +23,7 @@
<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; height:22px;width:22px;" src="#{down_arrow}"/>
+ <img id="comboboxButton#{clientId}" class="" style="position:absolute; top:0pt; border:1px solid black;" src="#{combo_img}"/>
</div>
<div id="list#{clientId}" style="display:none" class="rich-combobox-list">
<f:call name="encodeItems"/>
16 years, 4 months
JBoss Rich Faces SVN: r5079 - in branches/3.1.x/ui/scrollableDataTable/src: test/java/org/richfaces/renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-12-28 10:25:00 -0500 (Fri, 28 Dec 2007)
New Revision: 5079
Modified:
branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererStateTest.java
branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java
Log:
Added handling for fake columns
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-12-28 15:09:04 UTC (rev 5078)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-12-28 15:25:00 UTC (rev 5079)
@@ -280,7 +280,7 @@
writer.startElement(HTML.TR_ELEMENT, grid);
state.setFrozenColumnCount(ScrollableDataTableUtils.getFrozenColumnsCount(grid));
getUtils().writeAttribute(writer, "id",row_id);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass(index));
+ getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass());
addRowJavascriptEvents(writer, grid);
if (log.isDebugEnabled()) {
log.debug("rowIndex : " + index);
@@ -342,7 +342,7 @@
row_id = baseClientId + ":f:" + state.getRowIndex();
writer.startElement("tr", grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row" + state.getRowClass(state.getRowIndex()));
+ getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row" + state.getRowClass());
getUtils().writeAttribute(writer,"id",row_id);
addRowJavascriptEvents(writer, grid);
collection.add(row_id);
@@ -397,7 +397,7 @@
writer.startElement("tr", grid);
getUtils().writeAttribute(writer,"id",row_id);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row" + state.getRowClass(state.getRowIndex()));
+ getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row" + state.getRowClass());
addRowJavascriptEvents(writer, grid);
collection.add(row_id);
}
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2007-12-28 15:09:04 UTC (rev 5078)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2007-12-28 15:25:00 UTC (rev 5079)
@@ -413,7 +413,11 @@
}
}
- public String getRowClass(int index) {
+ public String getRowClass() {
+ return getRowClass(getRowIndex()) + (isFake() ? " dr-sdt-fake-r rich-sdt-fake-r " : "");
+ }
+
+ private String getRowClass(int index) {
if(rowClasses != null) {
return rowClasses[index % rowClassesSize];
} else {
Modified: branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererStateTest.java
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererStateTest.java 2007-12-28 15:09:04 UTC (rev 5078)
+++ branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererStateTest.java 2007-12-28 15:25:00 UTC (rev 5079)
@@ -196,7 +196,8 @@
public void testRowClass() {
String rowClasses = "1,2,3";
state.setRowClasses(rowClasses);
- assertEquals("2", state.getRowClass(1));
+ state.setRowIndex(1);
+ assertEquals("2", state.getRowClass());
}
public void testIds() {
Modified: branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2007-12-28 15:09:04 UTC (rev 5078)
+++ branches/3.1.x/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2007-12-28 15:25:00 UTC (rev 5079)
@@ -115,7 +115,7 @@
}
static final Set tagNames = new HashSet();
- static final String [] names = {"input","div","script"};
+ static final String [] names = {"input","div","script", "table", "tbody", "tr", "td", "thead", "tfoot", "th"};
static {
Collections.addAll(tagNames, names);
}
@@ -128,7 +128,7 @@
HtmlElement div = page.getHtmlElementById(grid.getClientId(facesContext));
assertNotNull(div);
- assertEquals("div", div.getNodeName());
+ assertEquals("table", div.getNodeName());
String classAttr = div.getAttributeValue("class");
assertTrue(classAttr.contains("dr-sdt"));
16 years, 4 months
JBoss Rich Faces SVN: r5078 - management/design/fileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-12-28 10:09:04 -0500 (Fri, 28 Dec 2007)
New Revision: 5078
Modified:
management/design/fileUpload/Func Spec - File Upload Component.doc
Log:
Modified: management/design/fileUpload/Func Spec - File Upload Component.doc
===================================================================
(Binary files differ)
16 years, 4 months
JBoss Rich Faces SVN: r5077 - trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2007-12-28 09:47:20 -0500 (Fri, 28 Dec 2007)
New Revision: 5077
Modified:
trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss
Log:
RF-1691
Modified: trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss
===================================================================
--- trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss 2007-12-28 14:43:54 UTC (rev 5076)
+++ trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss 2007-12-28 14:47:20 UTC (rev 5077)
@@ -7,7 +7,7 @@
<f:verbatim>
-*{font-family : verdana; font-size : 11px}
+
.rich-progress-bar-uploaded{overflow : hidden; position : absolute; border : 0px solid #cccccc; height : 16px;}
.rich-progress-bar{position : relative; margin-bottom : 2px; height : 16px; width : 200px}
.rich-progress-bar-base{text-align : center; position : absolute; height : 16px; width : 200px; font-weight : bold;}
16 years, 4 months