JBoss Rich Faces SVN: r6488 - trunk/test-applications/facelets/src/main/webapp/CustomizePage.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-03-03 08:30:47 -0500 (Mon, 03 Mar 2008)
New Revision: 6488
Modified:
trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml
Log:
Modified: trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2008-03-03 13:29:07 UTC (rev 6487)
+++ trunk/test-applications/facelets/src/main/webapp/CustomizePage/CustomizePage.xhtml 2008-03-03 13:30:47 UTC (rev 6488)
@@ -3,32 +3,10 @@
<html>
<f:view>
<head>
- <f:loadBundle basename="message" var="msg" />
<title></title>
- <script type="text/javascript">
- function showEvent(elementID, value) {
- var oldObject = window.document.getElementById(elementID);
- if(oldObject == null || oldObject.type == "text") return;
- var newObject = window.document.createElement('input');
- if(oldObject.type) newObject.type = "text";
- if(oldObject.size) newObject.size = oldObject.size;
- if(oldObject.value) newObject.value = value;
- if(oldObject.id) newObject.id = oldObject.id;
- oldObject.parentNode.replaceChild(newObject,oldObject);
- }
- </script>
-
<body>
- <h:panelGroup binding="#{pTComponent.component}">
-
- <f:attribute name="var" value="body" />
- <h:form id="test">
-
+ <h:form>
</h:form>
- </h:panelGroup>
-
- <h:outputText value="#{pttc}" escape="true"></h:outputText>
-
</body>
</f:view>
</html>
16 years, 9 months
JBoss Rich Faces SVN: r6487 - in trunk/samples/fileUploadDemo/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-03-03 08:29:07 -0500 (Mon, 03 Mar 2008)
New Revision: 6487
Modified:
trunk/samples/fileUploadDemo/src/main/java/org/richfaces/Bean.java
trunk/samples/fileUploadDemo/src/main/webapp/pages/index.jsp
Log:
update demo site
Modified: trunk/samples/fileUploadDemo/src/main/java/org/richfaces/Bean.java
===================================================================
--- trunk/samples/fileUploadDemo/src/main/java/org/richfaces/Bean.java 2008-03-03 13:28:57 UTC (rev 6486)
+++ trunk/samples/fileUploadDemo/src/main/java/org/richfaces/Bean.java 2008-03-03 13:29:07 UTC (rev 6487)
@@ -32,6 +32,7 @@
import java.util.Set;
import org.richfaces.event.UploadEvent;
+import org.richfaces.model.UploadItem;
/**
* @author $Autor$
@@ -39,7 +40,7 @@
*/
public class Bean {
- private Map data = new HashMap();
+ private List data = new ArrayList();
private boolean flag;
@@ -56,7 +57,7 @@
}
public List getFileList () {
- return data != null ? new ArrayList(data.keySet()) : null;
+ return data;
}
@@ -65,28 +66,30 @@
}
public void listener(UploadEvent event) throws IOException{
- System.out.println("File : '" + event.getFileName() + "' was uploaded");
- if (event.isFile()) {
- File file = event.getFile();
+ UploadItem item = event.getUploadItem();
+ System.out.println("File : '" + item.getFileName() + "' was uploaded");
+ if (item.isFile()) {
+ File file = item.getFile();
System.out.println("Absolute Path : '" + file.getAbsolutePath() + "'!");
}else {
ByteArrayOutputStream b = new ByteArrayOutputStream();
- b.write(event.getData());
+ b.write(item.getData());
System.out.println(b.toString());
}
}
+
/**
* @return the data
*/
- public Map<String, InputStream> getData() {
+ public List getData() {
return data;
}
/**
* @param data the data to set
*/
- public void setData(Map<String, InputStream> data) {
+ public void setData(List data) {
this.data = data;
}
Modified: trunk/samples/fileUploadDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/fileUploadDemo/src/main/webapp/pages/index.jsp 2008-03-03 13:28:57 UTC (rev 6486)
+++ trunk/samples/fileUploadDemo/src/main/webapp/pages/index.jsp 2008-03-03 13:29:07 UTC (rev 6487)
@@ -42,16 +42,12 @@
<h:form>
<fu:fileUpload
id="upload1"
- data="#{bean.data}"
+ uploadData="#{bean.data}"
fileUploadListener="#{bean.listener}"
listWidth="#{bean.width}px"
listHeight="#{bean.height}px"
maxFilesQuantity="#{bean.maxFiles}"
acceptedTypes="#{bean.fileTypes}">
- <f:facet name="progress">
- <progressBar:progressBar style="height: 5px; width: 250px;">
- </progressBar:progressBar>
- </f:facet>
<f:facet name="label">
<h:outputText value="{_KB}KB from {KB}KB uploaded --- {mm}:{ss}"></h:outputText>
</f:facet>
@@ -59,7 +55,7 @@
<a4j:commandLink style="font-weight: bold; width: 200px;" value="Show files uploaded:" reRender="files_list"></a4j:commandLink><br/><br/>
<h:dataTable value="#{bean.fileList}" var="file" id="files_list" style="width: 500px">
<h:column>
- <h:outputText value="#{file}"></h:outputText>
+ <h:outputText value="#{file.fileName}"></h:outputText>
</h:column>
</h:dataTable>
16 years, 9 months
JBoss Rich Faces SVN: r6486 - in trunk/ui/fileUpload/src/main: java/org/richfaces/org/jboss/seam/ui/renderkit and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-03-03 08:28:57 -0500 (Mon, 03 Mar 2008)
New Revision: 6486
Modified:
trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
trunk/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss
Log:
changes after upload event update
Modified: trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-03-03 13:28:14 UTC (rev 6485)
+++ trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-03-03 13:28:57 UTC (rev 6486)
@@ -67,9 +67,9 @@
&html_events;
&html_input_events;
<property elonly="true">
- <name>data</name>
+ <name>uploadData</name>
<classname>java.lang.Object</classname>
- <description>this value binding receives the file's content type (optional).</description>
+ <description>Collection of files uploaded</description>
</property>
<property elonly="true">
<name>contentType</name>
Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-03-03 13:28:14 UTC (rev 6485)
+++ trunk/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-03-03 13:28:57 UTC (rev 6486)
@@ -1,6 +1,7 @@
package org.richfaces.org.jboss.seam.ui.renderkit;
import java.io.IOException;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -26,6 +27,7 @@
import org.ajax4jsf.resource.CountingOutputWriter;
import org.richfaces.component.UIProgressBar;
import org.richfaces.event.UploadEvent;
+import org.richfaces.model.UploadItem;
import org.richfaces.org.jboss.seam.ui.component.UIFileUpload;
import org.richfaces.org.jboss.seam.web.FileUploadException;
import org.richfaces.org.jboss.seam.web.MultipartRequest;
@@ -39,6 +41,9 @@
*/
public abstract class FileUploadRendererBase extends
TemplateEncoderRendererBase {
+
+ /** Attribute name where collection of files uploaded will be stored */
+ private static final String _FILES_UPLOADED_ATTRIBUTE_NAME = "uploadData";
/*
* (non-Javadoc)
@@ -65,7 +70,6 @@
.getFileContentType(clientId));
fileUpload.setLocalFileName(multipartRequest.getFileName(clientId));
fileUpload.setLocalFileSize(multipartRequest.getFileSize(clientId));
- new UploadEvent(component, multipartRequest.getFile(clientId), multipartRequest.getFileName(clientId)).queue();
onUploadComplete(context, multipartRequest.getFile(clientId),
fileUpload);
}
@@ -78,9 +82,9 @@
* @param map
* @return
*/
- private boolean checkFileCount (UIFileUpload fileUpload, Map<String, Object> map) {
+ private boolean checkFileCount (UIFileUpload fileUpload, Collection filesUploaded) {
Integer max = fileUpload.getMaxFilesQuantity();
- if (map != null && map.size() >= max) {
+ if (filesUploaded != null && filesUploaded.size() >= max) {
fileUpload.reset();
return false;
}
@@ -95,13 +99,14 @@
*/
@SuppressWarnings("unchecked")
private void storeData(FacesContext context, UIFileUpload fileUpload, Object file) {
- ValueExpression data = fileUpload.getValueExpression("data");
+ ValueExpression data = fileUpload.getValueExpression(_FILES_UPLOADED_ATTRIBUTE_NAME);
if (data != null) {
- Class clazz = data.getType(context.getELContext());
- if (clazz.isAssignableFrom(Map.class)) {
- Map<String, Object> map = (Map<String, Object>) data.getValue(context.getELContext());
- if (checkFileCount(fileUpload, map)) {
- map.put(fileUpload.getLocalFileName(), file);
+ if (data.getValue(context.getELContext()) instanceof Collection) {
+ Collection collection = (Collection) data.getValue(context.getELContext());
+ if (checkFileCount(fileUpload, collection)) {
+ UploadItem item = new UploadItem(fileUpload.getLocalFileName(), file);
+ new UploadEvent(fileUpload, item).queue();
+ collection.add(item);
}else {
throw new FileUploadException("Files count overflow");
}
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2008-03-03 13:28:14 UTC (rev 6485)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2008-03-03 13:28:57 UTC (rev 6486)
@@ -11,7 +11,7 @@
table{width : 100%}
.upload_list_overflow{overflow : auto; overflow-x : hidden;}
-.upload_name{ width : 100%; height : 50px; padding : 2px 10px 2px 10px;}
+.upload_name{ width : 100%; height : 58px; padding : 2px 10px 2px 10px;}
.upload_del{ width : 90px; text-align : center; padding-top : 3; padding-bottom : 3;}
.upload_scroll{ width : 10px; text-align : center;}
16 years, 9 months
JBoss Rich Faces SVN: r6485 - in trunk/framework/api/src/main/java/org/richfaces: model and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-03-03 08:28:14 -0500 (Mon, 03 Mar 2008)
New Revision: 6485
Added:
trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java
Modified:
trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java
Log:
Add UploadItem class; UploadEvent refactoring
Modified: trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java 2008-03-03 11:26:10 UTC (rev 6484)
+++ trunk/framework/api/src/main/java/org/richfaces/event/UploadEvent.java 2008-03-03 13:28:14 UTC (rev 6485)
@@ -20,42 +20,24 @@
*/
package org.richfaces.event;
-import java.io.File;
-
import javax.faces.component.UIComponent;
import javax.faces.event.FacesEvent;
import javax.faces.event.FacesListener;
+import org.richfaces.model.UploadItem;
+
public class UploadEvent extends FacesEvent{
private static final long serialVersionUID = -7645197191376210068L;
- private File file = null;
- private byte [] data= null;
- private String fileName = null;
+ private UploadItem uploadItem = null;
- public UploadEvent(UIComponent component, Object file, String fileName) {
+ public UploadEvent(UIComponent component, UploadItem uploadItem) {
super(component);
- this.fileName = fileName;
- init(file);
+ this.uploadItem = uploadItem;
}
- private void init (Object file) {
- if (null == file) {
- return;
- }
- if (file.getClass().isAssignableFrom(File.class)) {
- this.file = (File)file;
- }else if (file.getClass().isAssignableFrom(byte[].class)) {
- this.data = (byte[])file;
- }
- }
- public boolean isFile () {
- return (null != file);
- }
-
-
public boolean isAppropriateListener(FacesListener listener) {
return false;
}
@@ -65,20 +47,10 @@
}
-
- public File getFile() {
- return file;
- }
-
- public String getFileName() {
- return fileName;
- }
-
/**
- * @return the fileData
+ * @return the uploadItem
*/
- public byte[] getData() {
- return data;
+ public UploadItem getUploadItem() {
+ return uploadItem;
}
-
}
Added: trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java 2008-03-03 13:28:14 UTC (rev 6485)
@@ -0,0 +1,74 @@
+/*
+ * UploadItem.java Date created: 03.03.2008
+ * Last modified by: $Author$
+ * $Revision$ $Date$
+ */
+
+package org.richfaces.model;
+
+import java.io.File;
+
+/**
+ * Class provides object holder for file uploaded.
+ * Instance of this type will be returned by UploadEvent after appropriate listener called after uploading has been completed.
+ * @author "Andrey Markavtsov"
+ *
+ */
+public class UploadItem {
+
+ /** Users file name */
+ private String fileName;
+
+ /** java.io.File instance */
+ private File file;
+
+ /** File byte content */
+ private byte [] bytes;
+
+ /**
+ * Constructor for the UploadItem
+ */
+ public UploadItem(String fileName, Object file) {
+ this.fileName = fileName;
+ if (null != file) {
+ if (file.getClass().isAssignableFrom(File.class)) {
+ this.file = (File)file;
+ }
+ }else if (file.getClass().isAssignableFrom(byte[].class)) {
+ this.bytes = (byte [])file;
+ }
+ }
+
+ /**
+ * Return true if file is holding as java.io.File type.
+ * If true getFile method should be invoked to get file uploaded.
+ * In another case getData method should be invoked to get file's bytes.
+ * @return
+ */
+ public boolean isFile () {
+ return (null != file);
+ }
+
+ /**
+ * @return the file
+ */
+ public File getFile() {
+ return file;
+ }
+
+ /**
+ * @return the bytes
+ */
+ public byte[] getData() {
+ return bytes;
+ }
+
+ /**
+ * @return the fileName
+ */
+ public String getFileName() {
+ return fileName;
+ }
+
+
+}
16 years, 9 months
JBoss Rich Faces SVN: r6484 - in trunk/ui: orderingList/src/main/java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-03-03 06:26:10 -0500 (Mon, 03 Mar 2008)
New Revision: 6484
Modified:
trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
Log:
http://jira.jboss.com/jira/browse/RF-2338
Modified: trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
--- trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2008-03-03 10:07:30 UTC (rev 6483)
+++ trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2008-03-03 11:26:10 UTC (rev 6484)
@@ -105,11 +105,6 @@
color: inherit;
}
-.rich-list-shuttle-button-a-disabled {
- cursor: default;
- text-decoration: none;
-}
-
.rich-list-shuttle-caption {
text-align: left;
padding : 1px;
@@ -273,10 +268,6 @@
<u:style name="display" value="block" />
</u:selector>
- <u:selector name="a.rich-list-shuttle-button-a-disabled a">
- <u:style name="color" skin="tabDisabledTextColor"/>
- </u:selector>
-
<u:selector name=".rich-shuttle-source-caption, .rich-shuttle-target-caption">
<u:style name="font-family" skin="headerFamilyFont" />
<u:style name="font-size" skin="headerSizeFont" />
Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
===================================================================
--- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2008-03-03 10:07:30 UTC (rev 6483)
+++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2008-03-03 11:26:10 UTC (rev 6484)
@@ -338,20 +338,12 @@
"this.className='" + baseStyle + "'", null);
writer.writeAttribute(HTML.onmouseout_ATTRIBUTE,
"this.className='" + baseStyle + "'", null);
- }
-
- writer.startElement(HTML.a_ELEMENT, orderingList);
- writer.writeAttribute(HTML.id_ATTRIBUTE, controlId + "link", null); // FIXME:
- writer.writeAttribute(HTML.HREF_ATTR, "#", null);
- writer
- .writeAttribute(HTML.onclick_ATTRIBUTE, "return false;",
- null);
- if (!helper.enable) {
- writer.writeAttribute(HTML.DISABLED_ATTR, "disabled", null);
- writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle
- + "-a-disabled", null);
+
writer.startElement(HTML.a_ELEMENT, orderingList);
- } else {
+ writer.writeAttribute(HTML.id_ATTRIBUTE, controlId + "link", null); // FIXME:
+ writer.writeAttribute(HTML.HREF_ATTR, "#", null);
+ writer.writeAttribute(HTML.onclick_ATTRIBUTE, "return false;", null);
+
writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle
+ "-selection", null);
writer.writeAttribute(HTML.onblur_ATTRIBUTE,
@@ -431,10 +423,9 @@
if (!useFacet) {
writer.endElement(HTML.DIV_ELEM);
- if (!helper.enable) {
+ if (helper.enable) {
writer.endElement(HTML.a_ELEMENT);
}
- writer.endElement(HTML.a_ELEMENT);
writer.endElement(HTML.DIV_ELEM);
}
writer.endElement(HTML.DIV_ELEM);
Modified: trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
===================================================================
--- trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2008-03-03 10:07:30 UTC (rev 6483)
+++ trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2008-03-03 11:26:10 UTC (rev 6484)
@@ -82,17 +82,10 @@
}
a.rich-ordering-list-button-selection:visited,
-a.rich-ordering-list-button-selection:link,
-a.rich-ordering-list-button-a-disabled:visited,
-a.rich-ordering-list-button-a-disabled:link {
+a.rich-ordering-list-button-selection:link {
color: inherit;
}
-.rich-ordering-list-button-a-disabled {
- cursor: default;
- text-decoration: none;
-}
-
.rich-ordering-list-caption {
text-align: left;
height: 8px;
16 years, 9 months
JBoss Rich Faces SVN: r6483 - management/design/userComponentCSS/markup.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2008-03-03 05:07:30 -0500 (Mon, 03 Mar 2008)
New Revision: 6483
Modified:
management/design/userComponentCSS/markup/rich-styles.css
Log:
http://jira.jboss.com/jira/browse/RF-2358
Modified: management/design/userComponentCSS/markup/rich-styles.css
===================================================================
--- management/design/userComponentCSS/markup/rich-styles.css 2008-03-03 10:05:18 UTC (rev 6482)
+++ management/design/userComponentCSS/markup/rich-styles.css 2008-03-03 10:07:30 UTC (rev 6483)
@@ -102,11 +102,129 @@
+.rich-field{
+ border-width: 1px;
+ border-style : inset;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*generalSizeFont*/;
+ font-family: verdana /*generalFamilyFont*/;
+ color : #000000 /*controlTextColor*/;
+ background-color : #FFFFFF /*controlBackgroundColor*/;
+ background-image : url(input_bg.gif)/*from additionalBackgroundColor to controlBackgroundColor, width generalSizeFont; width : 1600px*/;
+ background-repeat : no-repeat;
+ background-position : 1px 1px;
+}
+.rich-field-edit{
+ border-width: 1px;
+ border-style : inset;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*generalSizeFont*/;
+ font-family: verdana /*generalFamilyFont*/;
+ color : #000000 /*controlTextColor*/;
+ background-color : #FFF2D0 /*editBackgroundColor*/;
+}
+.rich-field-error{
+ border-width: 1px;
+ border-style : inset;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*generalSizeFont*/;
+ font-family: verdana /*generalFamilyFont*/;
+ color : #000000 /*controlTextColor*/;
+ background-color : #FFE6E6 /*warningBackgroundColor*/;
+ background-image : url(input_error.gif); /*warningColor*/
+ background-repeat : no-repeat;
+ background-position : center left;
+ padding-left : 12px;
+}
+.rich-button{
+ border-width: 1px;
+ border-style : solid;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*buttonSizeFont*/;
+ font-family: verdana /*buttonFamilyFont*/;
+ color : #000000 /*generalTextColor*/;
+ background-color : #C6D6EA /*trimColor*/;
+ background-image : url(btn_bg.gif)/*from additionalBackgroundColor to trimColor, width 1.7 buttonSizeFont*/;
+ background-repeat : repeat-x;
+ background-position : top left;
+ padding : 2px 10px 2px 10px;
+}
+.rich-button-disabled{
+ border-width: 1px;
+ border-style : solid;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*buttonSizeFont*/;
+ font-family: verdana /*buttonFamilyFont*/;
+ color : #6A92CF /*tabDisabledTextColor*/;
+ background-color : #C6D6EA /*trimColor*/;
+ background-image : url(btn_bg.gif)/*from additionalBackgroundColor to trimColor, width 1.7 buttonSizeFont*/;
+ background-repeat : repeat-x;
+ background-position : top left;
+ padding : 2px 10px 2px 10px;
+}
+.rich-button-over{
+ border-width: 1px;
+ border-style : solid;
+ border-color : #E79A00 /*selectControlColor*/;
+ font-size: 11px /*buttonSizeFont*/;
+ font-family: verdana /*buttonFamilyFont*/;
+ color : #000000 /*generalTextColor*/;
+ background-color : #C6D6EA /*trimColor*/;
+ background-image : url(btn_bg.gif)/*from additionalBackgroundColor to trimColor, width 1.7 buttonSizeFont*/;
+ background-repeat : repeat-x;
+ background-position : top left;
+ padding : 2px 10px 2px 10px;
+}
+.rich-button_press{
+ border-width: 1px;
+ border-style : solid;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*buttonSizeFont*/;
+ font-family: verdana /*buttonFamilyFont*/;
+ color : #000000 /*generalTextColor*/;
+ background-color : #C6D6EA /*trimColor*/;
+ background-image : url(btn_bg.gif)/*from trimColor to additionalBackgroundColor, width 1.7 buttonSizeFont*/;
+ background-repeat : repeat-x;
+ background-position : bottom left;
+ padding : 2px 10px 2px 10px;
+}
+.rich-fieldset{
+ border-width: 1px;
+ border-style : solid;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*generalSizeFont*/;
+ font-family: verdana /*generalFamilyFont*/;
+ color : #000000 /*controlTextColor*/;
+ padding : 10px;
+}
+.rich-legend{
+ font-size: 11px /*generalSizeFont*/;
+ font-family: verdana /*generalFamilyFont*/;
+ color : #000000 /*controlTextColor*/;
+ font-weight : bold;
+}
+.rich-form{
+ padding : 0px;
+ margin : 0px;
+}
+.rich-hr{
+ color : #BED6F8 /*panelBorderColor*/;
+}
+
+.rich-listitem{
+ list-style-image : url(bullet.gif); /*background - headerBackgroundColor, glare - headerGradientColor; border - 1px subBorderColor=#fffff, */
+}
+
+
+
+
+
+
16 years, 9 months
JBoss Rich Faces SVN: r6482 - Plan/3.2.0 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-03-03 05:05:18 -0500 (Mon, 03 Mar 2008)
New Revision: 6482
Modified:
trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
Log:
Modified: trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
===================================================================
(Binary files differ)
16 years, 9 months
JBoss Rich Faces SVN: r6481 - in branches/3.1.x/ui/componentControl/src: test/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-03 02:47:02 -0500 (Mon, 03 Mar 2008)
New Revision: 6481
Modified:
branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java
branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java
Log:
added jdk1.4 compatibility
Modified: branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java
===================================================================
--- branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java 2008-03-03 03:58:09 UTC (rev 6480)
+++ branches/3.1.x/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java 2008-03-03 07:47:02 UTC (rev 6481)
@@ -5,6 +5,8 @@
package org.richfaces.component;
import java.util.Iterator;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
@@ -35,6 +37,8 @@
private static final Log log = LogFactory.getLog(UIComponentControl.class);
+ private static final Pattern BACKSLASHES = Pattern.compile("\\\\", Pattern.LITERAL);
+ private static final String QUOTED_REPLACEMENT = "\\\\";
/**
* @return JavaScript eventString. Rebuild on every call, since
@@ -45,12 +49,11 @@
String targetId = HtmlUtil.idsToIdSelector(getFor());
targetId = HtmlUtil.expandIdSelector(targetId, this, FacesContext.getCurrentInstance());
-
JSFunction invocation = new JSFunction("Richfaces.componentControl.performOperation");
invocation.addParameter(new JSReference("event"));
//FIXME: Maksim
//Replacement looks ugly - move that functionality to HtmlUtil
- invocation.addParameter(targetId.replace("\\\\", "\\"));
+ invocation.addParameter(replaceBackSlashes(targetId));
invocation.addParameter(getOperation());
invocation.addParameter(new JSReference("{" + getEncodedParametersMap() + "}"));
invocation.addParameter(Boolean.valueOf(isDisableDefault()));
@@ -60,6 +63,10 @@
}
+ protected String replaceBackSlashes(String src) {
+ return BACKSLASHES.matcher(src).replaceAll(QUOTED_REPLACEMENT);
+ }
+
public String getEncodedParametersMap() {
StringBuffer result = new StringBuffer();
Modified: branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java
===================================================================
--- branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java 2008-03-03 03:58:09 UTC (rev 6480)
+++ branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java 2008-03-03 07:47:02 UTC (rev 6481)
@@ -174,4 +174,9 @@
}
}
+
+ public void testReplaceBackSlashes() {
+ String s = "\\\\A\\B\\\\C";
+ assertEquals(s.replace("\\\\", "\\"), componentControl.replaceBackSlashes(s));
+ }
}
16 years, 9 months
JBoss Rich Faces SVN: r6480 - trunk/sandbox/samples.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-03-02 22:58:09 -0500 (Sun, 02 Mar 2008)
New Revision: 6480
Removed:
trunk/sandbox/samples/contextMenuDemo/
trunk/sandbox/samples/listShuttleDemo/
trunk/sandbox/samples/orderingListDemo/
trunk/sandbox/samples/rich-message-demo/
Log:
Excess folders removed from sandbox
16 years, 9 months
JBoss Rich Faces SVN: r6479 - in trunk/samples: fileUploadDemo and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-03-02 22:55:41 -0500 (Sun, 02 Mar 2008)
New Revision: 6479
Added:
trunk/samples/fileUploadDemo/
Modified:
trunk/samples/fileUploadDemo/pom.xml
trunk/samples/fileUploadDemo/src/main/webapp/pages/index.jsp
Log:
fileUpload, inplaceInput, inplaceSelect components & demos; data table sorting & filtering demo moved to main build
Copied: trunk/samples/fileUploadDemo (from rev 6477, trunk/sandbox/samples/fileUploadDemo)
Modified: trunk/samples/fileUploadDemo/pom.xml
===================================================================
--- trunk/sandbox/samples/fileUploadDemo/pom.xml 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/samples/fileUploadDemo/pom.xml 2008-03-03 03:55:41 UTC (rev 6479)
@@ -1,7 +1,7 @@
<?xml version="1.0"?><project>
<parent>
<artifactId>samples</artifactId>
- <groupId>org.richfaces.sandbox</groupId>
+ <groupId>org.richfaces</groupId>
<version>3.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -12,19 +12,19 @@
<version>3.2.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.richfaces.sandbox.ui</groupId>
+ <groupId>org.richfaces.ui</groupId>
<artifactId>fileUpload</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>core</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>progressBar</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.samples</groupId>
@@ -34,15 +34,5 @@
</dependencies>
<build>
<finalName>fileUploadDemo</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
\ No newline at end of file
Modified: trunk/samples/fileUploadDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp 2008-03-03 01:41:29 UTC (rev 6477)
+++ trunk/samples/fileUploadDemo/src/main/webapp/pages/index.jsp 2008-03-03 03:55:41 UTC (rev 6479)
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
-<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/fileUpload"
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/fileUpload"
prefix="fu"%>
<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/progressBar" prefix="progressBar" %>
<html>
16 years, 9 months