JBoss Rich Faces SVN: r6067 - in trunk/ui/combobox/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-13 12:47:33 -0500 (Wed, 13 Feb 2008)
New Revision: 6067
Modified:
trunk/ui/combobox/src/main/config/resources/resource-config.xml
trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
trunk/ui/combobox/src/main/templates/combobox.jspx
Log:
changes for new shadow image
Modified: trunk/ui/combobox/src/main/config/resources/resource-config.xml
===================================================================
--- trunk/ui/combobox/src/main/config/resources/resource-config.xml 2008-02-13 17:46:02 UTC (rev 6066)
+++ trunk/ui/combobox/src/main/config/resources/resource-config.xml 2008-02-13 17:47:33 UTC (rev 6067)
@@ -15,9 +15,4 @@
<resource class="org.richfaces.renderkit.html.images.ComboBoxArrowImageDisable">
<name>org.richfaces.renderkit.html.images.ComboBoxArrowImageDisable</name>
</resource>
- <resource class="org.richfaces.renderkit.html.images.ComboBoxListShadow">
- <name>org.richfaces.renderkit.html.images.ComboBoxListShadow</name>
- </resource>
-
-
</resource-config>
Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
===================================================================
--- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-02-13 17:46:02 UTC (rev 6066)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-02-13 17:47:33 UTC (rev 6067)
@@ -220,25 +220,25 @@
<u:selector name=".rich-combobox-shadow-tl">
<u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow" />
+ <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/>
</u:style>
</u:selector>
<u:selector name=".rich-combobox-shadow-tr">
<u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow" />
+ <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/>
</u:style>
</u:selector>
<u:selector name=".rich-combobox-shadow-bl">
<u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow" />
+ <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/>
</u:style>
</u:selector>
<u:selector name=".rich-combobox-shadow-br">
<u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow" />
+ <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/>
</u:style>
</u:selector>
Modified: trunk/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-02-13 17:46:02 UTC (rev 6066)
+++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-02-13 17:47:33 UTC (rev 6067)
@@ -191,7 +191,7 @@
]]>
</jsp:scriptlet>
<f:resource var="spacer" name="images/spacer.gif"/>
-<f:resource name="org.richfaces.renderkit.html.images.ComboBoxListShadow"/>
+
<div id="control#{clientId}" class="rich-combobox-font rich-combobox #{styleClass}" style="width:#{listWidth};#{style}"
x:passThruWithExclusions="value,name,type,id,styleClass,class,style,size,autocomplete,disabled,onchange">
<input id="comboboxValue#{clientId}" name="comboboxValue#{clientId}" type="hidden"/>
18 years, 2 months
JBoss Rich Faces SVN: r6066 - in trunk/framework/impl/src/main: resources/org/richfaces/renderkit/html/images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-13 12:46:02 -0500 (Wed, 13 Feb 2008)
New Revision: 6066
Added:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/images/bg_shadow.png
Removed:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ComboBoxListShadow.java
Log:
remove class for shadow generation. Put generated image
Deleted: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ComboBoxListShadow.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ComboBoxListShadow.java 2008-02-13 16:15:00 UTC (rev 6065)
+++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/ComboBoxListShadow.java 2008-02-13 17:46:02 UTC (rev 6066)
@@ -1,73 +0,0 @@
-/**
- *
- */
-package org.richfaces.renderkit.html.images;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.awt.image.RenderedImage;
-import java.util.Date;
-
-import javax.faces.context.FacesContext;
-
-import org.ajax4jsf.resource.ImageRenderer;
-import org.ajax4jsf.resource.InternetResourceBuilder;
-import org.ajax4jsf.resource.Java2Dresource;
-import org.ajax4jsf.resource.PngRenderer;
-import org.ajax4jsf.resource.ResourceContext;
-
-/**
- * @author Anton Belevich
- *
- */
-public class ComboBoxListShadow extends Java2Dresource {
-
- static final Dimension dimensions = new Dimension(1010, 1010);
-
- public ComboBoxListShadow() {
- setRenderer(new PngRenderer());
- setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
- }
-
- protected Dimension getDimensions(ResourceContext resourceContext) {
- return dimensions;
- }
- public Dimension getDimensions(FacesContext facesContext, Object data) {
- return dimensions;
- }
-
- protected RenderedImage getImage(ResourceContext context) {
-
- ImageRenderer renderer = (ImageRenderer)getRenderer(null);
- Dimension imageDimensions = getDimensions(context);
-
- BufferedImage image = null;
- if (imageDimensions.getHeight() > 0.0 && imageDimensions.getWidth() > 0.0) {
-
- int cornerSize = 15;
- int rectWidth = imageDimensions.width;
- float shadowOpacity = 0.02f;
-
- image = renderer.createImage(rectWidth,rectWidth);
- Graphics2D g2d = image.createGraphics();
- g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
- g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE);
- g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
- g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
- g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
- g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
- for (int i = 0; i < 10; i++) {
- g2d.setColor(new Color(0.0f, 0.0f, 0.0f, shadowOpacity));
- shadowOpacity = shadowOpacity * 1.4f;
- g2d.fillRoundRect(i, i, rectWidth-2*i, rectWidth-2*i, cornerSize, cornerSize);
- }
- g2d.dispose();
- }
-
- return image;
- }
-}
Added: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/images/bg_shadow.png
===================================================================
(Binary files differ)
Property changes on: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/images/bg_shadow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 2 months
JBoss Rich Faces SVN: r6065 - trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-02-13 11:15:00 -0500 (Wed, 13 Feb 2008)
New Revision: 6065
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
RF-2172
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-02-13 15:54:10 UTC (rev 6064)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-02-13 16:15:00 UTC (rev 6065)
@@ -637,6 +637,10 @@
this.TIME_EDITOR_LAYOUT_ID = this.id+'TimeEditorLayout';
this.DATE_EDITOR_LAYOUT_ID = this.id+'DateEditorLayout';
this.EDITOR_LAYOUT_SHADOW_ID = this.id+'EditorLayoutShadow';
+ this.TIME_EDITOR_BUTTON_OK = this.id+'TimeEditorButtonOk';
+ this.TIME_EDITOR_BUTTON_CANCEL = this.id+'TimeEditorButtonCancel';
+ this.DATE_EDITOR_BUTTON_OK = this.id+'DateEditorButtonOk';
+ this.DATE_EDITOR_BUTTON_CANCEL = this.id+'DateEditorButtonCancel';
//this.popupIntervalId=null;
@@ -889,9 +893,11 @@
editor.style.zIndex = parseInt(zindex,10)+1;
this.isEditorCreated = true;
+
+ return editor;
},
- createTimeEditorLayout: function()
+ createTimeEditorLayout: function(editor)
{
Element.insert(this.EDITOR_LAYOUT_SHADOW_ID, {after:this.evaluateMarkup(this.calendarContext.timeEditorLayout, this.calendarContext)});
@@ -910,9 +916,30 @@
}
sbjQuery(tm).SpinButton({digits:2,min:0,max:59});
+ this.correctEditorButtons(editor, this.TIME_EDITOR_BUTTON_OK, this.TIME_EDITOR_BUTTON_CANCEL);
+
this.isTimeEditorLayoutCreated = true;
},
+ correctEditorButtons: function(editor, buttonID1, buttonID2)
+ {
+ var button1 = $(buttonID1);
+ var button2 = $(buttonID2);
+ editor.style.visibility = "hidden";
+ editor.style.display = "";
+ var width1 = Richfaces.Calendar.getOffsetDimensions(button1.firstChild).width;
+ var width2 = Richfaces.Calendar.getOffsetDimensions(button2.firstChild).width;
+ editor.style.display = "none";
+ editor.style.visibility = "";
+
+ var styleWidth = Richfaces.getComputedStyleSize(button1,'width')
+
+ if (width1>styleWidth || width2>styleWidth)
+ {
+ button1.style.width = button2.style.width = (width1>width2 ? width1 : width2)+"px";
+ }
+ },
+
createDECell: function(id, value, buttonType, param, className)
{
if (buttonType==0)
@@ -929,25 +956,25 @@
}
},
- createDateEditorLayout: function()
+ createDateEditorLayout: function(editor)
{
var htmlBegin = '<table id="'+this.DATE_EDITOR_LAYOUT_ID+'" class="rich-calendar-date-layout" border="0" cellpadding="0" cellspacing="0"><tbody><tr id="'+this.DATE_EDITOR_LAYOUT_ID+'TR">';
var htmlEnd = '</tr></tbody></table>';
var month = 0;
this.dateEditorYear = this.getCurrentYear();
var year = this.dateEditorStartYear = this.dateEditorYear-4;
- var htmlContent = '<td>'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+month, this.params.monthLabelsShort[month], 1, month)+'</td>'
- +'<td class="rich-calendar-date-layout-split">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6), this.params.monthLabelsShort[month+6], 1, month+6)+'</td>'
- +'<td>'+this.createDECell('','<', 0, -1)+'</td>'
- +'<td>'+this.createDECell('','>', 0, 1)+'</td>';
+ var htmlContent = '<td align="center">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+month, this.params.monthLabelsShort[month], 1, month)+'</td>'
+ +'<td align="center" class="rich-calendar-date-layout-split">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6), this.params.monthLabelsShort[month+6], 1, month+6)+'</td>'
+ +'<td align="center">'+this.createDECell('','<', 0, -1)+'</td>'
+ +'<td align="center">'+this.createDECell('','>', 0, 1)+'</td>';
month++;
for (var i=0;i<5;i++)
{
- htmlContent+='</tr><tr><td>'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+month, this.params.monthLabelsShort[month], 1, month)+'</td>'
- +'<td class="rich-calendar-date-layout-split">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6), this.params.monthLabelsShort[month+6], 1, month+6)+'</td>'
- +'<td>'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'Y'+i, year, 2, i, (i==4 ? 'rich-calendar-editor-btn-selected' : ''))+'</td>'
- +'<td>'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'Y'+(i+5), year+5, 2, i+5)+'</td>';
+ htmlContent+='</tr><tr><td align="center">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+month, this.params.monthLabelsShort[month], 1, month)+'</td>'
+ +'<td align="center" class="rich-calendar-date-layout-split">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6), this.params.monthLabelsShort[month+6], 1, month+6)+'</td>'
+ +'<td align="center">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'Y'+i, year, 2, i, (i==4 ? 'rich-calendar-editor-btn-selected' : ''))+'</td>'
+ +'<td align="center">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'Y'+(i+5), year+5, 2, i+5)+'</td>';
month++;
year++;
}
@@ -956,9 +983,9 @@
this.dateEditorMonthID = this.DATE_EDITOR_LAYOUT_ID+'M'+this.dateEditorMonth;
htmlContent+='</tr><tr><td colspan="2" class="rich-calendar-date-layout-ok">'+
- '<div class="rich-calendar-time-btn" style="float:right;" onmousedown="Element.addClassName(this, \'rich-calendar-time-btn-press\');" onmouseout="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onmouseup="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onclick="$(\''+this.id+'\').component.hideDateEditor(true);">'+this.params.labels.ok+'</div>'+
+ '<div id="'+this.DATE_EDITOR_BUTTON_OK+'" class="rich-calendar-time-btn" style="float:right;" onmousedown="Element.addClassName(this, \'rich-calendar-time-btn-press\');" onmouseout="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onmouseup="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onclick="$(\''+this.id+'\').component.hideDateEditor(true);"><span>'+this.params.labels.ok+'</span></div>'+
'</td><td colspan="2" class="rich-calendar-date-layout-cancel">'+
- '<div class="rich-calendar-time-btn" style="float:left;" onmousedown="Element.addClassName(this, \'rich-calendar-time-btn-press\');" onmouseout="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onmouseup="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onclick="$(\''+this.id+'\').component.hideDateEditor(false);">'+this.params.labels.cancel+'</div>'+
+ '<div id="'+this.DATE_EDITOR_BUTTON_CANCEL+'" class="rich-calendar-time-btn" style="float:left;" onmousedown="Element.addClassName(this, \'rich-calendar-time-btn-press\');" onmouseout="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onmouseup="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onclick="$(\''+this.id+'\').component.hideDateEditor(false);"><span>'+this.params.labels.cancel+'</span></div>'+
'</td>';
@@ -966,6 +993,8 @@
Element.addClassName(this.dateEditorMonthID, 'rich-calendar-editor-btn-selected');
+ this.correctEditorButtons(editor, this.DATE_EDITOR_BUTTON_OK, this.DATE_EDITOR_BUTTON_CANCEL);
+
this.isDateEditorLayoutCreated = true;
},
@@ -1976,13 +2005,14 @@
showTimeEditor: function()
{
+ var editor;
if (this.timeType==0) return;
- if (!this.isEditorCreated) this.createEditor();
- if (!this.isTimeEditorLayoutCreated) this.createTimeEditorLayout();
+ if (!this.isEditorCreated) editor = this.createEditor();
+ else editor = $(this.EDITOR_ID);
+ if (!this.isTimeEditorLayoutCreated) this.createTimeEditorLayout(editor);
$(this.TIME_EDITOR_LAYOUT_ID).show();
- var editor = $(this.EDITOR_ID);
var editor_shadow = $(this.EDITOR_SHADOW_ID);
this.setEditorPosition($(this.id), editor, editor_shadow);
@@ -1990,6 +2020,7 @@
this.updateTimeEditor();
editor_shadow.show();
+
editor.show();
Element.clonePosition(this.EDITOR_LAYOUT_SHADOW_ID, this.TIME_EDITOR_LAYOUT_ID, {offsetLeft: 3, offsetTop: 3});
@@ -2036,13 +2067,14 @@
showDateEditor: function()
{
- if (!this.isEditorCreated) this.createEditor();
- if (!this.isDateEditorLayoutCreated) this.createDateEditorLayout();
+ var editor;
+ if (!this.isEditorCreated) editor = this.createEditor();
+ else editor = $(this.EDITOR_ID);
+ if (!this.isDateEditorLayoutCreated) this.createDateEditorLayout(editor);
else this.updateDateEditor();
$(this.DATE_EDITOR_LAYOUT_ID).show();
- var editor = $(this.EDITOR_ID);
var editor_shadow = $(this.EDITOR_SHADOW_ID);
this.setEditorPosition($(this.id), editor, editor_shadow);
@@ -2200,17 +2232,23 @@
[
new E('td',{'class': 'rich-calendar-time-layout-ok'},
[
- new E('div',{'class': 'rich-calendar-time-btn', 'style': 'float:right;', 'onmousedown': "Element.addClassName(this, 'rich-calendar-time-btn-press');", 'onmouseout': "Element.removeClassName(this, 'rich-calendar-time-btn-press');", 'onmouseup': "Element.removeClassName(this, 'rich-calendar-time-btn-press');", 'onclick': function(context){return "$('"+context.calendar.id+"').component.hideTimeEditor(true)";}},
+ new E('div',{'id': function(context){return context.calendar.TIME_EDITOR_BUTTON_OK}, 'class': 'rich-calendar-time-btn', 'style': 'float:right;', 'onmousedown': "Element.addClassName(this, 'rich-calendar-time-btn-press');", 'onmouseout': "Element.removeClassName(this, 'rich-calendar-time-btn-press');", 'onmouseup': "Element.removeClassName(this, 'rich-calendar-time-btn-press');", 'onclick': function(context){return "$('"+context.calendar.id+"').component.hideTimeEditor(true)";}},
[
- new ET(function (context) { return context.controlLabels.ok; })
+ new E('span',{},
+ [
+ new ET(function (context) { return context.controlLabels.ok; })
+ ])
])
])
,
new E('td',{'class': 'rich-calendar-time-layout-cancel'},
[
- new E('div',{'class': 'rich-calendar-time-btn', 'style': 'float:left;', 'onmousedown': "Element.addClassName(this, 'rich-calendar-time-btn-press');", 'onmouseout': "Element.removeClassName(this, 'rich-calendar-time-btn-press');", 'onmouseup': "Element.removeClassName(this, 'rich-calendar-time-btn-press');", 'onclick': function(context){return "$('"+context.calendar.id+"').component.hideTimeEditor(false)";}},
+ new E('div',{'id': function(context){return context.calendar.TIME_EDITOR_BUTTON_CANCEL}, 'class': 'rich-calendar-time-btn', 'style': 'float:left;', 'onmousedown': "Element.addClassName(this, 'rich-calendar-time-btn-press');", 'onmouseout': "Element.removeClassName(this, 'rich-calendar-time-btn-press');", 'onmouseup': "Element.removeClassName(this, 'rich-calendar-time-btn-press');", 'onclick': function(context){return "$('"+context.calendar.id+"').component.hideTimeEditor(false)";}},
[
- new ET(function (context) { return context.controlLabels.cancel; })
+ new E('span',{},
+ [
+ new ET(function (context) { return context.controlLabels.cancel; })
+ ])
])
])
])
18 years, 2 months
JBoss Rich Faces SVN: r6064 - in management/design: inplaceInput/design/images and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2008-02-13 10:54:10 -0500 (Wed, 13 Feb 2008)
New Revision: 6064
Added:
management/design/inplaceInput/design/images/mark_changed.gif
management/design/inplaceSelect/design/images/mark_changed.gif
Removed:
management/design/inplaceInput/design/images/mark_open.gif
management/design/inplaceSelect/design/images/mark_open.gif
Modified:
management/design/inplaceInput/design/inplaceInput.html
management/design/inplaceSelect/design/inplaceSelect.html
Log:
Added: management/design/inplaceInput/design/images/mark_changed.gif
===================================================================
(Binary files differ)
Property changes on: management/design/inplaceInput/design/images/mark_changed.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: management/design/inplaceInput/design/images/mark_open.gif
===================================================================
(Binary files differ)
Modified: management/design/inplaceInput/design/inplaceInput.html
===================================================================
--- management/design/inplaceInput/design/inplaceInput.html 2008-02-13 15:22:30 UTC (rev 6063)
+++ management/design/inplaceInput/design/inplaceInput.html 2008-02-13 15:54:10 UTC (rev 6064)
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
@@ -12,9 +12,11 @@
.is_default_state{white-space : nowrap; background-color : #f1f1f1; border-bottom : 1px dashed #000000; padding-left : 3px; padding-right : 3px;}
-.is_changed_state{background-image:url(images/mark_open.gif); background-position : top left; background-repeat : no-repeat;}
+.is_changed_state{background-image:url(images/mark_changed.gif); background-position : top left; background-repeat : no-repeat;}
+
.is_edit_state{position : relative; width : 100px;}
-.is_field{background : #FFF281; padding : 0px 0px 0px 3px; border : 0px; margin : 0px; width : 100px; position : absolute; top:0px; left : 0px;}
+.is_field{background : #FFF281; padding : 0px 0px 0px 0px; border : 0px; margin : 0px; width : 100px; position : absolute; top:0px; left : 0px;}
+.is_strut{width : 100px; height : 1px}
.is_btn{
background : url(images/bg_btn.png) #FFFFFF;
border : 1px outset #BED6F8;
@@ -26,8 +28,17 @@
padding : 0px;
margin : 0px;}
.is_btn_set{ position : absolute; top:0px; left : 100px; white-space : nowrap}
-.is_shadow{ top:-7; left:-5; position : absolute;}
-.is_shadow_size{ width : 36px; height : 26px;}
+
+.is_btn_set_tl{ position : absolute; bottom:11px /*generalSizeFont*/; left : 0px; white-space : nowrap}
+.is_btn_set_tr_out{ position : absolute; bottom:11px /*generalSizeFont*/; left : 100px; white-space : nowrap}
+.is_btn_set_tr_in{ position : absolute; bottom:11px /*generalSizeFont*/; right : 0px; white-space : nowrap}
+
+.is_btn_set_bl{ position : absolute; top:13px /*height of view span*/; left : 0px; white-space : nowrap}
+.is_btn_set_br_out{ position : absolute; absolute; top:13px /*height of view span*/; left : 100px; white-space : nowrap}
+.is_btn_set_br_in{ position : absolute;absolute; top:13px /*height of view span*/; right : 0px; white-space : nowrap}
+
+.is_shadow{ top:0; left:0; position : absolute;}
+.is_shadow_size{ width : 34px; height : 16px;}
.is_shadow_tl{ background : url(images/bg_shadow.png) repeat-x top left;}
.is_shadow_tr{ background : url(images/bg_shadow.png) repeat-x top right;}
.is_shadow_bl{ background : url(images/bg_shadow.png) repeat-x bottom left;}
@@ -52,9 +63,9 @@
<div style="width : 300px;">
Fresh off his victory in the Florida primary, Sen. John McCain is poised to take another big prize. Former
<span class="is_edit_state">
-
+ <img src="images/spacer.gif" class="is_strut">
<input type="Text" value="New York" class="is_field">
- <div class="is_btn_set">
+ <div class="is_btn_set_br_in">
<div class="is_shadow">
<table cellpadding="0" cellspacing="0" border="0" class="is_shadow_size">
<tr>
Added: management/design/inplaceSelect/design/images/mark_changed.gif
===================================================================
(Binary files differ)
Property changes on: management/design/inplaceSelect/design/images/mark_changed.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: management/design/inplaceSelect/design/images/mark_open.gif
===================================================================
(Binary files differ)
Modified: management/design/inplaceSelect/design/inplaceSelect.html
===================================================================
--- management/design/inplaceSelect/design/inplaceSelect.html 2008-02-13 15:22:30 UTC (rev 6063)
+++ management/design/inplaceSelect/design/inplaceSelect.html 2008-02-13 15:54:10 UTC (rev 6064)
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
@@ -10,11 +10,12 @@
legend{font-weight : bold}
-
.insel_default_state{white-space : nowrap; background-color : #f1f1f1; border-bottom : 1px dashed #000000; padding-left : 3px; padding-right : 3px;}
-.insel_changed_state{background-image:url(images/mark_open.gif); background-position : top left; background-repeat : no-repeat;}
-.insel_edit_state{background-color : #FFF281;position : relative; width : 100px;background-image:url(images/mark_list.gif); background-position : right; background-repeat : no-repeat;}
-.insel_field{background : #FFF281; padding : 0px 0px 0px 3px; border : 0px; margin : 0px; width : 90px; position : absolute; top:0px; left : 0px;}
+.insel_changed_state{background-image:url(images/mark_changed.gif); background-position : top left; background-repeat : no-repeat;}
+
+.insel_edit_state{position : relative; width : 100px;}
+.insel_field{background : #FFF281; padding : 0px 0px 0px 0px; border : 0px; margin : 0px; width : 112px; position : absolute; top:0px; left : 0px;background-image:url(images/mark_list.gif); background-position : center right; background-repeat : no-repeat;}
+.insel_strut{width : 100px; height : 1px}
.insel_btn{
background : url(images/bg_btn.png) #FFFFFF;
border : 1px outset #BED6F8;
@@ -25,9 +26,9 @@
border : 1px inset #BED6F8;
padding : 0px;
margin : 0px;}
-.insel_btn_set{ position : absolute; top:0px; left : 100px; white-space : nowrap}
-.insel_shadow{ top:-7; left:-5; position : absolute;}
-.insel_shadow_size{ width : 36px; height : 26px;}
+.insel_btn_set{ position : absolute; top:0px; left : 112px; white-space : nowrap}
+.insel_shadow{ top:0; left:0; position : absolute;}
+.insel_shadow_size{ width : 34px; height : 16px;}
.insel_shadow_tl{ background : url(images/bg_shadow.png) repeat-x top left;}
.insel_shadow_tr{ background : url(images/bg_shadow.png) repeat-x top right;}
.insel_shadow_bl{ background : url(images/bg_shadow.png) repeat-x bottom left;}
@@ -50,9 +51,12 @@
<fieldset><legend>Edit State</legend><br><br>
<div style="width : 300px;">
+
+
Fresh off his victory in the Florida primary, Sen. John McCain is poised to take another big prize. Former
<span class="insel_edit_state">
- <input type="Text" value="New York" class="insel_field">
+ <img src="images/spacer.gif" class="insel_strut">
+ <input readonly="readonly" type="Text" value="New York" class="insel_field">
<div class="insel_btn_set">
<div class="insel_shadow">
<table cellpadding="0" cellspacing="0" border="0" class="insel_shadow_size">
@@ -78,10 +82,9 @@
<input type="image" src="images/ico_ok.gif" class="insel_btn" onmousedown="this.className='insel_btn_press'" onmouseout="this.className='insel_btn'" onmouseup="this.className='insel_btn'"><input type="image" src="images/ico_cancel.gif" class="insel_btn" onmousedown="this.className='insel_btn_press'" onmouseout="this.className='insel_btn'" onmouseup="this.className='insel_btn'">
</div>
</div>
- <span style="width : 1px; position : relative;">
- <img src="images/spacer.gif" width="100" height="1" alt="" border="0">
- <div style="position : absolute; background : red; width :300px; height : 300px;left : 0px; top: 13px"></div>
- </span>
+
+ <div style="position : absolute; background : red; width :200px; height : 100px; left : 0px; top: 13px">
+ </div>
</span>
Mayor Rudy Giuliani plans to drop out and endorse McCain, two GOP sources said. That would give McCain added momentum heading into a debate Wednesday and next week's Super Tuesday contests
18 years, 2 months
JBoss Rich Faces SVN: r6061 - trunk/ui/core/src/test/java/org/ajax4jsf/component.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-02-13 09:57:10 -0500 (Wed, 13 Feb 2008)
New Revision: 6061
Modified:
trunk/ui/core/src/test/java/org/ajax4jsf/component/DataAdaptorTestCase.java
Log:
http://jira.jboss.com/jira/browse/RF-1373
Test added.
Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/DataAdaptorTestCase.java
===================================================================
--- trunk/ui/core/src/test/java/org/ajax4jsf/component/DataAdaptorTestCase.java 2008-02-13 14:50:42 UTC (rev 6060)
+++ trunk/ui/core/src/test/java/org/ajax4jsf/component/DataAdaptorTestCase.java 2008-02-13 14:57:10 UTC (rev 6061)
@@ -386,4 +386,15 @@
assertEquals(childChildFacet.getValue(), "Value");
assertTrue(childChildFacet.isLocalValueSet());
}
+
+ public void testSetValue() {
+ ExtendedDataModel model1 = adaptor.getExtendedDataModel();
+ adaptor.setValue("value");
+ ExtendedDataModel model2 = adaptor.getExtendedDataModel();
+ assertNotSame(model1, model2);
+
+ Object value = adaptor.getValue();
+ assertNotNull(value);
+ assertEquals("value", value);
+ }
}
18 years, 2 months
JBoss Rich Faces SVN: r6060 - in trunk/sandbox/ui/inplaceInput/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-13 09:50:42 -0500 (Wed, 13 Feb 2008)
New Revision: 6060
Modified:
trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml
trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx
Log:
small fix
Modified: trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-02-13 14:49:19 UTC (rev 6059)
+++ trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-02-13 14:50:42 UTC (rev 6060)
@@ -64,7 +64,7 @@
<defaultvalue>false</defaultvalue>
</property>
<property>
- <name>apllyFromControlsOnly</name>
+ <name>applyFromControlsOnly</name>
<classname>boolean</classname>
<defaultvalue>false</defaultvalue>
</property>
@@ -100,6 +100,20 @@
<classname>boolean</classname>
<defaultvalue>false</defaultvalue>
</property>
+ <property>
+ <name>tabindex</name>
+ <classname>int</classname>
+ </property>
+ <property>
+ <name>saveControlIcon</name>
+ <classname>java.lang.String</classname>
+ </property>
+ <property>
+ <name>cancelControlIcon</name>
+ <classname>java.lang.String</classname>
+ </property>
+
+
</properties>
</component>
</components>
Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-13 14:49:19 UTC (rev 6059)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-13 14:50:42 UTC (rev 6060)
@@ -79,14 +79,14 @@
}
if (this.events.oneditactivation) {
- this.inplaceInput.fire("rich:oneditactivation", {oldValue : this.valueKepeer.value, value : this.tempValueKeeper.value});
+ this.inplaceInput.fire("rich:oneditactivation", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
}
var textSize = this.inplaceInput.offsetWidth;
this.endViewState();
this.startEditableState(textSize);
if (this.events.oneditactivated) {
- this.inplaceInput.fire("rich:oneditactivated", {oldValue : this.valueKepeer.value, value : this.tempValueKeeper.value});
+ this.inplaceInput.fire("rich:oneditactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
}
},
@@ -97,7 +97,7 @@
return;
}
- if (!this.attributes.apllyFromControlsOnly) {
+ if (!this.attributes.applyFromControlsOnly) {
this.inputProcessing();
}
},
@@ -224,7 +224,7 @@
var userValue = this.tempValueKeeper.value;
var value = this.valueKeeper.value;
if (this.events.onviewactivation) {
- this.inplaceInput.fire("rich:onviewactivation", {oldValue : this.valueKepeer.value, value : this.tempValueKeeper.value});
+ this.inplaceInput.fire("rich:onviewactivation", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
}
this.endEditableState();
//this.applyUserValue();
@@ -242,7 +242,7 @@
this.startViewState();
}
if (this.events.onviewactivated) {
- this.inplaceInput.fire("rich:onviewactivated", {oldValue : this.valueKepeer.value, value : this.tempValueKeeper.value});
+ this.inplaceInput.fire("rich:onviewactivated", {oldValue : this.valueKeeper.value, value : this.tempValueKeeper.value});
}
},
Modified: trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-13 14:49:19 UTC (rev 6059)
+++ trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-13 14:50:42 UTC (rev 6060)
@@ -16,8 +16,8 @@
new org.ajax4jsf.javascript.PrototypeScript(),
scripts/inplaceinput.js
</h:scripts>
- <f:resource var="ok_icon" name="org.richfaces.renderkit.images.OkControlIcon"/>
- <f:resource var="cancel_icon" name="org.richfaces.renderkit.images.CancelControlIcon"/>
+ <f:resource var="saveIcon" name="org.richfaces.renderkit.images.OkControlIcon"/>
+ <f:resource var="cancelIcon" name="org.richfaces.renderkit.images.CancelControlIcon"/>
<f:resource var="spacer" name="images/spacer.gif"/>
@@ -36,6 +36,16 @@
}
variables.setVariable("value", value);
variables.setVariable("fieldValue", fieldValue);
+
+ String saveIcon = (String)component.getAttributes().get("saveControlIcon");
+ if (saveIcon != null && saveIcon.length() != 0 ) {
+ variables.setVariable("saveIcon", saveIcon);
+ }
+
+ String cancelIcon = (String)component.getAttributes().get("cancelControlIcon");
+ if (cancelIcon != null && cancelIcon.length() != 0 ) {
+ variables.setVariable("cancelIcon", cancelIcon);
+ }
]]>
</jsp:scriptlet>
@@ -47,7 +57,8 @@
type='text'
maxlength='#{component.attributes["inputMaxLength"]}'
autocomplete="off"
- value='#{fieldValue}'/>
+ value='#{fieldValue}'
+ tabindex='#{component.attributes["tabindex"]}'/>
<input id='#{clientId}value' name='#{clientId}value' type='hidden' value='#{fieldValue}'/>
<div id="#{clientId}bar" class="is_btn_set" style="display:none;">
<jsp:scriptlet>
@@ -82,10 +93,10 @@
<div id="#{clientId}buttons" style="position:relative;">
<input id="#{clientId}ok" class="rich-inplace-control" type="image" onmouseup="this.className='rich-inplace-control'"
onmouseout="this.className='rich-inplace-control'" onmousedown="this.className='rich-inplace-control-press'"
- src="#{ok_icon}"/>
+ src="#{saveIcon}"/>
<input id="#{clientId}cancel" class="rich-inplace-control" type="image" onmouseup="this.className='rich-inplace-control'"
onmouseout="this.className='rich-inplace-control'" onmousedown="this.className='rich-inplace-control-press'"
- src="#{cancel_icon}"/>
+ src="#{cancelIcon}"/>
</div>
<jsp:scriptlet>
<![CDATA[
@@ -98,7 +109,7 @@
<script type="text/javascript">
var attributes = {defaultLabel : '#{component.attributes["defaultLabel"]}',
showControls : #{component.attributes["showControls"]},
- apllyFromControlsOnly : #{component.attributes["apllyFromControlsOnly"]},
+ applyFromControlsOnly : #{component.attributes["applyFromControlsOnly"]},
editEvent : '#{component.attributes["editEvent"]}',
selectOnEdit : #{component.attributes["selectOnEdit"]},
controlsPosition : '#{component.attributes["controlsPosition"]}',
18 years, 2 months
JBoss Rich Faces SVN: r6059 - trunk/ui/orderingList/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2008-02-13 09:49:19 -0500 (Wed, 13 Feb 2008)
New Revision: 6059
Modified:
trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java
Log:
RF-2164
Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java
===================================================================
--- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java 2008-02-13 14:48:45 UTC (rev 6058)
+++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentControlsHelper.java 2008-02-13 14:49:19 UTC (rev 6059)
@@ -75,7 +75,7 @@
public final static String DISABLED_STYLE_PREF = "-disabled";
protected static final OrderingComponentRendererBase.ControlsHelper[] HELPERS = new OrderingComponentRendererBase.ControlsHelper[] {
- new OrderingComponentRendererBase.ControlsHelper("top", "RICH_ORDERING_LIST_TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTop.class.getName(), FACET_TOP,
+ new OrderingComponentRendererBase.ControlsHelper("top", "RICH_SHUTTLES_TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTop.class.getName(), FACET_TOP,
"-top", ATTRIBUTE_CLASS_TOP_CONTROL, "",
CONTROL_ID_TOP, ATTRIBUTE_CE_ONTOPCLICK, true, "top".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -84,7 +84,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("disabledTop", "RICH_ORDERING_LIST_TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTopDisabled.class.getName(), FACET_DIS_TOP,
+ new OrderingComponentRendererBase.ControlsHelper("disabledTop", "RICH_SHUTTLES_TOP_LABEL", DEFAULT_LABEL_TOP, OrderingListIconTopDisabled.class.getName(), FACET_DIS_TOP,
"-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, DISABLED_STYLE_PREF,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_TOP), null, false, "top".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -93,7 +93,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("up", "RICH_ORDERING_LIST_UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUp.class.getName(), FACET_UP,
+ new OrderingComponentRendererBase.ControlsHelper("up", "RICH_SHUTTLES_UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUp.class.getName(), FACET_UP,
"-up", ATTRIBUTE_CLASS_UP_CONTROL, "",
CONTROL_ID_UP, ATTRIBUTE_CE_ONUPCLICK ,true, "up".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -102,7 +102,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("disabledUp", "RICH_ORDERING_LIST_UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUpDisabled.class.getName(), FACET_DIS_UP,
+ new OrderingComponentRendererBase.ControlsHelper("disabledUp", "RICH_SHUTTLES_UP_LABEL", DEFAULT_LABEL_UP, OrderingListIconUpDisabled.class.getName(), FACET_DIS_UP,
"-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, DISABLED_STYLE_PREF,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_UP), null, false, "up".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -111,7 +111,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("down", "RICH_ORDERING_LIST_DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDown.class.getName(), FACET_DOWN,
+ new OrderingComponentRendererBase.ControlsHelper("down", "RICH_SHUTTLES_DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDown.class.getName(), FACET_DOWN,
"-down", ATTRIBUTE_CLASS_DOWN_CONTROL, "",
CONTROL_ID_DOWN, ATTRIBUTE_CE_ONDOWNCLICK, true, "down".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -120,7 +120,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("disabledDown", "RICH_ORDERING_LIST_DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDownDisabled.class.getName(), FACET_DIS_DOWN,
+ new OrderingComponentRendererBase.ControlsHelper("disabledDown", "RICH_SHUTTLES_DOWN_LABEL", DEFAULT_LABEL_DOWN, OrderingListIconDownDisabled.class.getName(), FACET_DIS_DOWN,
"-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, DISABLED_STYLE_PREF,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_DOWN), null, false, "down".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -129,7 +129,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("bottom", "RICH_ORDERING_LIST_BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottom.class.getName(), FACET_BOTTOM,
+ new OrderingComponentRendererBase.ControlsHelper("bottom", "RICH_SHUTTLES_BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottom.class.getName(), FACET_BOTTOM,
"-bottom", ATTRIBUTE_CLASS_BOTTOM_CONTROL, "",
CONTROL_ID_BOTTOM, ATTRIBUTE_CE_ONBOTTOMCLICK, true, "bottom".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -138,7 +138,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("disabledBottom", "RICH_ORDERING_LIST_BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottomDisabled.class.getName(), FACET_DIS_BOTTOM,
+ new OrderingComponentRendererBase.ControlsHelper("disabledBottom", "RICH_SHUTTLES_BOTTOM_LABEL", DEFAULT_LABEL_BOTTOM, OrderingListIconBottomDisabled.class.getName(), FACET_DIS_BOTTOM,
"-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, DISABLED_STYLE_PREF,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_BOTTOM), null, false, "bottom".concat(CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
18 years, 2 months
JBoss Rich Faces SVN: r6058 - trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2008-02-13 09:48:45 -0500 (Wed, 13 Feb 2008)
New Revision: 6058
Modified:
trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleControlsHelper.java
trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
Log:
RF-2164
Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleControlsHelper.java
===================================================================
--- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleControlsHelper.java 2008-02-13 14:18:20 UTC (rev 6057)
+++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleControlsHelper.java 2008-02-13 14:48:45 UTC (rev 6058)
@@ -81,10 +81,10 @@
private final static String NAME_REMOVE_DIS = "disabledRemove";
private final static String NAME_REMOVE = "remove";
- public final static String BUNDLE_COPY_ALL_LABEL = "COPY_ALL_LABEL";
- public final static String BUNDLE_COPY_LABEL = "COPY_LABEL";
- public final static String BUNDLE_REMOVE_ALL_LABEL = "REMOVE_ALL_LABEL";
- public final static String BUNDLE_REMOVE_LABEL = "REMOVE_LABEL";
+ public final static String BUNDLE_COPY_ALL_LABEL = "RICH_LIST_SHUTTLE_COPY_ALL_LABEL";
+ public final static String BUNDLE_COPY_LABEL = "RICH_LIST_SHUTTLE_COPY_LABEL";
+ public final static String BUNDLE_REMOVE_ALL_LABEL = "RICH_LIST_SHUTTLE_REMOVE_ALL_LABEL";
+ public final static String BUNDLE_REMOVE_LABEL = "RICH_LIST_SHUTTLE_REMOVE_LABEL";
protected static final OrderingComponentRendererBase.ControlsHelper[] HELPERS = new OrderingComponentRendererBase.ControlsHelper[] {
new OrderingComponentRendererBase.ControlsHelper(NAME_COPYALL, BUNDLE_COPY_ALL_LABEL, DEFAULT_LABEL_COPY_ALL, ListShuttleIconCopyAll.class.getName(), FACET_COPY_ALL,
Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
===================================================================
--- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2008-02-13 14:18:20 UTC (rev 6057)
+++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2008-02-13 14:48:45 UTC (rev 6058)
@@ -43,7 +43,7 @@
protected static final OrderingComponentRendererBase.ControlsHelper[] TL_HELPERS = OrderingComponentControlsHelper.HELPERS;
- private static final String MESSAGE_BUNDLE_NAME = OrderingListRendererBase.class.getPackage().getName() + "ListShuttle";
+ private static final String MESSAGE_BUNDLE_NAME = OrderingListRendererBase.class.getPackage().getName() + ".listShuttle";
private static class ListShuttleRendererTableHolder extends TableHolder {
18 years, 2 months