JBoss Rich Faces SVN: r9563 - trunk/docs/userguide/en/src/main/resources/images.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-07-14 07:01:29 -0400 (Mon, 14 Jul 2008)
New Revision: 9563
Modified:
trunk/docs/userguide/en/src/main/resources/images/new.png
trunk/docs/userguide/en/src/main/resources/images/updated.png
Log:
http://jira.jboss.com/jira/browse/JBDS-320
images improved
Modified: trunk/docs/userguide/en/src/main/resources/images/new.png
===================================================================
(Binary files differ)
Modified: trunk/docs/userguide/en/src/main/resources/images/updated.png
===================================================================
(Binary files differ)
16 years, 2 months
JBoss Rich Faces SVN: r9562 - trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-07-14 06:59:46 -0400 (Mon, 14 Jul 2008)
New Revision: 9562
Modified:
trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
Log:
changed request stop action parameter
Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-07-14 10:57:24 UTC (rev 9561)
+++ trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2008-07-14 10:59:46 UTC (rev 9562)
@@ -490,7 +490,7 @@
*/
public String getStopScript(FacesContext context, UIComponent component)
throws IOException {
- return getActionScript(context, component, "stop", null);
+ return getActionScript(context, component, "richfaces_file_upload_action_stop", null);
}
/**
16 years, 2 months
JBoss Rich Faces SVN: r9561 - trunk/framework/impl/src/main/java/org/ajax4jsf/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-07-14 06:57:24 -0400 (Mon, 14 Jul 2008)
New Revision: 9561
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
Log:
fix mime type
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-07-14 10:47:20 UTC (rev 9560)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-07-14 10:57:24 UTC (rev 9561)
@@ -292,6 +292,8 @@
protected void processUploadsAndHandleRequest(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
HttpServletRequest httpRequest = (HttpServletRequest) request;
String uid = httpRequest.getParameter(UPLOAD_FILES_ID);
+ String mimeType = xmlFilter.getMimetype();
+
if (uid != null) {
if (isMultipartRequest(httpRequest)) {
@@ -346,7 +348,6 @@
} finally {
if (sessionsMap != null) {
- String mimeType = xmlFilter.getMimetype();
xmlFilter.setMimetype(mimeType); // Backup mimetype
sessionsMap.remove(uid);
percentMap.remove(uid);
16 years, 2 months
JBoss Rich Faces SVN: r9560 - trunk/test-applications/jsp/src/main/webapp/Skinning.
by richfaces-svn-commits＠lists.jboss.org
Author: adubovsky
Date: 2008-07-14 06:47:20 -0400 (Mon, 14 Jul 2008)
New Revision: 9560
Modified:
trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp
Log:
Changes in skinning.
Modified: trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp 2008-07-14 10:20:27 UTC (rev 9559)
+++ trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp 2008-07-14 10:47:20 UTC (rev 9560)
@@ -49,6 +49,20 @@
</rich:columnGroup>
<rich:columnGroup>
<rich:column>
+ <h:outputText value="input" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="rich-input" />
+ </rich:column>
+ <rich:column>
+ <input class="rich-input" value="input" ></input>
+ </rich:column>
+ <rich:column>
+ <input class="rich-input" value="input" disabled="true" /></input>
+ </rich:column>
+ </rich:columnGroup>
+ <rich:columnGroup>
+ <rich:column>
<h:outputText value="inputTextarea" />
</rich:column>
<rich:column>
@@ -201,6 +215,20 @@
</rich:columnGroup>
<rich:columnGroup>
<rich:column>
+ <h:outputText value="button" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="rich-button" />
+ </rich:column>
+ <rich:column>
+ <button class="rich-button" >button</button>
+ </rich:column>
+ <rich:column>
+ <button class="rich-button" disabled="true" >button</button>
+ </rich:column>
+ </rich:columnGroup>
+ <rich:columnGroup>
+ <rich:column>
<h:outputText value="commandLink" />
</rich:column>
<rich:column>
@@ -227,6 +255,77 @@
<h:outputLink styleClass="#{skinning.outputLink}" disabled="true"><h:outputText value="outputLink" /></h:outputLink>
</rich:column>
</rich:columnGroup>
+ <rich:columnGroup>
+ <rich:column>
+ <h:outputText value="a" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="rich-link" />
+ </rich:column>
+ <rich:column>
+ <a href="http://localhost:8081/jsp/pages/Rich/Rich.jsf" class="rich-link" >link</a>
+ </rich:column>
+ <rich:column>
+ <h:outputText value="component has not disabled state" />
+ </rich:column>
+ </rich:columnGroup>
+ <rich:columnGroup>
+ <rich:column>
+ <h:outputText value="fieldset && legend" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="rich-fieldset, rich-legend" />
+ </rich:column>
+ <rich:column>
+ <fieldset class="rich-fieldset">
+ <legend class="rich-legend">Student</legend>
+ </fieldset>
+ </rich:column>
+ <rich:column>
+ <h:outputText value="components have not disabled state" />
+ </rich:column>
+ </rich:columnGroup>
+ <rich:columnGroup>
+ <rich:column>
+ <h:outputText value="hr" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="rich-hr" />
+ </rich:column>
+ <rich:column>
+ <hr class="rich-hr" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="components have not disabled state" />
+ </rich:column>
+ </rich:columnGroup>
+ <rich:columnGroup>
+ <rich:column>
+ <h:outputText value="isindex" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="rich-isindex" />
+ </rich:column>
+ <rich:column>
+ <isindex class="rich-isindex" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="components have not disabled state" />
+ </rich:column>
+ </rich:columnGroup>
+ <rich:columnGroup>
+ <rich:column>
+ <h:outputText value="keygen" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="rich-keygen" />
+ </rich:column>
+ <rich:column>
+ <keygen class="rich-keygen" />
+ </rich:column>
+ <rich:column>
+ <keygen disabled="true" class="rich-keygen" />
+ </rich:column>
+ </rich:columnGroup>
</rich:dataTable>
-
</f:subview>
\ No newline at end of file
16 years, 2 months
JBoss Rich Faces SVN: r9559 - trunk/framework/impl/src/main/java/org/ajax4jsf/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-07-14 06:20:27 -0400 (Mon, 14 Jul 2008)
New Revision: 9559
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
Log:
RF-3808, rename stop action to the richfaces_file_upload_action_stop
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-07-14 09:58:18 UTC (rev 9558)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-07-14 10:20:27 UTC (rev 9559)
@@ -289,102 +289,92 @@
* @throws IOException
* @throws ServletException
*/
- protected void processUploadsAndHandleRequest(HttpServletRequest request, HttpServletResponse response,
- FilterChain chain) throws IOException, ServletException {
- HttpServletRequest httpRequest = (HttpServletRequest) request;
- String uid = httpRequest.getParameter(UPLOAD_FILES_ID);
- if (uid != null) {
- if (isMultipartRequest(httpRequest)) {
- MultipartRequest multipartRequest = new MultipartRequest(
- httpRequest, createTempFiles, maxRequestSize, uid);
-
- Map<String, MultipartRequest> sessionsMap = null;
- Map<String, Object> percentMap = null;
- boolean sendError = Boolean.parseBoolean(request.getParameter(SEND_HTTP_ERROR));
- String mimeType = xmlFilter.getMimetype();
- try {
- if (isFileSizeRestricted(request, maxRequestSize)) {
- if (sendError) {
- //request.getInputStream().close();
- //request.getInputStream().skip(request.getContentLength());
- response.sendError(413);
- System.out.println("413");
- return;
- } else {
- printResponse(response,
- "<html id=\"_richfaces_file_upload_size_restricted\"></html>");
- }
- } else if (!checkFileCount(httpRequest)) {
- printResponse(response,
- "<html id=\"_richfaces_file_upload_forbidden\"></html>");
+ protected void processUploadsAndHandleRequest(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ String uid = httpRequest.getParameter(UPLOAD_FILES_ID);
+ if (uid != null) {
+
+ if (isMultipartRequest(httpRequest)) {
+ MultipartRequest multipartRequest = new MultipartRequest(httpRequest, createTempFiles, maxRequestSize, uid);
+ Map<String, MultipartRequest> sessionsMap = null;
+ Map<String, Object> percentMap = null;
+
+ try {
+ if (isFileSizeRestricted(request, maxRequestSize)) {
+
+ boolean sendError = Boolean.parseBoolean(request.getParameter(SEND_HTTP_ERROR));
+ if (sendError) {
+ response.sendError(HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE);
+ System.err.println("ERROR " + HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE + "request entity is larger than the server is willing or able to process.");
+ return;
} else {
- HttpSession session = httpRequest.getSession();
- synchronized (session) {
- sessionsMap = (Map<String, MultipartRequest>) session
- .getAttribute(REQUESTS_SESSIONS_BEAN_NAME);
- percentMap = (Map<String, Object>) session
- .getAttribute(PERCENT_BEAN_NAME);
- if (sessionsMap == null) {
- sessionsMap = Collections
- .synchronizedMap(new HashMap<String, MultipartRequest>());
- session.setAttribute(
- REQUESTS_SESSIONS_BEAN_NAME,
- sessionsMap);
- }
- if (percentMap == null) {
- percentMap = new HashMap<String, Object>();
- session.setAttribute(PERCENT_BEAN_NAME,
- percentMap);
- }
+ printResponse(response, "<html id=\"_richfaces_file_upload_size_restricted\"></html>");
+ }
+
+ } else if (!checkFileCount(httpRequest)) {
+ printResponse(response, "<html id=\"_richfaces_file_upload_forbidden\"></html>");
+ } else {
+
+ HttpSession session = httpRequest.getSession();
+ synchronized (session) {
+ sessionsMap = (Map<String, MultipartRequest>) session.getAttribute(REQUESTS_SESSIONS_BEAN_NAME);
+ percentMap = (Map<String, Object>) session.getAttribute(PERCENT_BEAN_NAME);
+ if (sessionsMap == null) {
+ sessionsMap = Collections.synchronizedMap(new HashMap<String, MultipartRequest>());
+ session.setAttribute(REQUESTS_SESSIONS_BEAN_NAME, sessionsMap);
}
- percentMap.put(uid, 0); // associate percent value with
- // file
- // entry uid
- sessionsMap.put(uid, multipartRequest);
-
- if (multipartRequest.parseRequest()) {
-
- xmlFilter.setMimetype("text/html"); // We need set mimetype as HTML to avoid
- // transforming response to XML tree under IE
- handleRequest(multipartRequest, response, chain);
- } else {
- printResponse(response,
- "<html id=\"_richfaces_file_upload_stopped\"></html>");
+ if (percentMap == null) {
+ percentMap = new HashMap<String, Object>();
+ session.setAttribute(PERCENT_BEAN_NAME, percentMap);
}
}
- } finally {
- if (sessionsMap != null) {
- xmlFilter.setMimetype(mimeType); // Backup mimetype
- sessionsMap.remove(uid);
- percentMap.remove(uid);
+
+ /* associate percent value with file entry uid */
+ percentMap.put(uid, 0);
+ sessionsMap.put(uid, multipartRequest);
+
+ if (multipartRequest.parseRequest()) {
+ /*We need set mimetype as HTML to avoid transforming response to XML tree under IE */
+ xmlFilter.setMimetype("text/html");
+ handleRequest(multipartRequest, response, chain);
+ } else {
+ printResponse(response, "<html id=\"_richfaces_file_upload_stopped\"></html>");
}
+
}
- } else {
- if ("stop".equals(httpRequest.getParameter("action"))) {
- HttpSession session = httpRequest.getSession();
- Map<String, MultipartRequest> sessions = (Map<String, MultipartRequest>) session
- .getAttribute(REQUESTS_SESSIONS_BEAN_NAME);
+
+ } finally {
+
+ if (sessionsMap != null) {
+ String mimeType = xmlFilter.getMimetype();
+ xmlFilter.setMimetype(mimeType); // Backup mimetype
+ sessionsMap.remove(uid);
+ percentMap.remove(uid);
+ }
+
+ }
+ } else {
+
+ if ("richfaces_file_upload_action_stop".equals(httpRequest.getParameter("action"))) {
+ HttpSession session = httpRequest.getSession();
+ Map<String, MultipartRequest> sessions = (Map<String, MultipartRequest>) session.getAttribute(REQUESTS_SESSIONS_BEAN_NAME);
- if (sessions != null) {
- MultipartRequest multipartRequest = sessions.get(uid);
- if (multipartRequest != null) {
- multipartRequest.stop();
- HttpServletResponse httpResponse = (HttpServletResponse) response;
- httpResponse
- .setStatus(HttpServletResponse.SC_OK);
- httpResponse.getOutputStream().close();
- }
+ if (sessions != null) {
+ MultipartRequest multipartRequest = sessions.get(uid);
+ if (multipartRequest != null) {
+ multipartRequest.stop();
+ handleRequest(request, response, chain);
}
-
- //TODO what's here?
- } else {
- handleRequest(request, response, chain);
}
+
+ } else {
+ handleRequest(request, response, chain);
}
- } else {
- handleRequest(request, response, chain);
}
+ } else {
+ handleRequest(request, response, chain);
}
+ }
/**
* @param httpServletRequest
16 years, 2 months
JBoss Rich Faces SVN: r9558 - trunk/test-applications/facelets/src/main/webapp/pages/Info.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-07-14 05:58:18 -0400 (Mon, 14 Jul 2008)
New Revision: 9558
Modified:
trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml
Log:
+events test
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml 2008-07-14 09:49:05 UTC (rev 9557)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml 2008-07-14 09:58:18 UTC (rev 9558)
@@ -1,10 +1,17 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
- <f:subview id="infoSubview">
+<f:subview id="infoSubview">
+ <h:panelGrid binding="#{info.panelEvent}" columns="2">
+ </h:panelGrid>
+ <f:verbatim>
+ <br />
+ </f:verbatim>
+ <h:commandButton action="#{info.getEvent}" value="test event"></h:commandButton>
+
<h:panelGrid columns="2">
<h:outputText value="style:"></h:outputText>
<h:dataTable id="styleTableID" value="#{info.style}" var="info">
@@ -17,11 +24,13 @@
</h:dataTable>
<h:outputText value="attribute"></h:outputText>
- <h:selectBooleanCheckbox value="#{option.attribute}" onchange="submit();"></h:selectBooleanCheckbox>
+ <h:selectBooleanCheckbox value="#{option.attribute}"
+ onchange="submit();"></h:selectBooleanCheckbox>
-
+
<h:outputText value="attribute:" rendered="#{option.attribute}"></h:outputText>
- <h:dataTable id="attributeTableID" rendered="#{option.attribute}" value="#{info.attribute}" var="info">
+ <h:dataTable id="attributeTableID" rendered="#{option.attribute}"
+ value="#{info.attribute}" var="info">
<h:column>
<h:outputText value="#{info.key}"></h:outputText>
</h:column>
16 years, 2 months
JBoss Rich Faces SVN: r9557 - in trunk/test-applications/facelets/src/main/java/util: style and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-07-14 05:49:05 -0400 (Mon, 14 Jul 2008)
New Revision: 9557
Modified:
trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java
trunk/test-applications/facelets/src/main/java/util/style/Style.java
Log:
componentInfo correction
Modified: trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-14 09:48:21 UTC (rev 9556)
+++ trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-14 09:49:05 UTC (rev 9557)
@@ -117,11 +117,13 @@
//Object obj = field.get(component);
UIComponentBase comp = (UIComponentBase) component;
ValueExpression ve = comp.getValueExpression(str);
+ if(ve != null){
if(ve.isLiteralText()){
componentAttribute.putStyle(str, ve == null ? "null" : ve.getExpressionString());
} else{
componentAttribute.putStyle(str, ve == null ? "null" : ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString());
}
+ }
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
@@ -137,9 +139,9 @@
ValueExpression ve = comp.getValueExpression(str);
if(ve != null){
if(ve.isLiteralText()){
- componentAttribute.putStyle(str, ve == null ? "null" : ve.getExpressionString());
+ componentAttribute.putAttribute(str, ve.getExpressionString());
} else{
- componentAttribute.putStyle(str, ve == null ? "null" : ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString());
+ componentAttribute.putAttribute(str, ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString());
}
}
// Object obj = field.get(component);
Modified: trunk/test-applications/facelets/src/main/java/util/style/Style.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/util/style/Style.java 2008-07-14 09:48:21 UTC (rev 9556)
+++ trunk/test-applications/facelets/src/main/java/util/style/Style.java 2008-07-14 09:49:05 UTC (rev 9557)
@@ -65,7 +65,7 @@
private String trailerStyleClass;
private String barClass;
private String handleStyle;
-
+ private String contentStyle;
private String styleA;
private String styleClassA;
private String selectStyleA;
@@ -139,7 +139,7 @@
trailerStyleClass = "trailerStyleClass";
barClass = "barClass";
handleStyle = "handleStyle";
-
+ contentStyle = "contentStyle";
styleA = "styleA";
styleClassA = "styleClassA";
selectStyleA = "selectStyleA";
@@ -727,4 +727,12 @@
public void setHandleStyle(String handleStyle) {
this.handleStyle = handleStyle;
}
+
+ public String getContentStyle() {
+ return contentStyle;
+ }
+
+ public void setContentStyle(String contentStyle) {
+ this.contentStyle = contentStyle;
+ }
}
16 years, 2 months
JBoss Rich Faces SVN: r9556 - in trunk/test-applications/jsp/src/main: java/util/componentInfo and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-07-14 05:48:21 -0400 (Mon, 14 Jul 2008)
New Revision: 9556
Modified:
trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java
trunk/test-applications/jsp/src/main/java/util/style/Style.java
trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp
Log:
componentInfo correction
Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2008-07-12 16:04:47 UTC (rev 9555)
+++ trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2008-07-14 09:48:21 UTC (rev 9556)
@@ -100,6 +100,7 @@
private boolean showFooter;
private boolean resetTimeOnDateSelect;
private String defaultTime;
+ private boolean ignoreDupResponses;
private HtmlCalendar htmlCalendar = null;
public HtmlCalendar getHtmlCalendar() {
@@ -217,6 +218,7 @@
timeZone = "Eastern European Time";
preloadDateRangeBegin = "11.11.2007"; //d.m.y
preloadDateRangeEnd = "01.01.2008";
+ ignoreDupResponses = true;
}
@@ -505,6 +507,7 @@
}
public void ddd(ValueChangeEvent event) {
+ System.out.println("=============inside valueChangeListener==========");
System.out.println(event.getOldValue());
System.out.println(event.getNewValue());
@@ -790,4 +793,14 @@
ComponentInfo info = ComponentInfo.getInstance();
info.addField(htmlCalendar);
}
+
+
+ public boolean isIgnoreDupResponses() {
+ return ignoreDupResponses;
+ }
+
+
+ public void setIgnoreDupResponses(boolean ignoreDupResponses) {
+ this.ignoreDupResponses = ignoreDupResponses;
+ }
}
Modified: trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-12 16:04:47 UTC (rev 9555)
+++ trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-14 09:48:21 UTC (rev 9556)
@@ -12,13 +12,42 @@
import java.util.Set;
import java.util.Map.Entry;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
+import javax.faces.component.UIComponentBase;
+import javax.faces.context.FacesContext;
public class ComponentInfo {
private static volatile ComponentInfo INSTANCE;
private ComponentAttribute componentAttribute = new ComponentAttribute();
private Object component = null;
-
+ private String beanName;
+ private String description;
+ private String attribute;
+ private String property;
+ private boolean print;
+
+ public ComponentInfo(String beanName) {
+ this.beanName = beanName;
+ this.attribute = "";
+ this.property = "";
+ print = true;
+ }
+
+ public void setComponentInfo(String attribute, String property) {
+ this.attribute = attribute;
+ this.property = property;
+ this.description = "";
+ if(print) printInfo();
+ }
+
+ public void setComponentInfo(String attribute, String property, String description) {
+ this.attribute = attribute;
+ this.property = property;
+ this.description = description;
+ if(print) printInfo();
+ }
+
protected ComponentInfo() {
}
@@ -41,26 +70,35 @@
if (component == null)
return;
this.component = component;
+
+ //if(ve.isLiteralText()) {ve.getExpressionString()} {ve.getValue(). }
+
componentAttribute.cleanAll();
String str = null;
Field[] fields = component.getClass().getDeclaredFields();
AccessibleObject.setAccessible(fields, true);
for (Field field : fields) {
if (!Modifier.isStatic(field.getModifiers())) {
- str = field.getName().substring(1);
+ str = field.getName().substring(1);
if (str.startsWith("on")) {
componentAttribute.putEvent(str,
"");
} else if (str.indexOf("tyle") != -1 || str.indexOf("lass") != -1) {
try {
- Object obj = field.get(component);
- componentAttribute.putStyle(str, obj == null ? "null" : obj.toString());
+ //Object obj = field.get(component);
+ UIComponentBase comp = (UIComponentBase) component;
+ ValueExpression ve = comp.getValueExpression(str);
+ if(ve != null){
+ if(ve.isLiteralText()){
+ componentAttribute.putStyle(str, ve == null ? "null" : ve.getExpressionString());
+ } else{
+ componentAttribute.putStyle(str, ve == null ? "null" : ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString());
+ }
+ }
+
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- } catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
}
} else {
@@ -68,13 +106,20 @@
try {
Class cl = field.getType();
if(cl.isPrimitive() || cl.getName().equals("java.lang.String")){
- Object obj = field.get(component);
- componentAttribute.putAttribute(str, obj == null ? "null" : obj.toString());
+ UIComponentBase comp = (UIComponentBase) component;
+ ValueExpression ve = comp.getValueExpression(str);
+ if(ve != null){
+ if(ve.isLiteralText()){
+ componentAttribute.putAttribute(str, ve.getExpressionString());
+ } else{
+ componentAttribute.putAttribute(str, ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString());
+ }
+ }
+// Object obj = field.get(component);
+// componentAttribute.putAttribute(str, obj == null ? "null" : obj.toString());
} else componentAttribute.putAttribute(str, "---");
} catch (IllegalArgumentException e) {
e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
}
}
}
@@ -82,6 +127,34 @@
}
+ public static String toString(Object obj) {
+ Class cl = obj.getClass();
+ String r = cl.getName() + "[";
+ Class sc = cl.getSuperclass();
+ if (!sc.equals(Object.class))
+ r += sc + ",";
+ Field[] fields = cl.getDeclaredFields();
+ try {
+ AccessibleObject.setAccessible(fields, true);
+ } catch (SecurityException e) {
+ }
+ for (int i = 0; i < fields.length; i++) {
+ Field f = fields[i];
+ r += f.getName() + "=";
+ try {
+ Object val = f.get(obj);
+ r += val.toString();
+ } catch (IllegalAccessException e) {
+ r += "???";
+ }
+ if (i < fields.length - 1)
+ r += ",";
+ else
+ r += "]";
+ }
+ return r;
+ }
+
public Object invoke(String aMethod, Class[] params, Object[] args) {
Method m;
System.out.println("ComponentInfo.invoke()");
@@ -105,8 +178,69 @@
return "";
}
}
-
+
+ private void printInfo() {
+ System.out.println("beanName: " + beanName + "[attribute: " + attribute + "; property: " + property + "; description: " + description + "];");
+ }
+
+ public String [] getComponentInfo() {
+ String [] str = {attribute, property};
+ return str;
+ }
+
public ComponentAttribute getComponentAttribute() {
return componentAttribute;
}
+
+ public Object getComponent() {
+ return component;
+ }
+
+ public void setComponent(Object component) {
+ this.component = component;
+ }
+
+ public String getBeanName() {
+ return beanName;
+ }
+
+ public void setBeanName(String beanName) {
+ this.beanName = beanName;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getAttribute() {
+ return attribute;
+ }
+
+ public void setAttribute(String attribute) {
+ this.attribute = attribute;
+ }
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+ public boolean isPrint() {
+ return print;
+ }
+
+ public void setPrint(boolean print) {
+ this.print = print;
+ }
+
+ public void setComponentAttribute(ComponentAttribute componentAttribute) {
+ this.componentAttribute = componentAttribute;
+ }
}
Modified: trunk/test-applications/jsp/src/main/java/util/style/Style.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/style/Style.java 2008-07-12 16:04:47 UTC (rev 9555)
+++ trunk/test-applications/jsp/src/main/java/util/style/Style.java 2008-07-14 09:48:21 UTC (rev 9556)
@@ -66,7 +66,7 @@
private String trailerStyleClass;
private String barClass;
private String handleStyle;
-
+ private String contentStyle;
private String styleA;
private String styleClassA;
private String selectStyleA;
@@ -141,7 +141,7 @@
trailerStyleClass = "trailerStyleClass";
barClass = "barClass";
handleStyle = "handleStyle";
-
+ contentStyle = "contentStyle";
styleA = "styleA";
styleClassA = "styleClassA";
selectStyleA = "selectStyleA";
@@ -737,4 +737,12 @@
public void setControlsClass(String controlsClass) {
this.controlsClass = controlsClass;
}
+
+ public String getContentStyle() {
+ return contentStyle;
+ }
+
+ public void setContentStyle(String contentStyle) {
+ this.contentStyle = contentStyle;
+ }
}
Modified: trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2008-07-12 16:04:47 UTC (rev 9555)
+++ trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2008-07-14 09:48:21 UTC (rev 9556)
@@ -37,15 +37,12 @@
onobjectchange="#{event.onobjectchange}"
onselect="#{event.onselect}"
onsubmit="#{event.onsubmit}"
-
- popupStyle="background-color: black"
-
+ popupStyle="background-color: black;"
usingSuggestObjects="#{sb.usingSuggestObjects}"
reRender="label"
rendered="#{sb.rendered}"
requestDelay="#{sb.requestDelay}"
- selfRendered="#{sb.selfRendered}"
- value="#{sb.value}"
+ selfRendered="#{sb.selfRendered}"
var="result"
suggestionAction="#{sb.autocomplete}"
width="#{sb.width}"
@@ -73,7 +70,7 @@
<h:outputText value="#{result.flag}" />
</h:column>
<h:column>
- <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink>
+ <a4j:htmlCommandLink actionListener="#{sb.selectValue}" value="Click me!"/>
</h:column>
</rich:suggestionbox>
<div id="label" style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div>
16 years, 2 months
JBoss Rich Faces SVN: r9555 - in trunk/test-applications/seleniumTest/src: main/webapp/WEB-INF and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-07-12 12:04:47 -0400 (Sat, 12 Jul 2008)
New Revision: 9555
Added:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/ToolBarTestBean.java
trunk/test-applications/seleniumTest/src/main/webapp/pages/toolBar/
trunk/test-applications/seleniumTest/src/main/webapp/pages/toolBar/eventTest.xhtml
trunk/test-applications/seleniumTest/src/main/webapp/pages/toolBar/toolBarTest.xhtml
trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/ToolBarTest.java
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
Log:
ToolBar component test added
Added: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/ToolBarTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/ToolBarTestBean.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/ToolBarTestBean.java 2008-07-12 16:04:47 UTC (rev 9555)
@@ -0,0 +1,46 @@
+package org.ajax4jsf.bean;
+
+public class ToolBarTestBean {
+
+ private String groupSeparator = "";
+
+ private String groupItemSeparator = "";
+
+ /**
+ * Gets value of groupSeparator field.
+ *
+ * @return value of groupSeparator field
+ */
+ public String getGroupSeparator() {
+ return groupSeparator;
+ }
+
+ /**
+ * Set a new value for groupSeparator field.
+ *
+ * @param groupSeparator
+ * a new value for groupSeparator field
+ */
+ public void setGroupSeparator(String groupSeparator) {
+ this.groupSeparator = groupSeparator;
+ }
+
+ /**
+ * Gets value of groupItemSeparator field.
+ *
+ * @return value of groupItemSeparator field
+ */
+ public String getGroupItemSeparator() {
+ return groupItemSeparator;
+ }
+
+ /**
+ * Set a new value for groupItemSeparator field.
+ *
+ * @param groupItemSeparator
+ * a new value for groupItemSeparator field
+ */
+ public void setGroupItemSeparator(String groupItemSeparator) {
+ this.groupItemSeparator = groupItemSeparator;
+ }
+}
Property changes on: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/ToolBarTestBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-07-12 15:20:17 UTC (rev 9554)
+++ trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-07-12 16:04:47 UTC (rev 9555)
@@ -200,6 +200,11 @@
<managed-bean-name>inplaceInputBean</managed-bean-name>
<managed-bean-class>org.ajax4jsf.bean.InplaceInputTestBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>toolBarBean</managed-bean-name>
+ <managed-bean-class>org.ajax4jsf.bean.ToolBarTestBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<navigation-rule>
<from-view-id>/pages/ajaxInclude/step1.xhtml</from-view-id>
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/toolBar/eventTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/toolBar/eventTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/toolBar/toolBarTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/src/main/webapp/pages/toolBar/toolBarTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/ToolBarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/ToolBarTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/ToolBarTest.java 2008-07-12 16:04:47 UTC (rev 9555)
@@ -0,0 +1,84 @@
+package org.richfaces.testng;
+
+import org.ajax4jsf.template.Template;
+import org.richfaces.SeleniumTestBase;
+import org.testng.annotations.Test;
+
+public class ToolBarTest extends SeleniumTestBase {
+
+ private static final String TOOLBAR = "toolbar";
+
+ private final static String RESULT_FAILED_TEXT = "No";
+
+ private final static String RESULT_PASSED_TEXT = "Passed";
+
+ /* Tab panel group/item separator constants */
+ private final static String LINE_SEPARATOR = "line";
+
+ private final static String DISC_SEPARATOR = "disc";
+
+ private final static String GRID_SEPARATOR = "grid";
+
+ private final static String SQUARE_SEPARATOR = "square";
+
+ private final static String NONE_SEPARATOR = "none";
+
+ @Test
+ public void testToolBarComponentLayout(Template template) {
+ renderPage(template);
+
+ writeStatus("Check component layout");
+
+ String id = getParentId() + "_form:";
+
+ writeStatus("Switch toolbar group separator");
+
+ clickAjaxCommandAndWait(id + "gs_" + LINE_SEPARATOR);
+ clickAjaxCommandAndWait(id + "gs_" + DISC_SEPARATOR);
+ clickAjaxCommandAndWait(id + "gs_" + GRID_SEPARATOR);
+ clickAjaxCommandAndWait(id + "gs_" + SQUARE_SEPARATOR);
+ clickAjaxCommandAndWait(id + "gs_" + NONE_SEPARATOR);
+
+ writeStatus("Switch toolbar group item separator");
+
+ clickAjaxCommandAndWait(id + "gis_" + LINE_SEPARATOR);
+ clickAjaxCommandAndWait(id + "gis_" + DISC_SEPARATOR);
+ clickAjaxCommandAndWait(id + "gis_" + GRID_SEPARATOR);
+ clickAjaxCommandAndWait(id + "gis_" + SQUARE_SEPARATOR);
+ clickAjaxCommandAndWait(id + "gis_" + NONE_SEPARATOR);
+ }
+
+ @Test
+ public void testToolBarEvents(Template template) {
+ renderPage(template);
+
+ writeStatus("Check component event triggering");
+
+ String toolbar = getParentId() + TOOLBAR + "_click";
+ testOnclickEvent(toolbar, toolbar + "_result", RESULT_FAILED_TEXT, RESULT_PASSED_TEXT);
+
+ toolbar = getParentId() + TOOLBAR + "_dblclick";
+ testOnDblclickEvent(toolbar, toolbar + "_result", RESULT_FAILED_TEXT, RESULT_PASSED_TEXT);
+
+ toolbar = getParentId() + TOOLBAR + "_mousedown";
+ testOnmousedownEvent(toolbar, toolbar + "_result", RESULT_FAILED_TEXT, RESULT_PASSED_TEXT);
+
+ toolbar = getParentId() + TOOLBAR + "_mousemove";
+ testOnmousemoveEvent(toolbar, toolbar + "_result", RESULT_FAILED_TEXT, RESULT_PASSED_TEXT);
+
+ toolbar = getParentId() + TOOLBAR + "_mouseout";
+ testOnmouseoutEvent(toolbar, toolbar + "_result", RESULT_FAILED_TEXT, RESULT_PASSED_TEXT);
+
+ toolbar = getParentId() + TOOLBAR + "_mouseover";
+ testOnmouseoverEvent(toolbar, toolbar + "_result", RESULT_FAILED_TEXT, RESULT_PASSED_TEXT);
+
+ toolbar = getParentId() + TOOLBAR + "_mouseup";
+ testOnmouseupEvent(toolbar, toolbar + "_result", RESULT_FAILED_TEXT, RESULT_PASSED_TEXT);
+ }
+
+ @Override
+ public String getTestUrl() {
+ return "pages/toolBar/toolBarTest.xhtml";
+ }
+
+}
Property changes on: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/ToolBarTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
16 years, 2 months
JBoss Rich Faces SVN: r9554 - trunk/docs/userguide/en/src/main/resources/css.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-07-12 11:20:17 -0400 (Sat, 12 Jul 2008)
New Revision: 9554
Modified:
trunk/docs/userguide/en/src/main/resources/css/html.css
Log:
http://jira.jboss.com/jira/browse/RF-3875 - All the buttons, cursor and tables border were fixed
Modified: trunk/docs/userguide/en/src/main/resources/css/html.css
===================================================================
--- trunk/docs/userguide/en/src/main/resources/css/html.css 2008-07-12 11:17:36 UTC (rev 9553)
+++ trunk/docs/userguide/en/src/main/resources/css/html.css 2008-07-12 15:20:17 UTC (rev 9554)
@@ -19,13 +19,22 @@
text-align:center;
}
-
div.book, div.chapter, div.section{
width:1000px;
margin:0 auto;
text-align:justify;
}
+.docnav li.previous strong, .docnav li.next strong {
+ width: 200px;
+ height:22px;
+}
+.docnav a:hover {
+ cursor:pointer;
+}
+th, td {
+ border: 1px solid #AAAAAA;
+}
#title, ul.docnav{
margin:0 auto;
width:1000px;
16 years, 2 months