JBoss Rich Faces SVN: r8020 - in trunk/framework/impl/src/main/java/org/richfaces/renderkit/html: images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-04-21 11:55:42 -0400 (Mon, 21 Apr 2008)
New Revision: 8020
Modified:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java
Log:
BaseControlBackroundImage updated
Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2008-04-21 15:32:14 UTC (rev 8019)
+++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2008-04-21 15:55:42 UTC (rev 8020)
@@ -160,33 +160,38 @@
g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
Data dataToStore = (Data) restoreData(resourceContext);
- if (dataToStore != null && dataToStore.headerBackgroundColor!=null && dataToStore.headerGradientColor!=null) {
- Color baseColor = new Color(dataToStore.headerBackgroundColor.intValue());
- Color alternateColor = new Color(dataToStore.headerGradientColor.intValue());
- BiColor biColor = new GradientType.BiColor(baseColor, alternateColor);
-
- GradientType type = dataToStore.gradientType;
- BiColor firstLayer = type.getFirstLayerColors(biColor);
- BiColor secondLayer = type.getSecondLayerColors(biColor);
-
- Dimension dim = getDimensions(resourceContext);
- Rectangle2D rect =
- new Rectangle2D.Float(
- 0,
- 0,
- dim.width,
- dim.height);
+ if (dataToStore != null) {
+ Integer headerBackgroundColor = dataToStore.getHeaderBackgroundColor();
+ Integer headerGradientColor = dataToStore.getHeaderGradientColor();
- drawGradient(g2d, rect, firstLayer, gradientHeight, horizontal);
- drawGradient(g2d, rect, secondLayer, gradientHeight / 2, horizontal);
+ if (headerBackgroundColor != null && headerGradientColor != null) {
+ Color baseColor = new Color(headerBackgroundColor.intValue());
+ Color alternateColor = new Color(headerGradientColor.intValue());
+ BiColor biColor = new GradientType.BiColor(baseColor, alternateColor);
+
+ GradientType type = dataToStore.getGradientType();
+ BiColor firstLayer = type.getFirstLayerColors(biColor);
+ BiColor secondLayer = type.getSecondLayerColors(biColor);
+
+ Dimension dim = getDimensions(resourceContext);
+ Rectangle2D rect =
+ new Rectangle2D.Float(
+ 0,
+ 0,
+ dim.width,
+ dim.height);
+
+ drawGradient(g2d, rect, firstLayer, gradientHeight, horizontal);
+ drawGradient(g2d, rect, secondLayer, gradientHeight / 2, horizontal);
+ }
}
}
protected void restoreData(Data data, Zipper2 zipper2) {
if (zipper2.hasMore()) {
- data.headerBackgroundColor = new Integer(zipper2.nextIntColor());
- data.headerGradientColor = new Integer(zipper2.nextIntColor());
- data.gradientType = GradientType.values()[zipper2.nextByte()];
+ data.setHeaderBackgroundColor(Integer.valueOf(zipper2.nextIntColor()));
+ data.setHeaderGradientColor(Integer.valueOf(zipper2.nextIntColor()));
+ data.setGradientType(GradientType.values()[zipper2.nextByte()]);
}
}
@@ -205,20 +210,22 @@
}
private void saveData(FacesContext context, Data data, String baseColor, String gradientColor) {
- data.headerBackgroundColor = getColorValueParameter(context, baseColor, false);
- data.headerGradientColor = getColorValueParameter(context, gradientColor, false);
+ Integer headerBackgroundColor = getColorValueParameter(context, baseColor, false);
+ Integer headerGradientColor = getColorValueParameter(context, gradientColor, false);
- if (!(data.headerBackgroundColor == null && data.headerGradientColor == null)) {
- if (data.headerBackgroundColor == null) {
- data.headerBackgroundColor = getColorValueParameter(context, baseColor, true);
+ if (!(headerBackgroundColor == null && headerGradientColor == null)) {
+ if (headerBackgroundColor == null) {
+ headerBackgroundColor = getColorValueParameter(context, baseColor, true);
}
- if (data.headerGradientColor == null) {
- data.headerGradientColor = getColorValueParameter(context, gradientColor, true);
+ if (headerGradientColor == null) {
+ headerGradientColor = getColorValueParameter(context, gradientColor, true);
}
}
- data.gradientType = GradientType.getBySkinParameter(getValueParameter(context, Skin.gradientType));
+ data.setHeaderBackgroundColor(headerBackgroundColor);
+ data.setHeaderGradientColor(headerGradientColor);
+ data.setGradientType(GradientType.getBySkinParameter(getValueParameter(context, Skin.gradientType)));
}
protected void saveData(FacesContext context, Data data) {
@@ -279,9 +286,9 @@
*
*/
private static final long serialVersionUID = 1732700513743861250L;
- protected Integer headerBackgroundColor;
- protected Integer headerGradientColor;
- protected GradientType gradientType;
+ private Integer headerBackgroundColor;
+ private Integer headerGradientColor;
+ private GradientType gradientType;
public byte[] toByteArray() {
if (headerBackgroundColor != null && headerGradientColor != null && gradientType != null) {
@@ -293,6 +300,31 @@
return null;
}
}
+
+ public Integer getHeaderBackgroundColor() {
+ return headerBackgroundColor;
+ }
+
+ public void setHeaderBackgroundColor(Integer headerBackgroundColor) {
+ this.headerBackgroundColor = headerBackgroundColor;
+ }
+
+ public Integer getHeaderGradientColor() {
+ return headerGradientColor;
+ }
+
+ public void setHeaderGradientColor(Integer headerGradientColor) {
+ this.headerGradientColor = headerGradientColor;
+ }
+
+ public GradientType getGradientType() {
+ return gradientType;
+ }
+
+ public void setGradientType(GradientType gradientType) {
+ this.gradientType = gradientType;
+ }
+
}
}
Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2008-04-21 15:32:14 UTC (rev 8019)
+++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2008-04-21 15:55:42 UTC (rev 8020)
@@ -49,7 +49,7 @@
public Dimension getDimensions(FacesContext facesContext, Object data) {
Data data2 = (Data) data;
if (data != null) {
- return new Dimension(super.getDimensions(facesContext, data).width, data2.height);
+ return new Dimension(super.getDimensions(facesContext, data).width, data2.getHeight());
} else {
return DIMENSION;
}
@@ -89,12 +89,12 @@
@Override
protected void saveData(FacesContext context, org.richfaces.renderkit.html.BaseGradient.Data data) {
super.saveData(context, data);
- ((Data) data).height = getHeight(context);
+ ((Data) data).setHeight(getHeight(context));
}
protected void restoreData(org.richfaces.renderkit.html.BaseGradient.Data data, Zipper2 zipper2) {
if (zipper2.hasMore()) {
- ((Data) data).height = zipper2.nextInt();
+ ((Data) data).setHeight(zipper2.nextInt());
super.restoreData(data, zipper2);
}
}
@@ -106,7 +106,7 @@
*/
private static final long serialVersionUID = -1499766195614003931L;
- protected Integer height;
+ private Integer height;
@Override
public byte[] toByteArray() {
@@ -116,5 +116,22 @@
return result;
}
+
+ public Integer getHeight() {
+ return height;
+ }
+
+ public void setHeight(Integer height) {
+ this.height = height;
+ }
+
+ public GradientType getGradientType() {
+ return GradientType.PLAIN;
+ }
+
+ public void setGradientType(GradientType gradientType) {
+ //does nothing
+ }
+
};
}
16 years, 8 months
JBoss Rich Faces SVN: r8019 - in trunk/ui: menu-components/src/main/java/org/richfaces/renderkit/html and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-04-21 11:32:14 -0400 (Mon, 21 Apr 2008)
New Revision: 8019
Modified:
trunk/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js
trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/AbstractMenuRenderer.java
trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
Log:
http://jira.jboss.com/jira/browse/RF-3112
Modified: trunk/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js
===================================================================
--- trunk/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js 2008-04-21 15:09:24 UTC (rev 8018)
+++ trunk/ui/contextMenu/src/main/resources/org/richfaces/renderkit/html/scripts/context-menu.js 2008-04-21 15:32:14 UTC (rev 8019)
@@ -76,6 +76,7 @@
var div = document.createElement("div");
div.id = this.id + ":_auto_created";
+ div.style.zoom="1";
this.element.appendChild(div);
var html = this.evaluator.invoke('getContent', context||window).join('');
Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/AbstractMenuRenderer.java
===================================================================
--- trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/AbstractMenuRenderer.java 2008-04-21 15:09:24 UTC (rev 8018)
+++ trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/AbstractMenuRenderer.java 2008-04-21 15:32:14 UTC (rev 8019)
@@ -157,7 +157,7 @@
writer.startElement(HTML.DIV_ELEM, layer);
writer.writeAttribute(HTML.id_ATTRIBUTE, clientId+"_menu", null);
writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-menu-list-border rich-menu-list-border " + styleClass, null);
- writer.writeAttribute(HTML.style_ATTRIBUTE, "visibility: hidden; z-index: 2; " + style, null);
+ writer.writeAttribute(HTML.style_ATTRIBUTE, "display: none; z-index: 2; " + style, null);
writer.startElement(HTML.DIV_ELEM, layer);
writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-menu-list-bg rich-menu-list-bg", null);
encodeItems(context, layer);
Modified: trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2008-04-21 15:09:24 UTC (rev 8018)
+++ trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2008-04-21 15:32:14 UTC (rev 8019)
@@ -88,7 +88,7 @@
},
isVisible: function(layer) {
- return ($(layer).style.visibility == 'visible');
+ return ($(layer).style.display != 'none');
},
/**
@@ -213,7 +213,7 @@
var tmpLayer = $(layer);
if (visible) {
- tmpLayer.style.visibility = 'visible';
+ tmpLayer.style.display = '';
} else {
if(tmpLayer.getElementsByTagName){
var inputs = tmpLayer.getElementsByTagName('INPUT');
@@ -222,7 +222,7 @@
} // if
} // if
- tmpLayer.style.visibility = 'hidden';
+ tmpLayer.style.display = 'none';
// tmpLayer.style.left = "-"+tmpLayer.clientWidth;
// Element.hide(tmpLayer);
} // else
@@ -354,6 +354,13 @@
var bodyHeight = body.height;
var bodyWidth = body.width;
+ var layer_display = this.layer.style.display;
+ if (layer_display=='none')
+ {
+ this.layer.style.visibility='hidden';
+ this.layer.style.display='';
+ }
+
var clientX = this.event.clientX;
var clientY = this.event.clientY;
@@ -409,6 +416,9 @@
this.layer.style.left = layerLeft + "px";
this.layer.style.top = layerTop + "px";
+
+ this.layer.style.display=layer_display;
+ this.layer.style.visibility='';
RichFaces.Menu.Layers.LMPopUp(this.layer.id, false);
RichFaces.Menu.Layers.clearLMTO();
@@ -488,6 +498,13 @@
this.show = function() {
RichFaces.Menu.Layers.shutdown();
+
+ var layer_display = this.layer.style.display;
+ if (layer_display=='none')
+ {
+ this.layer.style.visibility='hidden';
+ this.layer.style.display='';
+ }
var winOffset = RichFaces.Menu.getWindowScrollOffset();
var win = RichFaces.Menu.getWindowDimensions();
@@ -562,6 +579,9 @@
this.layer.style.top = layerPos.top + vOffset - deltaY - this.top + "px";
this.layer.style.width = this.layer.clientWidth + "px";
+
+ this.layer.style.display=layer_display;
+ this.layer.style.visibility='';
RichFaces.Menu.Layers.LMPopUp(this.layer.id, false);
RichFaces.Menu.Layers.clearLMTO();
@@ -583,7 +603,19 @@
this.show = function() {
if (!RichFaces.Menu.Layers.isVisible(this.layer) &&
RichFaces.Menu.Layers.isVisible(RichFaces.Menu.Layers.father[this.layer.id])) {
+
+ var layer_display = this.layer.style.display;
+ if (layer_display=='none')
+ {
+ this.layer.style.visibility='hidden';
+ this.layer.style.display='';
+ }
+
this.reposition();
+
+ this.layer.style.display=layer_display;
+ this.layer.style.visibility='';
+
RichFaces.Menu.Layers.LMPopUp(this.layer, false);
}
}.bind(this);
16 years, 8 months
JBoss Rich Faces SVN: r8018 - in trunk/ui/calendar/src/main: java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: vbaranov
Date: 2008-04-21 11:09:24 -0400 (Mon, 21 Apr 2008)
New Revision: 8018
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
Log:
http://jira.jboss.com/jira/browse/RF-3106
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2008-04-21 15:05:43 UTC (rev 8017)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2008-04-21 15:09:24 UTC (rev 8018)
@@ -116,8 +116,24 @@
<description>Defines date pattern. Default value is "MMM d, yyyy".</description>
<defaultvalue>"MMM d, yyyy"</defaultvalue>
</property>
+
+ <property>
+ <name>defaultTime</name>
+ <classname>java.lang.Object</classname>
+ <description>Defines time that will be used:
+ 1) to set time when the value is empty
+ 2) to set time when date changes and flag "resetTimeOnDateChange" is true </description>
+ <defaultvalue>getDefaultValueOfDefaultTime()</defaultvalue>
+ </property>
<property>
+ <name>resetTimeOnDateChange</name>
+ <classname>boolean</classname>
+ <description>If value is true then calendar should change time to defaultTime for newly-selected dates.</description>
+ <defaultvalue>false</defaultvalue>
+ </property>
+
+ <property>
<name>popup</name>
<classname>boolean</classname>
<description>
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-04-21 15:05:43 UTC (rev 8017)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-04-21 15:09:24 UTC (rev 8018)
@@ -28,9 +28,9 @@
import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
-import javax.el.ELException;
-import javax.el.ValueExpression;
import javax.faces.FacesException;
import javax.faces.application.Application;
import javax.faces.application.FacesMessage;
@@ -58,9 +58,9 @@
import org.richfaces.renderkit.CalendarRendererBase;
import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
-// import org.richfaces.renderkit.html.BaseGradient.Data;
-
/**
* JSF component class
*
@@ -104,7 +104,15 @@
public abstract String getDatePattern();
public abstract void setDatePattern(String pattern);
+
+ public abstract Object getDefaultTime();
+ public abstract void setDefaultTime(Object defaultTime);
+
+ public abstract boolean isResetTimeOnDateChange();
+
+ public abstract void setResetTimeOnDateChange(boolean resetTimeOnDateChange);
+
public abstract Object getMonthLabels();
public abstract void setMonthLabels(Object labels);
@@ -231,6 +239,91 @@
return newCurrentDate;
}
+ /**
+ * Returns default value of "defaultTime" attribute
+ * @return default value of "defaultTime" attribute
+ */
+ protected Object getDefaultValueOfDefaultTime() {
+ Calendar calendar = getCalendar();
+ calendar.set(Calendar.HOUR_OF_DAY, 12);
+ calendar.set(Calendar.MINUTE, 0);
+
+ return calendar.getTime();
+ }
+
+ /**
+ * Returns default time as a <code>Date</code> value.
+ * Hours and minutes values should be taken from the returned date.
+ *
+ * @return default time as a <code>Date</code> value
+ */
+ public Date getFormattedDefaultTime() {
+ Date result = null;
+ Object defaultTime = getDefaultTime();
+
+ if (defaultTime instanceof Calendar) {
+ result = ((Calendar) defaultTime).getTime();
+ } else if (defaultTime instanceof Date) {
+ result = (Date) defaultTime;
+ } else {
+ String defaultTimeString = defaultTime.toString();
+ String datePattern = getDatePattern();
+
+ String timePattern = "\\s*[hHkKma]+[\\W&&\\S]+[hHkKma]+\\s*";
+ Pattern pattern = Pattern.compile(timePattern);
+ Matcher matcher = pattern.matcher(datePattern);
+
+ String subTimePattern = null;
+ if(matcher.find()) {
+ subTimePattern = matcher.group().trim();
+ }
+
+ DateFormat format = new SimpleDateFormat(subTimePattern);
+
+ try {
+ result = format.parse(defaultTimeString);
+ } catch (ParseException parseException) {
+ // parse exception
+ result = null;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Returns hours from "defaultTime" attribute
+ * @return hours from "defaultTime" attribute
+ */
+ public int getDefaultTimeHours() {
+ Date date = getFormattedDefaultTime();
+
+ if (date == null) {
+ return 0;
+ }
+
+ Calendar calendar = getCalendar();
+ calendar.setTime(date);
+
+ return calendar.get(Calendar.HOUR_OF_DAY);
+ }
+
+ /**
+ * Returns minutes from "defaultTime" attribute
+ * @return minutes from "defaultTime" attribute
+ */
+ public int getDefaultTimeMinutes() {
+ Date date = getFormattedDefaultTime();
+
+ if (date == null) {
+ return 0;
+ }
+
+ Calendar calendar = getCalendar();
+ calendar.setTime(date);
+
+ return calendar.get(Calendar.MINUTE);
+ }
+
protected void validateValue(FacesContext context, Object newValue) {
// TODO nick - nick - do we need this?
// store converted value in submitted value to ease client-side code's
16 years, 8 months
JBoss Rich Faces SVN: r8017 - trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-04-21 11:05:43 -0400 (Mon, 21 Apr 2008)
New Revision: 8017
Modified:
trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
Log:
http://jira.jboss.com/jira/browse/RF-2609
Modified: trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
===================================================================
--- trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-04-21 14:49:38 UTC (rev 8016)
+++ trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-04-21 15:05:43 UTC (rev 8017)
@@ -45,6 +45,7 @@
position: absolute;
top:0px;
left:0px;
+ font: inherit;
}
.rich-inplace-input-view-hover {
16 years, 8 months
JBoss Rich Faces SVN: r8016 - in trunk/cdk/generator/src/main: java/org/ajax4jsf/builder/component/state and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-04-21 10:49:38 -0400 (Mon, 21 Apr 2008)
New Revision: 8016
Modified:
trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/ComponentPropertyProcessor.java
trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/PrimitivePropertyProcessor.java
trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/state/ComponentStateManager.java
trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/model/JavaModifier.java
trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm
Log:
http://jira.jboss.com/jira/browse/RF-1343
Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/ComponentPropertyProcessor.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/ComponentPropertyProcessor.java 2008-04-21 14:49:29 UTC (rev 8015)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/ComponentPropertyProcessor.java 2008-04-21 14:49:38 UTC (rev 8016)
@@ -62,6 +62,11 @@
JavaField field = new JavaField(propertyClass, "_" + name, defaultvalue);
field.getComments().add(new JavaComment(propertyBean.getXmlEncodedDescription()));
field.getModifiers().add(JavaModifier.PRIVATE);
+
+ if (propertyBean.isTransient()) {
+ field.addModifier(JavaModifier.TRANSIENT);
+ }
+
handleDeprecation(field.getType(), field);
return field;
}
Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/PrimitivePropertyProcessor.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/PrimitivePropertyProcessor.java 2008-04-21 14:49:29 UTC (rev 8015)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/PrimitivePropertyProcessor.java 2008-04-21 14:49:38 UTC (rev 8016)
@@ -106,7 +106,9 @@
JavaField field = getField(propertyBean, configuration);
JavaField field2 = new JavaField(boolean.class, field.getName() + "Set", "false");
field2.addModifier(JavaModifier.PRIVATE);
-
+ if (propertyBean.isTransient()) {
+ field2.addModifier(JavaModifier.TRANSIENT);
+ }
JavaMethod accessor = getAccessor(configuration, propertyBean, field);
MethodBody accessorMethodBody;
Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/state/ComponentStateManager.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/state/ComponentStateManager.java 2008-04-21 14:49:29 UTC (rev 8015)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/component/state/ComponentStateManager.java 2008-04-21 14:49:38 UTC (rev 8016)
@@ -101,7 +101,9 @@
public ComponentStateDescriptor getDesriptor(PropertyBean propertyBean, JavaField field) {
Set<JavaModifier> modifiers = field.getModifiers();
- if (modifiers.contains(JavaModifier.FINAL) || modifiers.contains(JavaModifier.STATIC)){
+ if (modifiers.contains(JavaModifier.FINAL)
+ || modifiers.contains(JavaModifier.STATIC)
+ || modifiers.contains(JavaModifier.TRANSIENT)){
return null;
}
Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/model/JavaModifier.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/model/JavaModifier.java 2008-04-21 14:49:29 UTC (rev 8015)
+++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/model/JavaModifier.java 2008-04-21 14:49:38 UTC (rev 8016)
@@ -35,7 +35,9 @@
PROTECTED,
PUBLIC,
STATIC,
- FINAL;
+ FINAL,
+ TRANSIENT
+ ;
public String toString() {
return super.toString().toLowerCase();
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2008-04-21 14:49:29 UTC (rev 8015)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2008-04-21 14:49:38 UTC (rev 8016)
@@ -113,12 +113,17 @@
#else
#if (!${prop.simpleType})
if (this._${prop.name} != null) {
- #end
-
comp.${prop.setterName}(this._${prop.name});
-
- #if (!${prop.simpleType})
}
+ #else
+ #set ($propertyClass = ${prop.boxingClass})
+ $propertyClass __${prop.name} = ($propertyClass) getFacesContext().
+ getApplication().
+ getExpressionFactory().
+ coerceToType(this._${prop.name},
+ ${propertyClass}.class);
+ comp.${prop.setterName}(__${prop.name}.${prop.classname}Value());
+
#end
#end
#end
16 years, 8 months
JBoss Rich Faces SVN: r8015 - trunk/cdk/maven-cdk-plugin/src/main/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-04-21 10:49:29 -0400 (Mon, 21 Apr 2008)
New Revision: 8015
Modified:
trunk/cdk/maven-cdk-plugin/src/main/resources/VM_global_library.vm
Log:
http://jira.jboss.com/jira/browse/RF-1343
Modified: trunk/cdk/maven-cdk-plugin/src/main/resources/VM_global_library.vm
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/resources/VM_global_library.vm 2008-04-21 14:30:47 UTC (rev 8014)
+++ trunk/cdk/maven-cdk-plugin/src/main/resources/VM_global_library.vm 2008-04-21 14:49:29 UTC (rev 8015)
@@ -13,7 +13,7 @@
#if ($prop.el)
#set($type = "ValueExpression")
#else
- #set($type = ${prop.classname})
+ #set($type = "String")
#end
#end
16 years, 8 months
JBoss Rich Faces SVN: r8014 - trunk/docs/migrationguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-21 10:30:47 -0400 (Mon, 21 Apr 2008)
New Revision: 8014
Modified:
trunk/docs/migrationguide/en/src/main/docbook/modules/intro.xml
Log:
http://jira.jboss.com/jira/browse/RF-3048
Language correction
Modified: trunk/docs/migrationguide/en/src/main/docbook/modules/intro.xml
===================================================================
--- trunk/docs/migrationguide/en/src/main/docbook/modules/intro.xml 2008-04-21 14:30:40 UTC (rev 8013)
+++ trunk/docs/migrationguide/en/src/main/docbook/modules/intro.xml 2008-04-21 14:30:47 UTC (rev 8014)
@@ -13,7 +13,7 @@
This document is aimed to provide guidelines for migrating <property>RichFaces</property> projects from 3.1.x versions to 3.2.0.
</para>
<para>
- <property>RichFaces</property> Migration Guide implies descriptions concerning issues caused by migration and provides
+ <property>RichFaces</property> Migration Guide covers troublesome issues caused by migration and provides
suitable workarounds and examples.
</para>
</chapter>
\ No newline at end of file
16 years, 8 months
JBoss Rich Faces SVN: r8013 - trunk/docs/migrationguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-21 10:30:40 -0400 (Mon, 21 Apr 2008)
New Revision: 8013
Modified:
trunk/docs/migrationguide/en/src/main/docbook/included/menuJSF.xml
Log:
http://jira.jboss.com/jira/browse/RF-3048
Language correction
Modified: trunk/docs/migrationguide/en/src/main/docbook/included/menuJSF.xml
===================================================================
--- trunk/docs/migrationguide/en/src/main/docbook/included/menuJSF.xml 2008-04-21 14:30:24 UTC (rev 8012)
+++ trunk/docs/migrationguide/en/src/main/docbook/included/menuJSF.xml 2008-04-21 14:30:40 UTC (rev 8013)
@@ -11,7 +11,7 @@
<section>
<title>Description</title>
<para>
- Menu components are not working with JSF-RI-1.2_08:
+ Menu components do not work with JSF-RI-1.2_08:
</para>
<itemizedlist>
<listitem>
@@ -21,7 +21,7 @@
</listitem>
<listitem>
<para>
- The <emphasis role="bold"><property><rich:dropDownMenu></property></emphasis> component causes the exception with showing XHTML invalid output
+ The <emphasis role="bold"><property><rich:dropDownMenu></property></emphasis> component causes the exception, displaying a XHTML invalid output message
</para>
</listitem>
</itemizedlist>
@@ -49,13 +49,13 @@
<section>
<title>How to reproduce</title>
<para>
- Having JSF-RI 1.2_08 and menu components on a page.
+ The described above problems occur if JSF-RI 1.2_08 and menu components are used on a page
</para>
</section>
<section>
<title>Causes</title>
<para>
- Critical bug in JSF-RI 1.2_08. Already fixed for the further released there.
+ It is a critical bug in JSF-RI 1.2_08 which has been already fixed is the further releases.
</para>
</section>
@@ -63,7 +63,7 @@
<title>Workarounds</title>
<para>
Downgrade to <ulink url="https://javaserverfaces.dev.java.net/servlets/ProjectDocumentList?folderI...">JSF-RI 1.2_07</ulink>
- or use recent <ulink url="https://javaserverfaces.dev.java.net/servlets/ProjectDocumentList?folderI...">JSF-RI SNAPSHOT</ulink>.
+ or use the most recent <ulink url="https://javaserverfaces.dev.java.net/servlets/ProjectDocumentList?folderI...">JSF-RI SNAPSHOT</ulink>.
</para>
</section>
16 years, 8 months
JBoss Rich Faces SVN: r8012 - trunk/docs/migrationguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-21 10:30:24 -0400 (Mon, 21 Apr 2008)
New Revision: 8012
Modified:
trunk/docs/migrationguide/en/src/main/docbook/included/i18n.xml
Log:
http://jira.jboss.com/jira/browse/RF-3048
Language correction
Modified: trunk/docs/migrationguide/en/src/main/docbook/included/i18n.xml
===================================================================
--- trunk/docs/migrationguide/en/src/main/docbook/included/i18n.xml 2008-04-21 14:30:16 UTC (rev 8011)
+++ trunk/docs/migrationguide/en/src/main/docbook/included/i18n.xml 2008-04-21 14:30:24 UTC (rev 8012)
@@ -11,7 +11,7 @@
<section>
<title>Description</title>
<para>
- Application with i18n does not work correctly caused by the validation error when non-ASCII characters is used
+ An application with i18n does not work correctly due to the validation error that occurs when non-ASCII characters are used.
</para>
</section>
<section>
@@ -44,14 +44,14 @@
<section>
<title>Causes</title>
<para>
- Bug (came with <emphasis role="bold"><property><rich:fileUpload></property></emphasis> component)
+ Bug is caused by the<emphasis role="bold"><property><rich:fileUpload></property></emphasis> component
</para>
</section>
<section>
<title>Workarounds</title>
<para>
- The decision is to upgrade to <ulink url="http://www.jboss.org/jbossrichfaces/downloads/">RichFaces 3.2.0 SP1</ulink>
+ You need to update to <ulink url="http://www.jboss.org/jbossrichfaces/downloads/">RichFaces 3.2.0 SP1</ulink>
</para>
</section>
16 years, 8 months
JBoss Rich Faces SVN: r8011 - trunk/docs/migrationguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-21 10:30:16 -0400 (Mon, 21 Apr 2008)
New Revision: 8011
Modified:
trunk/docs/migrationguide/en/src/main/docbook/included/binding.xml
Log:
http://jira.jboss.com/jira/browse/RF-3048
Language correction
Modified: trunk/docs/migrationguide/en/src/main/docbook/included/binding.xml
===================================================================
--- trunk/docs/migrationguide/en/src/main/docbook/included/binding.xml 2008-04-21 14:20:10 UTC (rev 8010)
+++ trunk/docs/migrationguide/en/src/main/docbook/included/binding.xml 2008-04-21 14:30:16 UTC (rev 8011)
@@ -11,9 +11,8 @@
<section>
<title>Description</title>
<para>
- Binding does not work for all components in JSP.
- It is impossible to use <emphasis><property>"binding"</property></emphasis> attribute for
- RichFaces components. Wrong class-name is used in TLD generated from XML configuration files.
+ Binding does not work for all components in JSP: it is impossible to use the<emphasis><property>"binding"</property></emphasis> attribute for
+ RichFaces components, since wrong class-name is used in TLD generated from XML configuration files.
</para>
</section>
<section>
@@ -33,22 +32,22 @@
</section>
<section>
<title>How to reproduce</title>
-<para>
- Just using binding attribute.
-</para>
+ <para>
+ The described above problem occurs if binding attribute is used with RichFaces components.
+ </para>
</section>
<section>
<title>Causes</title>
<para>
- There was <property><classname>java.lang.String</classname></property> instead of <property><classname>javax.faces.component.UIComponent</classname></property> in configuration files.
+ There was a wrong<property><classname>java.lang.String</classname></property> specified instead of <property><classname>javax.faces.component.UIComponent</classname></property> in configuration files.
</para>
</section>
<section>
<title>Workarounds</title>
<para>
- The decision is to use <property>Facelets</property> upgrade to <ulink url=" http://www.jboss.org/jbossrichfaces/downloads/">RichFaces 3.2.0 SP1</ulink>
+ The solution is to use <property>Facelets</property> upgrade to <ulink url=" http://www.jboss.org/jbossrichfaces/downloads/">RichFaces 3.2.0 SP1</ulink>
</para>
</section>
-</section>
\ No newline at end of file
+</section>
16 years, 8 months