JBoss Rich Faces SVN: r7780 - trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-04-11 17:41:01 -0400 (Fri, 11 Apr 2008)
New Revision: 7780
Modified:
trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
Log:
SuggestionBoxRenderer.java: message text corrected
Modified: trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
===================================================================
--- trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2008-04-11 21:39:37 UTC (rev 7779)
+++ trunk/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2008-04-11 21:41:01 UTC (rev 7780)
@@ -359,7 +359,7 @@
return parent;
} else {
throw new FacesException("SuggestonBox cannot be attached to the component with id = " + parent.getId() +
- ", because a client identifier of the component won�t be rendered onto the page. Please, set the identifier.");
+ ", because a client identifier of the component won't be rendered onto the page. Please, set the identifier.");
}
} else {
throw new FacesException("Parent component is null for SuggestionBox " +
16 years, 9 months
JBoss Rich Faces SVN: r7779 - in trunk: framework/impl/src/main/java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-04-11 17:39:37 -0400 (Fri, 11 Apr 2008)
New Revision: 7779
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java
trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java
trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java
Log:
Code review results for TabPanel committed
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2008-04-11 21:36:29 UTC (rev 7778)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2008-04-11 21:39:37 UTC (rev 7779)
@@ -32,7 +32,6 @@
import java.util.Map;
import java.util.Set;
-import javax.faces.component.ActionSource;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
@@ -902,6 +901,8 @@
}
/**
+ * TODO: add deprecation
+ *
* @param facesContext
* @param component
* @param id
Modified: trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java 2008-04-11 21:36:29 UTC (rev 7778)
+++ trunk/framework/impl/src/main/java/org/richfaces/component/UISwitchablePanel.java 2008-04-11 21:39:37 UTC (rev 7779)
@@ -73,6 +73,7 @@
return (String) switchTypeBinding.getValue(FacesContext.getCurrentInstance());
}
+ //TODO use DEFAULT_METHOD
return SERVER_METHOD;
}
@@ -100,11 +101,12 @@
public void broadcast(FacesEvent facesEvent) throws AbortProcessingException {
if(facesEvent instanceof ActionEvent){
- if(isImmediate()){
+ //TODO invoke action listener or remove it
+ if(isImmediate()){
FacesContext facesContext = FacesContext.getCurrentInstance();
facesContext.renderResponse();
}
- }
+ } //TODO else here
if (facesEvent instanceof SwitchablePanelSwitchEvent) {
if (isRendered()) {
@@ -115,12 +117,13 @@
switchEvent.getValue());
Object oldValue = getValue();
- if (oldValue == null && newValue != null ||
- oldValue != null && !oldValue.equals(newValue)) {
+ if ((oldValue == null && newValue != null) ||
+ (oldValue != null && !oldValue.equals(newValue))) {
queueEvent(new ValueChangeEvent(this, oldValue, newValue));
}
+ //TODO UIInput should update the model, not the switchable panel itself
ValueBinding valueBinding = getValueBinding("value");
if (valueBinding != null) {
valueBinding.setValue(facesContext, newValue);
@@ -190,33 +193,33 @@
}
public void processUpdates(FacesContext context) {
- if (context == null) {
- throw new NullPointerException("FacesContext is null!");
- }
+ if (context == null) {
+ throw new NullPointerException("FacesContext is null!");
+ }
- if (!isRendered()) {
- return ;
- }
+ if (!isRendered()) {
+ return ;
+ }
- Iterator kids = getSwitchedFacetsAndChildren();
- while (kids.hasNext()) {
- UIComponent kid = (UIComponent) kids.next();
- kid.processUpdates(context);
- }
+ Iterator kids = getSwitchedFacetsAndChildren();
+ while (kids.hasNext()) {
+ UIComponent kid = (UIComponent) kids.next();
+ kid.processUpdates(context);
+ }
- try {
- updateModel(context);
+ try {
+ updateModel(context);
- if (!isValid()) {
- context.renderResponse();
- }
-
- } catch (RuntimeException e) {
- context.renderResponse();
- throw e;
- }
- }
+ if (!isValid()) {
+ context.renderResponse();
+ }
+ } catch (RuntimeException e) {
+ context.renderResponse();
+ throw e;
+ }
+ }
+
public void processValidators(FacesContext context) {
if (context == null) {
throw new NullPointerException("FacesContext is null!");
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2008-04-11 21:36:29 UTC (rev 7778)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2008-04-11 21:39:37 UTC (rev 7779)
@@ -88,6 +88,7 @@
/* (non-Javadoc)
* @see org.ajax4jsf.framework.ajax.AjaxActionComponent#setupReRender()
*/
+ //TODO remove
protected void setupReRender() {
super.setupReRender();
AjaxRendererUtils.addRegionByName(getFacesContext(), this, this.getId());
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2008-04-11 21:36:29 UTC (rev 7778)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2008-04-11 21:39:37 UTC (rev 7779)
@@ -57,15 +57,23 @@
public boolean evaluate(Object object) {
UITab tab = (UITab) object;
- return !tab.isDisabled() && (CLIENT_METHOD.equals(tab.getSwitchTypeOrDefault())) ||
- (renderedValue != null && renderedValue.equals(tab.getName()));
+
+ if (tab.isDisabled()) {
+ return false;
+ }
+
+ if (CLIENT_METHOD.equals(tab.getSwitchTypeOrDefault())) {
+ return true;
+ }
+
+ return renderedValue != null && renderedValue.equals(tab.getName());
}
});
}
public boolean isImmediate() {
-
+ //TODO reorganize method
if(!super.isImmediate()){
if(processedTabImmediate){
return true;
@@ -77,7 +85,7 @@
}
-
+ //TODO JavaDoc
public Object convertSwitchValue(UIComponent component, Object object) {
if (object != null) {
return object;
@@ -129,21 +137,21 @@
private transient Object restoredRenderedValue;
public void processDecodes(FacesContext context) {
- if (context == null) {
- throw new NullPointerException("FacesContext is null!");
- }
+ if (context == null) {
+ throw new NullPointerException("FacesContext is null!");
+ }
- if (!isRendered()) {
- return ;
- }
+ if (!isRendered()) {
+ return ;
+ }
- //RF-1047 - retry to obtain restoredRenderedValue. Seam conversations are absent on 1st phase thus
- //value is absent also
- if (restoredRenderedValue == null) {
- this.restoredRenderedValue = getRenderedValue();
- }
+ //RF-1047 - retry to obtain restoredRenderedValue. Seam conversations are absent on 1st phase thus
+ //value is absent also
+ if (restoredRenderedValue == null) {
+ this.restoredRenderedValue = getRenderedValue();
+ }
- super.processDecodes(context);
+ super.processDecodes(context);
}
public Object saveState(FacesContext context) {
@@ -158,21 +166,22 @@
Object[] states = (Object[]) state;
super.restoreState(context, states[0]);
this.renderedValue = states[1];
+ //TODO remove that
this.restoredRenderedValue = getRenderedValue();
}
private static final Predicate RENDERED_TAB_PREDICATE = new Predicate() {
- public boolean evaluate(Object object) {
- if (object instanceof UITab) {
- UITab tab = (UITab) object;
-
- return tab.isRendered();
- }
-
- return false;
- }
-
+ public boolean evaluate(Object object) {
+ if (object instanceof UITab) {
+ UITab tab = (UITab) object;
+
+ return tab.isRendered();
+ }
+
+ return false;
+ }
+
};
/**
@@ -182,13 +191,15 @@
* @return Iterator
*/
public Iterator getRenderedTabs() {
- if (getChildCount() > 0) {
- return new FilterIterator(getChildren().iterator(), RENDERED_TAB_PREDICATE);
- } else {
- return CollectionUtils.EMPTY_COLLECTION.iterator();
- }
+ if (getChildCount() > 0) {
+ return new FilterIterator(getChildren().iterator(), RENDERED_TAB_PREDICATE);
+ } else {
+ return CollectionUtils.EMPTY_COLLECTION.iterator();
+ }
}
+
+ //TODO remove switchType attribute
/**
* Get Tab selection behavior for panel - one of "client", "server", "ajax", "page".
*
@@ -232,6 +243,7 @@
return (UITab)component;
}
+ //TODO use getTabs() iterator
private UITab getTabWithName(Object tabName){
List children = getChildren();
@@ -249,6 +261,7 @@
if(event instanceof SwitchablePanelSwitchEvent && this.equals(event.getComponent())){
SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent)event;
UITab tab = processedTab(switchEvent.getEventSource(),switchEvent.getValue());
+ //Check if target Tab is immediate
processedTabImmediate = tab.isImmediate();
}
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2008-04-11 21:36:29 UTC (rev 7778)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2008-04-11 21:39:37 UTC (rev 7779)
@@ -36,7 +36,6 @@
import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
-import org.ajax4jsf.util.HtmlDimensions;
import org.richfaces.component.UISwitchablePanel;
import org.richfaces.component.UITab;
import org.richfaces.component.UITabPanel;
@@ -51,17 +50,21 @@
private static final String LABEL_SUFFIX = "_lbl";
- protected Class getComponentClass() {
+ protected Class<? extends UIComponent> getComponentClass() {
return UITab.class;
}
// find and encode UIParameter's components
+ //TODO generify
+ //TODO move the code to utils
public List encodeParams(FacesContext context, UITab component) throws IOException {
UITab menuItem = component;
List params = new ArrayList();
+ //TODO use StringBuilder
StringBuffer buff = new StringBuffer();
+ //TODO use getChildCount() > 0
List children = menuItem.getChildren();
for (Iterator iterator = children.iterator(); iterator.hasNext();) {
UIComponent child = (UIComponent) iterator.next();
@@ -79,8 +82,11 @@
buff.append("] = ");
buff.append(ScriptUtils.toScript(value));
buff.append(";");
+
+ //TODO ???
params.add(buff.toString());
-
+
+ buff.setLength(0);
}
}
}
@@ -105,13 +111,20 @@
String clientId = tab.getClientId(context);
//String style = "position:relative; top:1px;" + (String) tab.getAttributes().get("style");
+
+ //TODO use CSS classes
String defShift = tab.isActive() ? "position:relative; top:1px;" : "position:relative;";
String componentStyle = (String) tab.getAttributes().get("style");
String style = defShift + (componentStyle != null ? componentStyle : "");
+ //TODO format code block properly
if (!disabled) {
if (clientSide) {
- writer.writeAttribute(HTML.onclick_ATTRIBUTE, "if (RichFaces.onTabChange(event, '"+pane.getClientId(context)+"','"+clientId+"')) RichFaces.switchTab('" + pane.getClientId(context) + "','" + clientId + "','" + getUtils().formatValue(context, pane, tab.getName()) + "');", "switchScript");
+ //TODO use StringBuilder
+ writer.writeAttribute(HTML.onclick_ATTRIBUTE, "if (RichFaces.onTabChange(event, '"+pane.getClientId(context)+"','"+
+ clientId+"')) RichFaces.switchTab('" +
+ pane.getClientId(context) + "','" + clientId + "','" +
+ getUtils().formatValue(context, pane, tab.getName()) + "');", "switchScript");
} else {
String activeCheck = "if (RichFaces.isTabActive('" + clientId + LABEL_SUFFIX + "')) return false;";
String eventCheck = " if (!RichFaces.onTabChange(event, '"+pane.getClientId(context)+"','"+clientId+"')) return false;";
@@ -125,10 +138,11 @@
StringBuffer buffer = new StringBuffer();
function.appendScript(buffer);
+ //TODO remove this.onclick = null
buffer.append("; return false; this.onclick = null;");
String script = buffer.toString();
writer.writeAttribute(HTML.onclick_ATTRIBUTE, activeCheck + eventCheck + script, null);
- } else {
+ } else /* TODO if server */ {
StringBuffer script = new StringBuffer("var _formName = A4J.findForm(this).id; var _paramName = '" + clientId + "_server_submit'; var _params = new Object(); _params[_paramName] = _paramName; ");
List params = encodeParams(context, tab);
@@ -139,6 +153,7 @@
script.append("_JSFFormSubmit('");
script.append(clientId);
script.append("', _formName, null, _params);");
+ //TODO remove this.onclick = null
script.append("this.onclick = null; _clearJSFFormParameters(_formName, null, [_paramName]);");
writer.writeAttribute(HTML.onclick_ATTRIBUTE, activeCheck + eventCheck + script.toString()
@@ -150,8 +165,10 @@
String width = tab.getLabelWidth();
+ //TODO move to class
style += ";height : 100%; ";
if (width != null) {
+ //TODO use qualifySize
style += " width: " + getUtils().encodePctOrPx(width) + ";";
}
@@ -160,6 +177,7 @@
}
}
+ //TODO review
public boolean getRendersChildren() {
return true;
}
@@ -202,21 +220,23 @@
writer.writeAttribute(HTML.title_ATTRIBUTE, title, null);
}
+ //TODO make "label" constant
UIComponent facet = tab.getFacet("label");
- if (facet != null && facet.isRendered()) {
- renderChild(context, facet);
- } else {
- String label = tab.getLabel();
+ if (facet != null && facet.isRendered()) {
+ renderChild(context, facet);
+ } else {
+ String label = tab.getLabel();
- if (label == null || label.length() == 0) {
- label = " ";
- writer.write(label);
- }else{
- writer.writeText(label,null);
- }
-
- }
+ if (label == null || label.length() == 0) {
+ //TODO to constant
+ label = " ";
+ writer.write(label);
+ }else{
+ writer.writeText(label,null);
+ }
+
+ }
}
@@ -232,7 +252,6 @@
public String encodeHeaderSpacing(FacesContext context, UITab tab) throws IOException {
UITabPanel pane = tab.getPane();
String headerSpacing = pane.getHeaderSpacing();
- Double decoded = HtmlDimensions.decode(headerSpacing);
return "width: " + HtmlUtil.qualifySize(headerSpacing) + "; ";
}
16 years, 9 months
JBoss Rich Faces SVN: r7778 - in trunk: ui/functions and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-04-11 17:36:29 -0400 (Fri, 11 Apr 2008)
New Revision: 7778
Modified:
trunk/test-applications/seleniumTest/
trunk/ui/functions/
trunk/ui/progressBAR/
Log:
service files & folders svn:ignored
Property changes on: trunk/test-applications/seleniumTest
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Property changes on: trunk/ui/functions
___________________________________________________________________
Name: svn:ignore
- target
+ target
.classpath
.project
.settings
Property changes on: trunk/ui/progressBAR
___________________________________________________________________
Name: svn:ignore
- target
.classpath
.project
.settings
.clover
+ target
.classpath
.project
.settings
.clover
bin
16 years, 9 months
JBoss Rich Faces SVN: r7777 - in branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf: webapp/nekko and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2008-04-11 16:41:59 -0400 (Fri, 11 Apr 2008)
New Revision: 7777
Modified:
branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java
branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java
branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/NamespaceMappings.java
branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java
Log:
fix problem with two or more parameters for an outputLink
Modified: branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
===================================================================
--- branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-04-11 18:05:38 UTC (rev 7776)
+++ branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-04-11 20:41:59 UTC (rev 7777)
@@ -140,6 +140,9 @@
/** Session bean name to store max files count allowed to upload */
public static final String UPLOADED_COUNTER = "_richfaces_uploaded_file_counter";
+
+ /** Request parameter name indicated that file was uploaded by RF component */
+ public static final String FILE_UPLOAD_INDICATOR = "_richfaces_upload_file_indicator";
/**
* Initialize the filter.
Modified: branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java
===================================================================
--- branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java 2008-04-11 18:05:38 UTC (rev 7776)
+++ branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java 2008-04-11 20:41:59 UTC (rev 7777)
@@ -136,24 +136,25 @@
private class NekoParserConfig extends ParserConfig {
protected HtmlParser createParser(String mime) {
- NekkoParser parser;
- try {
- synchronized (_xhtmlParsersPool) {
- parser = (NekkoParser) _xhtmlParsersPool.pop();
+ NekkoParser parser;
+ try {
+ synchronized (_xhtmlParsersPool) {
+ parser = (NekkoParser) _xhtmlParsersPool.pop();
+ }
+ } catch (EmptyStackException e) {
+ parser = new NekkoParser();
+ parser.setPublicId(getPublicid());
+ parser.setSystemid(getSystemid());
+ parser.setNamespace(getNamespace());
+ // If tidy not handle all requests, disable reorganising
+ // of html
+ // parser.setMoveElements(isForcexml());
+ parser.init();
+ }
+ parser.setMime(mime);
+ // TODO - set header scripts/styles filter.
+ return parser;
}
- } catch (EmptyStackException e) {
- parser = new NekkoParser();
- parser.setPublicId(getPublicid());
- parser.setSystemid(getSystemid());
- parser.setNamespace(getNamespace());
- // If tidy not handle all requests, disable reorganising
- // of html
- // parser.setMoveElements(isForcexml());
- parser.init();
- }
- // TODO - set header scripts/styles filter.
- return parser;
- }
boolean storeParser(HtmlParser parser) {
if (null != parser && parser instanceof NekkoParser) {
Modified: branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java
===================================================================
--- branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java 2008-04-11 18:05:38 UTC (rev 7776)
+++ branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java 2008-04-11 20:41:59 UTC (rev 7777)
@@ -36,6 +36,7 @@
import javax.xml.parsers.ParserConfigurationException;
import org.ajax4jsf.application.AjaxViewHandler;
+import org.ajax4jsf.webapp.BaseXMLFilter;
import org.ajax4jsf.webapp.HtmlParser;
import org.ajax4jsf.xml.serializer.Method;
import org.ajax4jsf.xml.serializer.OutputPropertiesFactory;
@@ -108,6 +109,12 @@
private String _outputEncoding;
+ private Serializer _XHTMLserializer;
+
+ private Serializer _XMLserialiser;
+
+ private Serializer _HTMLserialiser;
+
/**
*
*/
@@ -121,10 +128,12 @@
_parser = new HtmlSAXParser(getHtmlConfig());
Properties properties = OutputPropertiesFactory
.getDefaultMethodProperties(Method.XHTML);
- // Properties properties =
- // OutputPropertiesFactory.getDefaultMethodProperties(Method.XML);
- // properties.put("encoding",_encoding);
- _serializer = SerializerFactory.getSerializer(properties);
+ _XHTMLserializer = SerializerFactory.getSerializer(properties);
+ properties = OutputPropertiesFactory.getDefaultMethodProperties(Method.XML);
+ _XMLserialiser = SerializerFactory.getSerializer(properties);
+ properties = OutputPropertiesFactory.getDefaultMethodProperties(Method.HTML);
+ _HTMLserialiser = SerializerFactory.getSerializer(properties);
+ _serializer = _HTMLserialiser;
// serializer.setOutputStream(output);
// _parser.setContentHandler(serializer.asContentHandler());
viewStateParser = new DOMFragmentParser();
@@ -168,7 +177,10 @@
_userStyles = null;
_viewState = null;
_parser.reset();
- _serializer.reset();
+ _XMLserialiser.reset();
+ _HTMLserialiser.reset();
+ _XHTMLserializer.reset();
+ _serializer = _HTMLserialiser;
}
/*
@@ -772,6 +784,18 @@
}
public boolean setMime(String mimeType) {
+ if(null != mimeType) {
+ if(mimeType.startsWith(BaseXMLFilter.TEXT_HTML)){
+ _serializer = _HTMLserialiser;
+ } else if (mimeType.startsWith(BaseXMLFilter.APPLICATION_XHTML_XML)) {
+ _serializer = _XHTMLserializer;
+ } else if (mimeType.startsWith("text/xml")) {
+ _serializer = _XMLserialiser;
+ } else {
+ return false;
+ }
+ return true;
+ }
return false;
}
Modified: branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/NamespaceMappings.java
===================================================================
--- branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/NamespaceMappings.java 2008-04-11 18:05:38 UTC (rev 7776)
+++ branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/NamespaceMappings.java 2008-04-11 20:41:59 UTC (rev 7777)
@@ -221,8 +221,10 @@
Stack stack;
if ((stack = (Stack) m_namespaces.get(prefix)) != null)
{
- stack.pop();
- return true;
+ if (!stack.isEmpty()) {
+ stack.pop();
+ }
+ return true;
}
return false;
}
Modified: branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java
===================================================================
--- branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2008-04-11 18:05:38 UTC (rev 7776)
+++ branches/3.2.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/ToXHTMLStream.java 2008-04-11 20:41:59 UTC (rev 7777)
@@ -1326,7 +1326,7 @@
// Since http://www.ietf.org/rfc/rfc2396.txt refers to the URI grammar as
// not allowing quotes in the URI proper syntax, nor in the fragment
// identifier, we believe that it's OK to double escape quotes.
- else if (ch == '"')
+ else if (ch == '"' || ch == '<' || ch == '>' || ch == '&')
{
// If the character is a '%' number number, try to avoid double-escaping.
// There is a question if this is legal behavior.
@@ -1346,11 +1346,18 @@
// Mike Kay encodes this as ", so he may know something I don't?
- if (doURLEscaping)
- writer.write("%22");
- else
- writer.write("""); // we have to escape this, I guess.
+ if (doURLEscaping){
+ writer.write('%');
+ writer.write(makeHHString(ch));
+ } else {
+ int pos = accumDefaultEntity(writer, ch, i, chars, end, false, true);
+ if (i != pos)
+ {
+ i = pos - 1;
+ }
+// writer.write("""); // we have to escape this, I guess.
+ }
// We have written out any clean characters, then the escaped '%' and now we
// We now we reset the next possible clean character.
cleanStart = i + 1;
16 years, 9 months
JBoss Rich Faces SVN: r7776 - trunk/ui/calendar/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits@lists.jboss.org
Author: vbaranov
Date: 2008-04-11 14:05:38 -0400 (Fri, 11 Apr 2008)
New Revision: 7776
Modified:
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-2978
Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-04-11 17:27:48 UTC (rev 7775)
+++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-04-11 18:05:38 UTC (rev 7776)
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.text.DateFormatSymbols;
import java.text.Format;
-import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@@ -35,10 +34,8 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.Set;
-import java.util.logging.Level;
import javax.el.ValueExpression;
-import javax.faces.application.Application;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -60,6 +57,8 @@
import org.richfaces.component.util.ComponentUtil;
import org.richfaces.event.CurrentDateChangeEvent;
+import com.sun.faces.util.Util;
+
/**
* @author Nick Belaevski - mailto:nbelaevski@exadel.com created 08.06.2007
*
@@ -93,7 +92,7 @@
*
* @see org.ajax4jsf.framework.renderer.RendererBase#getComponentClass()
*/
- protected Class getComponentClass() {
+ protected Class<? extends UIComponent> getComponentClass() {
return UICalendar.class;
}
@@ -101,7 +100,7 @@
UICalendar component) {
AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
- Set ajaxRenderedAreas = ajaxContext.getAjaxRenderedAreas();
+ Set<String> ajaxRenderedAreas = ajaxContext.getAjaxRenderedAreas();
String clientId = component.getClientId(context);
if (ajaxContext.isAjaxRequest() && ajaxRenderedAreas.contains(clientId)) {
@@ -131,40 +130,110 @@
converter = calendar.getConverter();
if ((converter == null) && (valueExpression != null)) {
- Class<?> converterType = valueExpression.getType(context.getELContext());
+ Class<? extends Object> converterType = valueExpression.getType(context.getELContext());
if((converterType != null) && (converterType != Object.class)) {
// if getType returns a type for which we support a default
// conversion, acquire an appropriate converter instance.
- try {
- Application application = context.getApplication();
- converter = application.createConverter(converterType);
- if (log.isInfoEnabled()) {
- log.info(MessageFormat.format("Created converter ({0}) for type {1} for component {2}.", new Object[] {
- converter.getClass().getName(), converterType.getClass().getName(), component.getId() }));
- }
- } catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error(MessageFormat.format("Could not instantiate converter for type {0}: {1}", new Object[] {
- converterType, e.toString() }));
- }
- return (null);
- }
+ converter = Util.getConverterForClass(converterType, context);
}
}
-
- if (converter != null) {
- // Use configured converter
- return converter.getAsObject(context, component, newValue);
- } else {
- // in case the converter hasn't been set, try to use default DateTimeConverter
- DateTimeConverter defaultConverter = new DateTimeConverter();
- defaultConverter.setPattern(calendar.getDatePattern());
- defaultConverter.setLocale(calendar.getAsLocale(calendar.getLocale()));
- defaultConverter.setTimeZone(calendar.getTimeZone());
- return defaultConverter.getAsObject(context, component, newValue);
+
+ // in case the converter hasn't been set, try to use default DateTimeConverter
+ if (converter == null) {
+ converter = createDefaultConverter(calendar);
}
+ return converter.getAsObject(context, component, newValue);
}
+
+ /**
+ * Overloads getFormattedValue to take a advantage of a previously
+ * obtained converter.
+ * @param context the FacesContext for the current request
+ * @param component UIComponent of interest
+ * @param currentValue the current value of <code>component</code>
+ * @param converter the component's converter
+ * @return the currentValue after any associated Converter has been
+ * applied
+ *
+ * @throws ConverterException if the value cannot be converted
+ */
+ protected String getFormattedValue(FacesContext context, UIComponent component, Object currentValue,
+ Converter converter) throws ConverterException {
+ // formatting is supported only for components that support
+ // converting value attributes.
+ if (!(component instanceof UICalendar)) {
+ if (currentValue != null) {
+ return currentValue.toString();
+ }
+ return null;
+ }
+ UICalendar calendar = (UICalendar) component;
+
+ if (converter == null) {
+ // If there is a converter attribute, use it to to ask application
+ // instance for a converter with this identifer.
+ converter = calendar.getConverter();
+ }
+
+ if (converter == null) {
+ // if value is null and no converter attribute is specified, then
+ // return a zero length String.
+ if(currentValue == null) {
+ return "";
+ }
+ // Do not look for "by-type" converters for Strings
+ if (currentValue instanceof String) {
+ return (String) currentValue;
+ }
+
+ // if converter attribute set, try to acquire a converter
+ // using its class type.
+ Class<? extends Object> converterType = currentValue.getClass();
+ converter = Util.getConverterForClass(converterType, context);
+
+ // if there is no default converter available for this identifier,
+ // assume the model type to be String.
+ if (converter == null) {
+ // in case the converter hasn't been set, try to use default DateTimeConverter
+ converter = createDefaultConverter(calendar);
+ }
+ }
+
+ return converter.getAsString(context, calendar, currentValue);
+ }
+
+
+ /**
+ * @param context the FacesContext for the current request
+ * @param component UIComponent of interest
+ * @param currentValue the current value of <code>component</code>
+ *
+ * @return the currentValue after any associated Converter has been
+ * applied
+ *
+ * @throws ConverterException if the value cannot be converted
+ */
+ protected String getFormattedValue(FacesContext context, UIComponent component, Object currentValue)
+ throws ConverterException {
+ return getFormattedValue(context, component, currentValue, null);
+ }
+
+ /**
+ * Creates default <code>DateTimeConverter</code> for the calendar
+ * @param calendar - calendar component
+ *
+ * @return created converter
+ */
+ protected static Converter createDefaultConverter(UICalendar calendar) {
+ DateTimeConverter defaultConverter = new DateTimeConverter();
+ defaultConverter.setPattern(calendar.getDatePattern());
+ defaultConverter.setLocale(calendar.getAsLocale(calendar.getLocale()));
+ defaultConverter.setTimeZone(calendar.getTimeZone());
+
+ return defaultConverter;
+ }
+
protected void doDecode(FacesContext context, UIComponent component) {
// TODO Auto-generated method stub
super.doDecode(context, component);
@@ -328,7 +397,7 @@
JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(calendar,
context, AjaxRendererUtils.AJAX_FUNCTION_NAME);
ajaxFunction.addParameter(JSReference.NULL);
- Map options = AjaxRendererUtils.buildEventOptions(context, calendar);
+ Map<String, Object> options = AjaxRendererUtils.buildEventOptions(context, calendar);
options.put("calendar", JSReference.THIS);
boolean isSingle = ((Boolean) calendar.getAttributes()
.get("ajaxSingle")).booleanValue();
@@ -370,40 +439,35 @@
}
public String getInputValue(FacesContext context, UIComponent component) {
- UICalendar input = (UICalendar) component;
+ UICalendar calendar = (UICalendar) component;
// XXX nick - nick - can contain either Date or String instance
// Fix for myFaces 1.1.x RF-997
Date value = null;
try {
- value = input.getAsDate(input.getSubmittedValue());
+ value = calendar.getAsDate(calendar.getSubmittedValue());
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug(" InputValue: " + e.toString(), e);
}
value = null;
}
- Date curVal = input.getAsDate(input.getValue());
-
- DateTimeConverter converter = new DateTimeConverter();
- converter.setPattern(input.getDatePattern());
- Object locale = input.getLocale();
- converter.setLocale(input.getAsLocale(locale));
- converter.setTimeZone(input.getTimeZone());
+ Date curVal = calendar.getAsDate(calendar.getValue());
+
if (value == null) {
- return converter.getAsString(context, input, curVal);
- } else {
- return converter.getAsString(context, input, value);
+ value = curVal;
}
+
+ return getFormattedValue(context, calendar, value);
}
public void writeSymbols(FacesContext facesContext, UICalendar calendar)
throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
- Map symbolsMap = getSymbolsMap(facesContext, calendar);
- Iterator entryIterator = symbolsMap.entrySet().iterator();
+ Map<String, String[]> symbolsMap = getSymbolsMap(facesContext, calendar);
+ Iterator<Map.Entry<String, String[]>> entryIterator = symbolsMap.entrySet().iterator();
writer.writeText(", \n", null);
while (entryIterator.hasNext()) {
- Map.Entry entry = (Map.Entry) entryIterator.next();
+ Map.Entry<String, String[]> entry = (Map.Entry<String, String[]>) entryIterator.next();
writer.writeText(ScriptUtils.toScript(entry.getKey()), null);
writer.writeText(": ", null);
@@ -427,8 +491,8 @@
return shiftedLabels;
}
- protected Map getSymbolsMap(FacesContext facesContext, UICalendar calendar) {
- Map map = new HashMap();
+ protected Map<String, String[]> getSymbolsMap(FacesContext facesContext, UICalendar calendar) {
+ Map<String, String[]> map = new HashMap<String, String[]>();
Locale locale = calendar.getAsLocale(calendar.getLocale());
Calendar cal = calendar.getCalendar();
16 years, 9 months
JBoss Rich Faces SVN: r7775 - in trunk/docs/userguide/en/src/main/docbook: modules and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: vsukhov
Date: 2008-04-11 13:27:48 -0400 (Fri, 11 Apr 2008)
New Revision: 7775
Modified:
trunk/docs/userguide/en/src/main/docbook/included/calendar.xml
trunk/docs/userguide/en/src/main/docbook/included/commandButton.xml
trunk/docs/userguide/en/src/main/docbook/included/commandLink.xml
trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml
trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml
trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml
trunk/docs/userguide/en/src/main/docbook/included/form.xml
trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml
trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml
trunk/docs/userguide/en/src/main/docbook/included/poll.xml
trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml
trunk/docs/userguide/en/src/main/docbook/included/push.xml
trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml
trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml
trunk/docs/userguide/en/src/main/docbook/included/support.xml
trunk/docs/userguide/en/src/main/docbook/included/tab.xml
trunk/docs/userguide/en/src/main/docbook/included/toggleControl.xml
trunk/docs/userguide/en/src/main/docbook/included/tree.xml
trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml
trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
Log:
http://jira.jboss.com/jira/browse/RF-2994 I've deleted description of process attribute from <a4j:support> and added to "How to..." section.
created links to description of process attribute
Modified: trunk/docs/userguide/en/src/main/docbook/included/calendar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -157,6 +157,9 @@
<para>How to use these attributes see also on the <ulink
url="http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4092275#..."
>RichFaces Users Forum</ulink>.</para>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
<para>There are three button-related attributes:</para>
<itemizedlist>
<listitem>
Modified: trunk/docs/userguide/en/src/main/docbook/included/commandButton.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/commandButton.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/commandButton.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -92,7 +92,13 @@
...
]]></programlisting>
<para>Common JSF navigation could be performed after an Ajax submit and partial rendering, but Navigation Case must be defined as <emphasis role="bold"><property><redirect/></property></emphasis> in order to avoid problems with some browsers.</para>
- <para>As any Core Ajax component sending Ajax requests and processing server responses <emphasis role="bold"><property><a4j:commandButton></property></emphasis> has all attributes described above (see <emphasis role="bold"><property><a4j:support></property></emphasis> <link linkend="support">chapter</link>) that provide the required behavior of requests sending (delay, limitation of submit area and rendering, and etc.)</para>
+ <para>As any Core Ajax component sending Ajax requests and processing server responses
+ <emphasis role="bold"><property><a4j:commandButton></property></emphasis> has all attributes described above
+ (see <emphasis role="bold"><property><a4j:support></property></emphasis> <link linkend="support">chapter</link>)
+ that provide the required behavior of requests sending (delay, limitation of submit area and rendering, and etc.)</para>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
<title>Relevant resources links</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/commandLink.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/commandLink.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/commandLink.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -72,6 +72,9 @@
</note>
<para>Common JSF navigation could be performed after Ajax submit and partial rendering, but Navigation Case must be defined as <emphasis role="bold"><property><redirect/></property></emphasis> in order to avoid problems with some browsers.</para>
<para>As any Core Ajax component sending Ajax requests and processing server responses <emphasis role="bold"><property><a4j:commandLink></property></emphasis> has all attributes described above (see <emphasis role="bold"><property><a4j:support></property></emphasis> <link linkend="support">chapter</link>) that provide the required behavior of requests sending (delay, limitation of submit area and rendering, etc.)</para>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -123,6 +123,9 @@
<property>"onChange"</property>
</emphasis> is its alias). When the attribute definition = true, submission on this event is
defined.</para>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
<title>Look-and-Feel Customization</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -196,7 +196,9 @@
</f:facet>
...
]]></programlisting>
-
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
<title>Look-and-Feel Customization</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -192,7 +192,9 @@
<note><title>Note:</title><para> If you define width for a outputPanel, in Internet Explorer 6 you can
perform a drag and drop operation, placing the mouse cursor on the text in the outputPanel only.</para></note>
-
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -235,7 +235,9 @@
</itemizedlist>
<para>Developers can use their own custom JavaScript functions to handle these events.</para>
-
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/form.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/form.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/form.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -98,6 +98,9 @@
If <emphasis><property>"limitToList"</property></emphasis> is true, only the reRender attribute is taken in account.
Therefore, if you use blocks of text wrapped with <emphasis role="bold"><property><a4j:outputPanel></property></emphasis> and <emphasis><property>"ajaxRendered"</property></emphasis>= <property>true</property>, blocks of text are ignored.
</para>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
<title>Relevant resources links</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/jsFunction.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -108,7 +108,10 @@
</emphasis> instead of <emphasis role="bold">
<property><a4j:commandButton></property>
</emphasis>. You can put it anywhere, just don't forget to use
- <emphasis><property><h:form></property></emphasis> ... <emphasis><property></h:form></property></emphasis> around it. </para>
+ <emphasis role="bold"><property><h:form></property></emphasis> ... <emphasis role="bold"><property></h:form></property></emphasis> around it. </para>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
<title>Relevant resources links</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -162,6 +162,9 @@
<note><title>Note:</title><para> The <emphasis role="bold">
<property><rich:menuItem></property>
</emphasis> component was designed to be used only for pop-up menu list creation.</para></note>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -191,7 +191,9 @@
</rich:panelMenuGroup>
</rich:panelMenu>
...]]></programlisting>
-
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -194,7 +194,9 @@
...
</rich:panelMenu>
...]]></programlisting>
-
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<!--section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/poll.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/poll.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/poll.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -163,7 +163,9 @@
<ulink url="index.html#support"><a4j:support></ulink>
</property>
</emphasis> component description. </para-->
-
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -377,7 +377,9 @@
</f:facet>
</rich:progressBar>
...]]> </programlisting>
-
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<!-- End. Details of Usage-->
Modified: trunk/docs/userguide/en/src/main/docbook/included/push.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/push.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/push.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -175,7 +175,9 @@
Thus, component 'push' uses asynchronous model instead of polls.
</para>
</section-->
-
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
<section>
<title>Relevant resources links</title>
<para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -208,6 +208,9 @@
</itemizedlist>
</para>
<para>Information about sorting and filtering you can find <link linkend="sortAndFilter">here</link>.</para>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -117,7 +117,10 @@
</imageobject>
</mediaobject>
</figure>
-
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
+
</section>
<section>
<title>Look-and-Feel Customization</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -245,7 +245,9 @@
</rich:suggestionbox>
...
]]></programlisting>
-
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/support.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/support.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/support.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -104,42 +104,7 @@
{form.reset(); return false;}" oncomplete="alert('Value succesfully stored')"/>
</h:selectOneMenu>]]></programlisting>
<para>In example there is the condition checking (confirm) is used before request sending and message printing after the request processing is over. </para>
- <para>
- <emphasis >
- <property>"process"</property></emphasis> attribute defines the component to be processed together with the component which contains this attribute.
- In order to define processed components you could set theirs ids into the value of <emphasis >
- <property>"process"</property></emphasis> attribute. </para>
- <para>
- <emphasis >
- <property>"process"</property></emphasis> attribute attribute has two limitations:
- <itemizedlist>
- <listitem>
- <para>it works only if <emphasis >
- <property>"ajaxSingle"</property></emphasis> equals to "true" for given command component</para>
- </listitem>
- <listitem>
- <para>you do not have to point this attribute to one of the own parent components to avoid processing of command component twice.</para>
- </listitem>
- </itemizedlist>
- </para>
- <para><emphasis role="bold">Example:</emphasis></para>
- <programlisting role="XML"><![CDATA[...
-<h:form>
- <h:inputText id="oneA" value="#{bean.width}"/>
- <br/>
- <h:inputText id="oneB" value="#{bean.text}"/>
- <br/>
- <a4j:commandButton value="Submit2" process="oneB" ajaxSingle="true" reRender=":three1, :three2"/>
-</h:form>
- <h:outputText id="three1" value="#{bean.width}"/>
- <br/>
- <h:outputText id="three2" value="#{bean.text}"/>
-...]]></programlisting>
- <para>
- In the example above only <emphasis role="bold"><property><h:inputText></property></emphasis> with "oneB" id process.
- After you click on the button- the value of this component appears into the <emphasis role="bold"><property><h:outputText></property></emphasis> with "three2" id.
- </para>
- <para>The components allows different Ajax request managing ways for its various optimization in particular conditions such as:
+ <para>The components allows different Ajax request managing ways for its various optimization in particular conditions such as:
<itemizedlist>
<listitem>
<emphasis role="bold">Limitation of the submit area and updating area for the request.</emphasis>
@@ -194,6 +159,9 @@
it helps to avoid unnecessary processing on the client.</para>
</listitem>
</itemizedlist>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/tab.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/tab.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/tab.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -152,6 +152,9 @@
The following example shows how on the client side to get the names of entered/left tabs.
</para>
<programlisting role="JAVA"><![CDATA[ontabenter="alert(leftTabName)"]]></programlisting>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
<title>Look-and-Feel Customization</title>
Modified: trunk/docs/userguide/en/src/main/docbook/included/toggleControl.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/toggleControl.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/toggleControl.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -111,6 +111,9 @@
]]></programlisting>
<para>In this example the switching is performed on facets specified in the <emphasis
><property>"switchToState"</property></emphasis> attribute.</para>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/tree.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -597,6 +597,9 @@
attributes such as <emphasis>
<property>"ajaxSubmitSelection"</property>
</emphasis> etc. </para>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/included/treeNode.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -142,6 +142,9 @@
mouse, it's managed with the <emphasis>
<property>"ajaxSubmitSelection"</property>
</emphasis> attribute (true/false).</para>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">here</link>.
+ </para>
</section>
<section>
<title>Built-in Drag and Drop</title>
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2008-04-11 17:15:24 UTC (rev 7774)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2008-04-11 17:27:48 UTC (rev 7775)
@@ -709,6 +709,8 @@
<property>"ignoreDupResponses"</property>
</emphasis> is used to abort unfinished request on new event. </listitem>
</itemizedlist-->
+
+
</section>
@@ -764,6 +766,44 @@
Component to the output panel ID. </listitem>
</itemizedlist>
</para>
+ <section id="process">
+ <title>Decide what to process</title>
+ <para>
+ In order to process defined components you could use the <emphasis><property>"process"</property></emphasis>
+ attribute. </para>
+ <para>
+ The <emphasis><property>"process"</property></emphasis> attribute defines the ids of the components to be processed
+ together with the component which contains this attribute. In order to define processed components you could set theirs ids into the value of the
+ <emphasis><property>"process"</property></emphasis> attribute.
+ </para>
+ <para>The <emphasis><property>"process"</property></emphasis> attribute has two limitations:</para>
+ <itemizedlist>
+ <listitem>
+ it works only if <emphasis><property>"ajaxSingle"</property></emphasis> equals to "true" for given command component
+ </listitem>
+ <listitem>
+ you do not have to point this attribute to one of the own parent components to avoid processing of command component twice
+ </listitem>
+ </itemizedlist>
+ <para><emphasis role="bold">Example:</emphasis></para>
+ <programlisting role="XML"><![CDATA[...
+<h:form>
+ <h:inputText id="oneA" value="#{bean.width}"/>
+ <br/>
+ <h:inputText id="oneB" value="#{bean.text}"/>
+ <br/>
+ <a4j:commandButton value="Submit2" process="oneB" ajaxSingle="true" reRender=":three1, :three2"/>
+</h:form>
+<h:outputText id="three1" value="#{bean.width}"/>
+ <br/>
+<h:outputText id="three2" value="#{bean.text}"/>
+...]]></programlisting>
+ <para>
+ In the example above after you click on the <emphasis role="bold"><property><a4j:commandButton></property></emphasis>
+ <property>only</property> <emphasis role="bold"><property><h:inputText></property></emphasis> with "oneB" id is processed and entered data appears into the <emphasis role="bold"><property><h:outputText></property></emphasis> with "three2" id.
+ If you doesn't use this attribute <property>both</property> <emphasis role="bold"><property><h:inputText></property></emphasis> is processed and entered data appears into the <property>both</property> <emphasis role="bold"><property><h:outputText></property></emphasis>.
+ </para>
+ </section>
</section>
</section>
16 years, 9 months
JBoss Rich Faces SVN: r7774 - in trunk/ui/inplaceSelect/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-04-11 13:15:24 -0400 (Fri, 11 Apr 2008)
New Revision: 7774
Modified:
trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
Log:
http://jira.jboss.com/jira/browse/RF-2982, also add addition standart events for the inplaceselect input
Modified: trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
===================================================================
--- trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2008-04-11 16:08:27 UTC (rev 7773)
+++ trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2008-04-11 17:15:24 UTC (rev 7774)
@@ -97,6 +97,86 @@
<defaultvalue><![CDATA["right"]]></defaultvalue>
</property>
<property>
+ <name>onchange</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: script expression; the element value was changed</description>
+ </property>
+ <property>
+ <name>onfocus</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: script expression; the element got the focus</description>
+ </property>
+ <property>
+ <name>onblur</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: script expression; the element lost the focus</description>
+ </property>
+ <property>
+ <name>onselect</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: script expression; the onselect event occurs when you select some menu item</description>
+ </property>
+ <property>
+ <name>oninputfocus</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: script expression; the element got the focus</description>
+ </property>
+ <property>
+ <name>oninputblur</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: script expression; the element lost the focus</description>
+ </property>
+ <property>
+ <name>oninputclick</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a pointer button is clicked</description>
+ </property>
+ <property>
+ <name>oninputdblclick</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a pointer button is double-clicked</description>
+ </property>
+ <property>
+ <name>oninputkeydown</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a key is pressed down</description>
+ </property>
+ <property>
+ <name>oninputkeypress</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a key is pressed and released</description>
+ </property>
+ <property>
+ <name>oninputkeyup</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a key is released</description>
+ </property>
+ <property>
+ <name>oninputmousedown</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: script expression; a pointer button is pressed down</description>
+ </property>
+ <property>
+ <name>oninputmousemove</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a pointer is moved within</description>
+ </property>
+ <property>
+ <name>oninputmouseout</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a pointer is moved away</description>
+ </property>
+ <property>
+ <name>oninputmouseover</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: a script expression; a pointer is moved onto</description>
+ </property>
+ <property>
+ <name>oninputmouseup</name>
+ <classname>java.lang.String</classname>
+ <description>HTML: script expression; a pointer button is released</description>
+ </property>
+ <property>
<name>oneditactivation</name>
<classname>java.lang.String</classname>
<description>The attributes provide a possibility to assign JavaScript on edit state activation</description>
Modified: trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
===================================================================
--- trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-04-11 16:08:27 UTC (rev 7773)
+++ trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-04-11 17:15:24 UTC (rev 7774)
@@ -170,12 +170,13 @@
save : function($super) {
this.applyTmpValue();
- if (((this.attributes.closeOnSelect && !this.attributes.showControls) && this.comboList.isList)
+ if (((this.attributes.closeOnSelect && !this.attributes.showControls) && this.comboList.isList)
|| (this.clickOnBar || !this.comboList.isList)) {
//bug : http://jira.jboss.com/jira/browse/RF-2810,
//will be corrected in a future version (http://jira.jboss.com/jira/browse/RF-2814)
- var unescapeText = this.tempValueKeeper.value.unescapeHTML();
- this.saveValue(this.currentItemValue, unescapeText);
+ this.invokeEvent(this.events.onchange, this.inplaceSelect, "onchange", {itemValue : this.currentItemValue, itemText : this.tempValueKeeper.value});
+ var unescapeText = this.tempValueKeeper.value.unescapeHTML();
+ this.saveValue(this.currentItemValue, unescapeText);
}
this.comboList.hide();
Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
===================================================================
--- trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-04-11 16:08:27 UTC (rev 7773)
+++ trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-04-11 17:15:24 UTC (rev 7774)
@@ -94,9 +94,26 @@
autocomplete="off"
maxlength='#{component.attributes["inputMaxLength"]}'
readonly="readonly"
- class="rich-inplace-select-field"/>
+ class="rich-inplace-select-field"
+ onselect='#{component.attributes["onselect"]}'
+ onblur='#{component.attributes["oninputblur"]}'
+ onfocus='#{component.attributes["oninputfocus"]}'
+ onclick='#{component.attributes["oninputclick"]}'
+ ondblclick='#{component.attributes["oninputdblclick"]}'
+ onkeydown='#{component.attributes["oninputkeydown"]}'
+ onkeypress='#{component.attributes["oninputkeypress"]}'
+ onkeyup='#{component.attributes["oninputkeyup"]}'
+ onmousedown='#{component.attributes["oninputmousedown"]}'
+ onmousemove='#{component.attributes["oninputmousemove"]}'
+ onmouseout='#{component.attributes["oninputmouseout"]}'
+ onmouseover='#{component.attributes["oninputmouseover"]}'
+ onmouseup='#{component.attributes["oninputmouseup"]}'
+
+ />
<input id="#{clientId}inselArrow" readonly="readonly" type="Text" value="" class="rich-inplace-select-arrow" style='display:none;'/>
- <input id='#{clientId}inplaceValue' name='#{clientId' type='hidden' value='#{fieldValue}'/>
+ <input id='#{clientId}inplaceValue' name='#{clientId' type='hidden' value='#{fieldValue}'
+ onchange='#{component.attributes["onchange"]}'>
+ </input>
<div id="#{clientId}bar" class="rich-inplace-select-control-set" style="display:none;">
<jsp:scriptlet>
<![CDATA[
@@ -134,7 +151,7 @@
onmouseover="this.className='rich-inplace-select-control #{controlHoverClass}'"/>
<input id="#{clientId}cancel" type="image" src="#{cancelIcon}"
class="rich-inplace-select-control #{controlClass}"
- onmousedown="this.className='rich-inplace-select-control-press #{controlPressedClass}''"
+ onmousedown="this.className='rich-inplace-select-control-press #{controlPressedClass}'"
onmouseout="this.className='rich-inplace-select-control #{controlClass}'"
onmouseup="this.className='rich-inplace-select-control#{controlClass}'"
onmouseover="this.className='rich-inplace-select-control #{controlHoverClass}'"
@@ -211,7 +228,8 @@
{oneditactivation : #{this:getAsEventHandler(context, component, "oneditactivation")},
onviewactivation : #{this:getAsEventHandler(context, component, "onviewactivation")},
oneditactivated : #{this:getAsEventHandler(context, component, "oneditactivated")},
- onviewactivated : #{this:getAsEventHandler(context, component, "onviewactivated")}},
+ onviewactivated : #{this:getAsEventHandler(context, component, "onviewactivated")},
+ onchange : #{this:getAsEventHandler(context, component, "onchange")}},
Richfaces.InplaceSelect.CLASSES,
['#{clientId}bar', '#{clientId}ok', '#{clientId}cancel', '#{clientId}buttons', '#{clientId}btns_shadow'], '#{clientId}inselArrow');
</script>
16 years, 9 months
JBoss Rich Faces SVN: r7773 - trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-04-11 12:08:27 -0400 (Fri, 11 Apr 2008)
New Revision: 7773
Modified:
trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
Log:
review
Modified: trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
===================================================================
--- trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-04-11 15:40:47 UTC (rev 7772)
+++ trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-04-11 16:08:27 UTC (rev 7773)
@@ -92,7 +92,7 @@
- protected Class<UIInplaceInput> getComponentClass() {
+ protected Class<? extends UIComponent> getComponentClass() {
return UIInplaceInput.class;
}
16 years, 9 months
JBoss Rich Faces SVN: r7772 - trunk/ui/inplaceSelect/src/main/config/component.
by richfaces-svn-commits@lists.jboss.org
Author: msorokin
Date: 2008-04-11 11:40:47 -0400 (Fri, 11 Apr 2008)
New Revision: 7772
Modified:
trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
Language correction
Modified: trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
===================================================================
--- trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2008-04-11 15:40:36 UTC (rev 7771)
+++ trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2008-04-11 15:40:47 UTC (rev 7772)
@@ -34,7 +34,7 @@
<property>
<name>layout</name>
<classname>java.lang.String</classname>
- <description>defines how the component is displayed in the layout, can be block or inline</description>
+ <description>Defines how the component is displayed in the layout, can be block or inline</description>
<defaultvalue><![CDATA["inline"]]></defaultvalue>
</property>
@@ -47,19 +47,19 @@
<property>
<name>maxSelectWidth</name>
<classname>java.lang.String</classname>
- <description>max width of the select element</description>
+ <description>Sets the maximum width of the select element</description>
<defaultvalue><![CDATA["200px"]]></defaultvalue>
</property>
<property>
<name>minSelectWidth</name>
<classname>java.lang.String</classname>
- <description>min width of the select element</description>
+ <description>Sets the minimum width of the select element</description>
<defaultvalue><![CDATA["100px"]]></defaultvalue>
</property>
<property>
<name>selectWidth</name>
<classname>java.lang.String</classname>
- <description>width of the select element</description>
+ <description>Sets width of the select element</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
<property>
@@ -99,22 +99,22 @@
<property>
<name>oneditactivation</name>
<classname>java.lang.String</classname>
- <description>The attributes provide a possibility to assign JavaScript code on edit state activation</description>
+ <description>The attributes provide a possibility to assign JavaScript on edit state activation</description>
</property>
<property>
<name>onviewactivation</name>
<classname>java.lang.String</classname>
- <description>The attributes provide a possibility to assign JavaScript code on view state activation</description>
+ <description>The attributes provide a possibility to assign JavaScript on view state activation</description>
</property>
<property>
<name>oneditactivated</name>
<classname>java.lang.String</classname>
- <description>The attributes provide a possibility to assign JavaScript code to be executed when edit state is activated</description>
+ <description>The attributes provide a possibility to assign JavaScript to be executed when edit state is activated</description>
</property>
<property>
<name>onviewactivated</name>
<classname>java.lang.String</classname>
- <description>The attributes provide a possibility to assign JavaScript code to be executed when view state is activated</description>
+ <description>The attributes provide a possibility to assign JavaScript to be executed when view state is activated</description>
</property>
<property>
<name>selectOnEdit</name>
@@ -136,7 +136,7 @@
<property>
<name>listWidth</name>
<classname>java.lang.String</classname>
- <description>The attribute defines the withs of option list</description>
+ <description>The attribute defines the width of option list</description>
<defaultvalue>"200px"</defaultvalue>
</property>
@@ -216,16 +216,16 @@
</property>
&html_events;
&ui_component_attributes;
- &ui_input_attributes;
-
- <property hidden="true" existintag="false" exist="false" >
- <name>localValueSet</name>
- <classname>boolean</classname>
- </property>
- <property hidden="true" existintag="false" exist="false" >
- <name>valid</name>
- <classname>boolean</classname>
+ &ui_input_attributes;
+
+ <property hidden="true" existintag="false" exist="false" >
+ <name>localValueSet</name>
+ <classname>boolean</classname>
</property>
+ <property hidden="true" existintag="false" exist="false" >
+ <name>valid</name>
+ <classname>boolean</classname>
+ </property>
</properties>
</component>
16 years, 9 months
JBoss Rich Faces SVN: r7771 - trunk/ui/inplaceInput/src/main/config/component.
by richfaces-svn-commits@lists.jboss.org
Author: msorokin
Date: 2008-04-11 11:40:36 -0400 (Fri, 11 Apr 2008)
New Revision: 7771
Modified:
trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
Log:
http://jira.jboss.com/jira/browse/RF-730
Language correction
Modified: trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
===================================================================
--- trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-04-11 15:16:20 UTC (rev 7770)
+++ trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-04-11 15:40:36 UTC (rev 7771)
@@ -35,25 +35,25 @@
<property>
<name>layout</name>
<classname>java.lang.String</classname>
- <description>defines how the component is displayed in the layout, can be block or inline</description>
+ <description>Defines how the component is displayed in the layout, can be block or inline</description>
<defaultvalue><![CDATA["inline"]]></defaultvalue>
</property>
<property>
<name>maxInputWidth</name>
<classname>java.lang.String</classname>
- <description>max width of the input field</description>
+ <description>Sets the maximum width of the input field</description>
<defaultvalue><![CDATA["500px"]]></defaultvalue>
</property>
<property>
<name>minInputWidth </name>
<classname>java.lang.String</classname>
- <description>mim width of the input field</description>
+ <description>Sets the minimum width of the input field</description>
<defaultvalue><![CDATA["40px"]]></defaultvalue>
</property>
<property>
<name>inputWidth</name>
<classname>java.lang.String</classname>
- <description>width of the input field</description>
+ <description>Sets width of the input field</description>
</property>
<property>
@@ -91,22 +91,22 @@
<property>
<name>oneditactivation</name>
<classname>java.lang.String</classname>
- <description>The attributes provide a possibility to assign JavaScript code on edit state activation</description>
+ <description>The attributes provide a possibility to assign JavaScript on edit state activation</description>
</property>
<property>
<name>onviewactivation</name>
<classname>java.lang.String</classname>
- <description>The attributes provide a possibility to assign JavaScript code on view state activation</description>
+ <description>The attributes provide a possibility to assign JavaScript on view state activation</description>
</property>
<property>
<name>oneditactivated</name>
<classname>java.lang.String</classname>
- <description>The attributes provide a possibility to assign JavaScript code to be executed when edit state is activated</description>
+ <description>The attributes provide a possibility to assign JavaScript to be executed when edit state is activated</description>
</property>
<property>
<name>onviewactivated</name>
<classname>java.lang.String</classname>
- <description>The attributes provide a possibility to assign JavaScript code to be executed when view state is activated</description>
+ <description>The attributes provide a possibility to assign JavaScript to be executed when view state is activated</description>
</property>
<property>
<name>selectOnEdit</name>
16 years, 9 months