JBoss Rich Faces SVN: r16211 - branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-12-24 13:51:04 -0500 (Thu, 24 Dec 2009)
New Revision: 16211
Modified:
branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml
Log:
Update existing CDK archetypes
https://jira.jboss.org/jira/browse/RFPL-285
Modified: branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml
===================================================================
--- branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2009-12-24 18:48:56 UTC (rev 16210)
+++ branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2009-12-24 18:51:04 UTC (rev 16211)
@@ -59,9 +59,9 @@
</dependency>
<dependency>
- <groupId>${jsf.groupId}</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${jsf.version}</version>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_12</version>
<scope>provided</scope>
</dependency>
</dependencies>
15 years
JBoss Rich Faces SVN: r16210 - in branches/community/3.3.X/cdk: maven-archetype-jsfwebapp/src/main/resources/archetype-resources and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-12-24 13:48:56 -0500 (Thu, 24 Dec 2009)
New Revision: 16210
Modified:
branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml
branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml
branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml
branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml
Log:
Update existing CDK archetypes
https://jira.jboss.org/jira/browse/RFPL-285
Modified: branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml
===================================================================
--- branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2009-12-24 16:26:43 UTC (rev 16209)
+++ branches/community/3.3.X/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/pom.xml 2009-12-24 18:48:56 UTC (rev 16210)
@@ -42,6 +42,7 @@
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
<version>3.3.3-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml
===================================================================
--- branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2009-12-24 16:26:43 UTC (rev 16209)
+++ branches/community/3.3.X/cdk/maven-archetype-jsfwebapp/src/main/resources/archetype-resources/pom.xml 2009-12-24 18:48:56 UTC (rev 16210)
@@ -32,5 +32,11 @@
<artifactId>richfaces-ui</artifactId>
<version>3.3.3-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.3.3-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml
===================================================================
--- branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml 2009-12-24 16:26:43 UTC (rev 16209)
+++ branches/community/3.3.X/cdk/maven-archetype-plug-n-skin/src/main/resources/archetype-resources/pom.xml 2009-12-24 18:48:56 UTC (rev 16210)
@@ -5,11 +5,11 @@
<artifactId>${artifactId}</artifactId>
<name>${artifactId}</name>
<version>${version}</version>
- <build>
- <plugins>
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-cdk-plugin</artifactId>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
<version>3.3.3-SNAPSHOT</version>
<executions>
<execution>
@@ -18,7 +18,7 @@
<goal>generate</goal>
</goals>
</execution>
- </executions>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -28,13 +28,14 @@
<target>1.5</target>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
<version>3.3.3-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml
===================================================================
--- branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2009-12-24 16:26:43 UTC (rev 16209)
+++ branches/community/3.3.X/cdk/maven-archetype-theme/src/main/resources/archetype-resources/pom.xml 2009-12-24 18:48:56 UTC (rev 16210)
@@ -47,6 +47,7 @@
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
<version>3.3.3-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<!-- Required for JSF -->
@@ -58,10 +59,10 @@
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
+ <groupId>${jsf.groupId}</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2_12</version>
+ <version>${jsf.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
</project>
15 years
JBoss Rich Faces SVN: r16209 - branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-12-24 11:26:43 -0500 (Thu, 24 Dec 2009)
New Revision: 16209
Modified:
branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx
Log:
RF-7694 suggestionBox: not valid markup according to w3c
Modified: branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx
===================================================================
--- branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx 2009-12-23 23:04:15 UTC (rev 16208)
+++ branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx 2009-12-24 16:26:43 UTC (rev 16209)
@@ -32,6 +32,7 @@
<f:parameter value="onclick,onselect,width,height,rows,border"/>
</f:call>
<tbody>
+ <tr style="display:none;"><td> </td></tr>
</tbody>
</table>
</div>
15 years
JBoss Rich Faces SVN: r16208 - in root/cdk/trunk/plugins: attributes/src/main/java/org/richfaces/cdk/attributes and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-12-23 18:04:15 -0500 (Wed, 23 Dec 2009)
New Revision: 16208
Removed:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/builder/render/
Modified:
root/cdk/trunk/plugins/attributes/
root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Attribute.java
root/cdk/trunk/plugins/attributes/src/test/java/org/richfaces/cdk/attributes/AttributesTest.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java
root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessor.groovy
Log:
Refactoring: added Attribute.Kind annotation + handling
Removed legacy renderer for .java code
Fixed wrong messages in TypesFactory
Property changes on: root/cdk/trunk/plugins/attributes
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
target
.clover
Modified: root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Attribute.java
===================================================================
--- root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Attribute.java 2009-12-23 19:00:19 UTC (rev 16207)
+++ root/cdk/trunk/plugins/attributes/src/main/java/org/richfaces/cdk/attributes/Attribute.java 2009-12-23 23:04:15 UTC (rev 16208)
@@ -34,6 +34,10 @@
*/
public class Attribute implements KeyedType {
+ public enum Kind {
+ GENERIC, BOOLEAN, URI
+ }
+
@XmlRootElement(name = "attributes")
@XmlType(name = "AttributesType")
public static final class Type implements ContainerType<Attribute> {
@@ -57,8 +61,8 @@
private String defaultValue;
- private boolean uri;
-
+ private Kind kind = Kind.GENERIC;
+
public Attribute() {
super();
}
@@ -119,18 +123,18 @@
}
/**
- * @return the uri
+ * @return the kind
*/
@XmlElement
- public boolean isUri() {
- return uri;
+ public Kind getKind() {
+ return kind;
}
-
+
/**
- * @param uri the uri to set
+ * @param kind the kind to set
*/
- public void setUri(boolean uri) {
- this.uri = uri;
+ public void setKind(Kind kind) {
+ this.kind = kind;
}
/* (non-Javadoc)
Modified: root/cdk/trunk/plugins/attributes/src/test/java/org/richfaces/cdk/attributes/AttributesTest.java
===================================================================
--- root/cdk/trunk/plugins/attributes/src/test/java/org/richfaces/cdk/attributes/AttributesTest.java 2009-12-23 19:00:19 UTC (rev 16207)
+++ root/cdk/trunk/plugins/attributes/src/test/java/org/richfaces/cdk/attributes/AttributesTest.java 2009-12-23 23:04:15 UTC (rev 16208)
@@ -21,42 +21,139 @@
*/
package org.richfaces.cdk.attributes;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.StringReader;
import java.io.StringWriter;
+import java.util.Map;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.transform.stream.StreamResult;
+import org.junit.Before;
import org.junit.Test;
+import org.richfaces.cdk.attributes.Attribute.Kind;
-
/**
* @author Nick Belaevski
*
*/
public class AttributesTest {
- @Test
- public void testStub() throws Exception {
+ private SchemaSet schemaSet;
+
+ private String marshal(SchemaSet schemaSet) throws Exception {
+ StringWriter writer = new StringWriter();
JAXBContext jc = JAXBContext.newInstance(SchemaSet.class);
Marshaller marshaller = jc.createMarshaller();
marshaller.setProperty("jaxb.formatted.output", Boolean.TRUE);
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+ marshaller.marshal(schemaSet, new StreamResult(writer));
+
+ return writer.toString();
+ }
+
+ private SchemaSet unmarshal(String xmlData) throws Exception {
+ StringReader reader = new StringReader(xmlData);
+ JAXBContext jc = JAXBContext.newInstance(SchemaSet.class);
+ Unmarshaller unmarshaller = jc.createUnmarshaller();
- SchemaSet schemaSet = new SchemaSet();
- Schema schema = new Schema("abc");
+ return (SchemaSet) unmarshaller.unmarshal(reader);
+ }
+
+ @Before
+ public void setUp() {
+ schemaSet = new SchemaSet();
+ Schema schema = new Schema("urn:abc");
schemaSet.addSchema(schema);
- Element element = new Element("ele");
- schema.addElement(element);
- Attribute attribute = new Attribute("attr");
- element.addAttribute(attribute);
- StringWriter writer = new StringWriter();
- marshaller.marshal(schemaSet, writer);
+ Element spanElement = new Element("span");
+ schema.addElement(spanElement);
+
+ Attribute idAttribute = new Attribute("id");
+ spanElement.addAttribute(idAttribute);
- System.out.println(writer.toString());
+ Element imgElement = new Element("img");
+ schema.addElement(imgElement);
+
+ Attribute altAttribute = new Attribute("alt");
+ altAttribute.setRequired(true);
+ imgElement.addAttribute(altAttribute);
- jc.createUnmarshaller().unmarshal(new StringReader(writer.toString()));
+ Attribute srcAttribute = new Attribute("src");
+ srcAttribute.setKind(Kind.URI);
+ imgElement.addAttribute(srcAttribute);
+
+ Attribute dirAttribute = new Attribute("dir");
+ dirAttribute.setDefaultValue("ltr");
+ imgElement.addAttribute(dirAttribute);
}
+
+ public void tearDown() {
+ schemaSet = null;
+ }
+
+ @Test
+ public void testMarshalUnmarshal() throws Exception {
+ String marshalledData = marshal(schemaSet);
+
+ System.out.println("AttributesTest.testMarshalUnmarshal() " + marshalledData);
+
+ assertNotNull(marshalledData);
+ assertTrue(marshalledData.length() > 0);
+
+ SchemaSet restoredSchemaSet = unmarshal(marshalledData);
+ assertNotNull(restoredSchemaSet);
+
+ assertEquals(1, restoredSchemaSet.getSchemas().size());
+ Schema restoredSchema = restoredSchemaSet.getSchemas().get("urn:abc");
+ assertEquals("urn:abc", restoredSchema.getNamespace());
+ assertEquals("urn:abc", restoredSchema.getKey());
+
+ Map<String, Element> restoredElements = restoredSchema.getElements();
+ assertEquals(2, restoredElements.size());
+
+ Element restoredSpanElement = restoredElements.get("span");
+ assertNotNull(restoredSpanElement);
+ assertEquals("span", restoredSpanElement.getName());
+ assertEquals("span", restoredSpanElement.getKey());
+ Map<String, Attribute> restoredSpanAttributes = restoredSpanElement.getAttributes();
+ assertEquals(1, restoredSpanAttributes.size());
+ Attribute restoredIdAttribute = restoredSpanAttributes.get("id");
+ assertNotNull(restoredIdAttribute);
+ assertEquals("id", restoredIdAttribute.getName());
+ assertEquals("id", restoredIdAttribute.getKey());
+ assertNull(restoredIdAttribute.getDefaultValue());
+ assertFalse(restoredIdAttribute.isRequired());
+ assertEquals(Kind.GENERIC, restoredIdAttribute.getKind());
+
+ Element restoredImgElement = restoredElements.get("img");
+ assertNotNull(restoredImgElement);
+ assertEquals("img", restoredImgElement.getName());
+ assertEquals("img", restoredImgElement.getKey());
+ Map<String, Attribute> restoredImgAttributes = restoredImgElement.getAttributes();
+ assertEquals(3, restoredImgAttributes.size());
+
+ Attribute restoredAltAttribute = restoredImgAttributes.get("alt");
+ assertNotNull(restoredAltAttribute);
+ assertEquals("alt", restoredAltAttribute.getName());
+ assertTrue(restoredAltAttribute.isRequired());
+
+ Attribute restoredSrcAttribute = restoredImgAttributes.get("src");
+ assertNotNull(restoredSrcAttribute);
+ assertEquals("src", restoredSrcAttribute.getName());
+ assertEquals(Kind.URI, restoredSrcAttribute.getKind());
+
+ Attribute restoredDirAttribute = restoredImgAttributes.get("dir");
+ assertNotNull(restoredDirAttribute);
+ assertEquals("dir", restoredDirAttribute.getName());
+ assertEquals("ltr", restoredDirAttribute.getDefaultValue());
+ }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java 2009-12-23 19:00:19 UTC (rev 16207)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/types/TypesFactory.java 2009-12-23 23:04:15 UTC (rev 16208)
@@ -140,7 +140,7 @@
// ignore
} catch (LinkageError e) {
if (LOG.isInfoEnabled()) {
- LOG.info(MessageFormat.format("Class {0} couldn't be loaded because of: {1}", guessTypeName,
+ LOG.info(MessageFormat.format("Class {0} couldn''t be loaded because of: {1}", guessTypeName,
e.getMessage()));
}
}
@@ -152,7 +152,8 @@
try {
result = Class.forName(className, true, classLoader);
} catch (LinkageError e) {
- String errorMessage = MessageFormat.format("Class {0} couldn't be loaded because of: {1}", className, e.getMessage());
+ String errorMessage = MessageFormat.format("Class {0} couldn''t be loaded because of: {1}", className,
+ e.getMessage());
if (LOG.isInfoEnabled()) {
LOG.info(errorMessage);
}
Modified: root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessor.groovy
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessor.groovy 2009-12-23 19:00:19 UTC (rev 16207)
+++ root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessor.groovy 2009-12-23 23:04:15 UTC (rev 16208)
@@ -15,6 +15,7 @@
import javax.xml.xpath.XPathFactory;
import org.richfaces.cdk.attributes.Attribute;
+import org.richfaces.cdk.attributes.Attribute.Kind;
import org.richfaces.cdk.attributes.Element;
import org.richfaces.cdk.attributes.Schema;
import org.richfaces.cdk.attributes.SchemaSet;
@@ -25,7 +26,9 @@
import com.sun.xml.xsom.XSAttributeUse;
import com.sun.xml.xsom.XSComplexType;
import com.sun.xml.xsom.XSElementDecl;
+import com.sun.xml.xsom.XSFacet;
import com.sun.xml.xsom.XSListSimpleType;
+import com.sun.xml.xsom.XSRestrictionSimpleType;
import com.sun.xml.xsom.XSSchema;
import com.sun.xml.xsom.XSSchemaSet;
import com.sun.xml.xsom.XSSimpleType;
@@ -80,52 +83,70 @@
return defaultValue;
}
-
- private boolean isURIType(XSSimpleType simpleType) {
- return isURIType(simpleType, new HashSet<XSType>());
+
+ private boolean isGenericKind(Attribute.Kind attributeKind) {
+ return Kind.GENERIC.equals(attributeKind);
+ }
+
+ private Attribute.Kind getAttributeKind(XSSimpleType simpleType) {
+ return getAttributeKind(simpleType, new HashSet<XSType>());
}
- private boolean isURIType(XSSimpleType simpleType, Set<XSType> processedTypes) {
- if (simpleType == null) {
- return false;
+ private Attribute.Kind getAttributeKind(XSSimpleType simpleType, Set<XSType> processedTypes) {
+ Attribute.Kind attributeKind = Kind.GENERIC;
+
+ if (simpleType == null) {
+ return attributeKind;
}
if (!processedTypes.add(simpleType)) {
- return false;
+ return attributeKind;
}
if (simpleType.isDerivedFrom(anyURIType)) {
- return true;
+ return Attribute.Kind.URI;
}
+
+ if (simpleType.isRestriction()) {
+ XSRestrictionSimpleType restrictionType = simpleType.asRestriction();
+ List<XSFacet> facets = restrictionType.getDeclaredFacets("enumeration");
+ if (facets != null && facets.size() == 1) {
+ return Attribute.Kind.BOOLEAN;
+ }
+ }
+
+ attributeKind = getAttributeKind(simpleType.getSimpleBaseType(), processedTypes);
+ if (!isGenericKind(attributeKind)) {
+ return attributeKind;
+ }
- if (isURIType(simpleType.getSimpleBaseType(), processedTypes)) {
- return true;
- }
-
- if (isURIType(simpleType.getPrimitiveType(), processedTypes)) {
- return true;
- }
-
+ attributeKind = getAttributeKind(simpleType.getPrimitiveType(), processedTypes);
+ if (!isGenericKind(attributeKind)) {
+ return attributeKind;
+ }
+
if (simpleType.isUnion()) {
XSUnionSimpleType unionSimpleType = simpleType.asUnion();
int memberSize = unionSimpleType.getMemberSize();
for (int i = 0; i < memberSize; i++) {
XSSimpleType unionMemberType = unionSimpleType.getMember(i);
- if (isURIType(unionMemberType, processedTypes)) {
- return true;
- }
+ attributeKind = getAttributeKind(unionMemberType, processedTypes);
+ if (!isGenericKind(attributeKind)) {
+ return attributeKind;
+ }
}
} else if (simpleType.isRestriction()) {
// do nothing
} else if (simpleType.isList()) {
XSListSimpleType listSimpleType = simpleType.asList();
XSSimpleType listItemType = listSimpleType.getItemType();
- if (isURIType(listItemType, processedTypes)) {
- return true;
- }
- }
+ attributeKind = getAttributeKind(listItemType, processedTypes);
+ if (!isGenericKind(attributeKind)) {
+ return attributeKind;
+ }
+ }
- return false;
+ return attributeKind;
}
public void buildModel() throws Exception {
@@ -149,7 +170,7 @@
if (namespace.equals(attributeNamespace) || attributeNamespace.length() == 0) {
Attribute modelAttribute = new Attribute(attributeDecl.getName());
modelElement.addAttribute(modelAttribute);
- modelAttribute.setUri(isURIType(attributeDecl.getType()));
+ modelAttribute.setKind(getAttributeKind(attributeDecl.getType()));
modelAttribute.setRequired(xsAttributeUse.isRequired());
modelAttribute.setDefaultValue(getDefaultValue(xsAttributeUse));
}
@@ -175,18 +196,4 @@
}
}
}
-
- /**
- * @param args
- * @throws Exception
- */
- public static void main(String[] args) throws Exception {
- Class<?> testxsom = SchemaProcessor.class.getClassLoader().loadClass("TestXSom");
- XSSchemaSet schemaSet = (XSSchemaSet) testxsom.getMethod("parse2").invoke(null);
-
- SchemaProcessor testXSOM2 = new SchemaProcessor(schemaSet, "http://richfaces.org/xhtml-el");
- testXSOM2.buildModel();
- testXSOM2.serializeModel(System.out);
- }
-
}
15 years
JBoss Rich Faces SVN: r16207 - in root: ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-12-23 14:00:19 -0500 (Wed, 23 Dec 2009)
New Revision: 16207
Modified:
root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css
root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
Log:
RF-7868
Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml
===================================================================
--- root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml 2009-12-23 15:39:05 UTC (rev 16206)
+++ root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml 2009-12-23 19:00:19 UTC (rev 16207)
@@ -43,7 +43,7 @@
<h:body>
<h:form id="form1">
- <rich:extendedDataTable frozenColumns="1" var="record" value="#{dataBean.employeeList}" styleClass="extendedDataTable">
+ <rich:extendedDataTable frozenColumns="2" var="record" value="#{dataBean.employeeList}" styleClass="extendedDataTable">
<rich:column id="column_name">
<f:facet name="header">
<h:outputText id="columnHeader1" value="Column Header Facet"/>
@@ -64,6 +64,9 @@
<rich:column id="column_email" width="300px">
<h:outputText value="#{record.EMail}" />
</rich:column>
+ <rich:column id="column_email1" width="300px">
+ <h:outputText value="#{record.EMail}" />
+ </rich:column>
</rich:extendedDataTable>
</h:form>
</h:body>
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2009-12-23 15:39:05 UTC (rev 16206)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2009-12-23 19:00:19 UTC (rev 16207)
@@ -134,6 +134,10 @@
@Override
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
+ writer.startElement(HTML.DIV_ELEM, component);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":d", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-drag", null);
+ writer.endElement(HTML.DIV_ELEM);
writer.startElement(HTML.SCRIPT_ELEM, component);
writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
writer.write("new RichFaces.ExtendedDataTable('" + component.getClientId(context) + "');");
@@ -274,9 +278,7 @@
writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-resizer-holder rich-extable-cell-width-"
+ column.getId(), null);
writer.startElement(HTML.DIV_ELEM, column);
- String width = getColumnWidth(column);
- int left = Integer.parseInt(width.split("px")[0]) - 3;
- writer.writeAttribute(HTML.STYLE_ATTRIBUTE, "left:" + left + "px;", null);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, column.getClientId(context) + ":r", null);
writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-resizer", null);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2009-12-23 15:39:05 UTC (rev 16206)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.css 2009-12-23 19:00:19 UTC (rev 16207)
@@ -62,12 +62,21 @@
.rich-extable-resizer {
background-color: #C4C0C9;
cursor:e-resize;
- font-size:20px;
height:20px; /*TODO*/
position:absolute;
+ left: 100%;
+ margin-left: -3px;
width:6px;
}
+.rich-extable-drag{
+ cursor:e-resize;
+ position:absolute;
+ background-color: #848089;
+ width:1px;
+ display: none;
+}
+
.rich-extable-cell, .rich-extable-header-cell, .rich-extable-footer-cell{
height: 20px;
overflow: hidden;
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2009-12-23 15:39:05 UTC (rev 16206)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2009-12-23 19:00:19 UTC (rev 16207)
@@ -35,21 +35,29 @@
};
richfaces.ExtendedDataTable = function(id) {
+ var WIDTH_CLASS_NAME_BASE = ".rich-extable-cell-width-";
+ var MIN_WIDTH = 20;
+
var element = document.getElementById(id);
var bodyElement = document.getElementById(id + ":b");
var contentElement = bodyElement.firstChild;//TODO Richfaces.firstDescendant;
//TODO var marginElement = contentElement.firstChild;this.marginElement = Richfaces.firstDescendant(this.contentElement);
var dataTableElement = contentElement.lastChild;//TODO this.dataTableElement = Richfaces.lastDescendant(this.contentElement);
var frozenHeaderPartElement = document.getElementById(id + ":frozenHeader");
+ var dragElement = document.getElementById(id + ":d");
var normalPartStyle = richfaces.getCSSRule(".rich-extable-part-width").style;
- var resizerHolderStyle = richfaces.getCSSRule(".rich-extable-resizer-holder").style;
+ var resizerHolders = jQuery(element).children(".rich-extable-header").find(".rich-extable-resizer-holder").get();
var idSuffixs = [":header", ":body", ":footer"];
+ var frozenColumnCount = frozenHeaderPartElement ? frozenHeaderPartElement.firstChild.rows[0].cells.length : 0;//TODO Richfaces.firstDescendant;
+
var rows = document.getElementById(id + idSuffixs[1]).firstChild.rows.length;//TODO Richfaces.firstDescendant;
var scrollElement = document.getElementById(id + idSuffixs[2]);
+ var resizeData = {};
+
var updateLayout = function() {
var offsetWidth = frozenHeaderPartElement ? frozenHeaderPartElement.offsetWidth : 0;
normalPartStyle.width = element.clientWidth - offsetWidth + "px";
@@ -68,23 +76,87 @@
bodyElement.style.height = height + "px";
};
- var initializeLayout = function() {
- //TODO contentElement.style.height = (rowCount * dataTableElement.offsetHeight / rows) + "px";
- updateLayout();
+ var adjustResizers = function() {
+ var scrollLeft = scrollElement.scrollLeft;
+ var clientWidth = element.clientWidth - 3;
+ var i = 0;
+ for (; i < frozenColumnCount; i++) {
+ if (clientWidth > 0) {
+ resizerHolders[i].style.display = "none";
+ resizerHolders[i].style.display = "";
+ clientWidth -= resizerHolders[i].offsetWidth;
+ }
+ if (clientWidth <= 0) {
+ resizerHolders[i].style.display = "none";
+ }
+ }
+ scrollLeft -= 3;
+ for (; i < resizerHolders.length; i++) {
+ if (clientWidth > 0) {
+ resizerHolders[i].style.display = "none";
+ if (scrollLeft > 0) {
+ resizerHolders[i].style.display = "";
+ scrollLeft -= resizerHolders[i].offsetWidth;
+ if (scrollLeft > 0) {
+ resizerHolders[i].style.display = "none";
+ } else {
+ clientWidth += scrollLeft;
+ }
+ } else {
+ resizerHolders[i].style.display = "";
+ clientWidth -= resizerHolders[i].offsetWidth;
+ }
+ }
+ if (clientWidth <= 0) {
+ resizerHolders[i].style.display = "none";
+ }
+ }
};
-
+
var updateScrollPosition = function() {
var scrollLeft = scrollElement.scrollLeft;
for (var i = 0; i < idSuffixs.length; i++) {
document.getElementById(id + idSuffixs[i]).scrollLeft = scrollLeft;//TODO Not use getElementById here
}
- resizerHolderStyle.display = "none";
- resizerHolderStyle.display = "";
+ adjustResizers();
};
+ var initializeLayout = function() {
+ //TODO contentElement.style.height = (rowCount * dataTableElement.offsetHeight / rows) + "px";
+ updateLayout();
+ updateScrollPosition(); //TODO Restore horizontal scroll position
+ };
+
+ var drag = function(event) {
+ dragElement.style.left = Math.max(resizeData.left + MIN_WIDTH, event.clientX);
+ };
+ var beginResize = function(event) {
+ var parts = this.id.split(":");
+ resizeData = {
+ id : parts[parts.length - 2],
+ left : jQuery(this.parentNode).offset().left
+ };
+ dragElement.style.top = jQuery(this).offset().top;
+ dragElement.style.left = event.clientX;
+ dragElement.style.height = element.clientHeight;
+ dragElement.style.display = "block";
+ jQuery(document).bind("mousemove", drag);
+ jQuery(document).one("mouseup", endResize);
+ return false;
+ };
+
+ var endResize = function(event) {
+ jQuery(document).unbind("mousemove", drag);
+ dragElement.style.display = "none";
+ richfaces.getCSSRule(WIDTH_CLASS_NAME_BASE + resizeData.id).style.width = Math.max(MIN_WIDTH, event.clientX - resizeData.left) + "px";
+ updateLayout();
+ adjustResizers();
+ };
+
jQuery(document).ready(initializeLayout);
jQuery(window).bind("resize", updateLayout);
jQuery(scrollElement).bind("scroll", updateScrollPosition);
+ jQuery(element).children(".rich-extable-header").find(".rich-extable-resizer").bind("mousedown", beginResize);
};
}(window.RichFaces, jQuery));
15 years
JBoss Rich Faces SVN: r16206 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-12-23 10:39:05 -0500 (Wed, 23 Dec 2009)
New Revision: 16206
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java
Log:
Fixed compilation failure for the case of no compilation units
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2009-12-23 15:29:11 UTC (rev 16205)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptBuilder.java 2009-12-23 15:39:05 UTC (rev 16206)
@@ -151,15 +151,18 @@
Iterable<? extends JavaFileObject> sourceObjects = getFileManager().getJavaFileObjectsFromFiles(sources);
+ if (sourceObjects != null && sourceObjects.iterator().hasNext()) {
+ CompilationTask task = getJavaCompiler().getTask(null, getFileManager(), listener, getOptions(), null,
+ sourceObjects);
- CompilationTask task = getJavaCompiler().getTask(null, getFileManager(), listener, getOptions(), null,
- sourceObjects);
+ task.setProcessors(Arrays.asList(processors));
+ task.setLocale(locale);
- task.setProcessors(Arrays.asList(processors));
- task.setLocale(locale);
-
- if (!task.call()) {
- throw new AptException("Compilation error: " + messages);
+ if (!task.call()) {
+ throw new AptException("Compilation error: " + messages);
+ }
+ } else {
+ LOG.info("No compilation units found, skipping Java sources processing");
}
}
15 years
JBoss Rich Faces SVN: r16205 - in management/design-4x: queue and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-12-23 10:29:11 -0500 (Wed, 23 Dec 2009)
New Revision: 16205
Added:
management/design-4x/queue/
management/design-4x/queue/queue-settings.dia
Log:
Queue settings diagram committed
Added: management/design-4x/queue/queue-settings.dia
===================================================================
(Binary files differ)
Property changes on: management/design-4x/queue/queue-settings.dia
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years
JBoss Rich Faces SVN: r16204 - in root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces: event and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-12-23 10:02:35 -0500 (Wed, 23 Dec 2009)
New Revision: 16204
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIToggleControl.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleEvent.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java
Log:
use context.attributes instead of requestMap for storing properties during render response phase. Add subTable id to render on invoke application phase
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-12-23 14:58:36 UTC (rev 16203)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-12-23 15:02:35 UTC (rev 16204)
@@ -121,12 +121,6 @@
throw new IllegalArgumentException("subtable is not sortable element");
}
-// @Override
-// public void walk(FacesContext context, DataVisitor visitor, Object argument) {
-// resetDataModel(context);
-// super.walk(context, visitor, argument);
-// }
-
public String getSwichType() {
return (String) getStateHelper().eval(PropertyKeys.switchType, SWITCH_TYPE_SERVER);
}
@@ -210,7 +204,7 @@
if (event instanceof ToggleEvent) {
ToggleEvent toggleEvent = (ToggleEvent) event;
-
+
// not sure that this is right ... need to discuss
SubTableState state = getCurrentComponentState();
if (event.isAppropriateListener(state)) {
@@ -221,6 +215,10 @@
if (expression != null) {
expression.invoke(getFacesContext().getELContext(), new Object[] { toggleEvent });
}
+
+ UIToggleControl toggle = (UIToggleControl)toggleEvent.getSource();
+// toggle.addExecuteId((String)getAttributes().get("clientId"));
+ toggle.addRenderId((String)getAttributes().get("clientId"));
}
}
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIToggleControl.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIToggleControl.java 2009-12-23 14:58:36 UTC (rev 16203)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIToggleControl.java 2009-12-23 15:02:35 UTC (rev 16204)
@@ -56,30 +56,33 @@
public Collection<String> getExecute() {
Collection<String> execute = (Collection<String>)getStateHelper().get(PropertyKeys.execute);
if(execute == null) {
- execute = new LinkedHashSet<String>();
- execute.add("@this");
+ execute = getDefaultIds();
getStateHelper().put(PropertyKeys.execute, execute);
}
return execute;
}
public void addExecuteId(String id){
- ((Collection<String>)getStateHelper().get(PropertyKeys.execute)).add(id);
+ getExecute().add(id);
}
-
-
+
public Collection<String> getRender() {
Collection<String> render = (Collection<String>)getStateHelper().get(PropertyKeys.render);
if(render == null) {
- render = new LinkedHashSet<String>();
- render.add("@this");
+ render = getDefaultIds();
getStateHelper().put(PropertyKeys.render, render);
}
return render;
}
public void addRenderId(String id){
- ((Collection<String>)getStateHelper().get(PropertyKeys.render)).add(id);
+ getRender().add(id);
}
+
+ private Collection<String> getDefaultIds() {
+ Collection<String> ids = new LinkedHashSet<String>();
+ ids.add("@this");
+ return ids;
+ }
}
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleEvent.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleEvent.java 2009-12-23 14:58:36 UTC (rev 16203)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/ToggleEvent.java 2009-12-23 15:02:35 UTC (rev 16204)
@@ -13,9 +13,12 @@
private static final long serialVersionUID = 2916560585918250885L;
private boolean expanded;
+
+ private UIComponent target;
- public ToggleEvent(UIComponent target, boolean expanded) {
- super(target);
+ public ToggleEvent(UIComponent source, UIComponent target, boolean expanded) {
+ super(source);
+ this.target = target;
this.expanded = expanded;
}
@@ -32,4 +35,9 @@
public void processListener(FacesListener listener) {
((ToggleListener) listener).processToggle(this);
}
+
+ @Override
+ public UIComponent getComponent() {
+ return this.target;
+ }
}
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-12-23 14:58:36 UTC (rev 16203)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-12-23 15:02:35 UTC (rev 16204)
@@ -130,10 +130,10 @@
dataTable.setRowKey(context, null);
encodeTableStructure(writer, context, dataTable);
- saveToRequest(context, CELL_ELEMENT_KEY, HTML.TH_ELEM);
+ put(context, CELL_ELEMENT_KEY, HTML.TH_ELEM);
encodeHeaderFacet(writer, context, dataTable);
encodeFooterFacet(writer, context, dataTable);
- saveToRequest(context, CELL_ELEMENT_KEY, HTML.TD_ELEM);
+ put(context, CELL_ELEMENT_KEY, HTML.TD_ELEM);
dataTable.setRowKey(context, key);
dataTable.restoreOrigValue(context);
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java 2009-12-23 14:58:36 UTC (rev 16203)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/DataTableRowsRenderer.java 2009-12-23 15:02:35 UTC (rev 16204)
@@ -106,33 +106,33 @@
protected String getFirstRowClass(FacesContext context) {
- return getFromRequest(context, FIRST_ROW_CLASS_KEY);
+ return get(context, FIRST_ROW_CLASS_KEY);
}
protected String getRowClass(FacesContext context) {
- return getFromRequest(context, ROW_CLASS_KEY);
+ return get(context, ROW_CLASS_KEY);
}
protected String getCellClass(FacesContext context) {
- return getFromRequest(context, CELL_CLASS_KEY);
+ return get(context, CELL_CLASS_KEY);
}
protected String getCellElement(FacesContext context) {
- return getFromRequest(context, CELL_ELEMENT_KEY);
+ return get(context, CELL_ELEMENT_KEY);
}
- private String getFromRequest(FacesContext context, String key) {
- return (String)context.getExternalContext().getRequestMap().get(key);
+ private String get(FacesContext context, String key) {
+ return (String)context.getAttributes().get(key);
}
- protected void saveToRequest(FacesContext context, String key, String value) {
- context.getExternalContext().getRequestMap().put(key, value);
+ protected void put(FacesContext context, String key, String value) {
+ context.getAttributes().put(key, value);
}
protected void saveRowStyles(FacesContext context, String firstRowClass, String rowClass, String cellClass) {
- saveToRequest(context, FIRST_ROW_CLASS_KEY, firstRowClass);
- saveToRequest(context, ROW_CLASS_KEY, rowClass);
- saveToRequest(context, CELL_CLASS_KEY, cellClass);
+ put(context, FIRST_ROW_CLASS_KEY, firstRowClass);
+ put(context, ROW_CLASS_KEY, rowClass);
+ put(context, CELL_CLASS_KEY, cellClass);
}
public void encodeStyleClass(ResponseWriter writer, FacesContext context, UIComponent component,
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2009-12-23 14:58:36 UTC (rev 16203)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2009-12-23 15:02:35 UTC (rev 16204)
@@ -35,7 +35,7 @@
@Override
public void encodeTableStart(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException {
- saveToRequest(context, CELL_ELEMENT_KEY, HTML.TD_ELEM);
+ put(context, CELL_ELEMENT_KEY, HTML.TD_ELEM);
UISubTable subTable = (UISubTable)dataTable;
encodeTableBodyStart(writer, context, subTable);
}
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2009-12-23 14:58:36 UTC (rev 16203)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2009-12-23 15:02:35 UTC (rev 16204)
@@ -65,12 +65,11 @@
boolean prevState = ((Expandable) processed).isExpanded();
if (newState != prevState) {
- new ToggleEvent(processed, newState).queue();
+ new ToggleEvent(toggle, processed, newState).queue();
}
-// toggle.getExecute().add((String)processed.getAttributes().get("clientId"));
-// toggle.getRender().add((String)processed.getAttributes().get("clientId"));
- toggle.addExecuteId((String)processed.getAttributes().get("clientId"));
- toggle.addRenderId((String)processed.getAttributes().get("clientId"));
+
+// toggle.addExecuteId((String)processed.getAttributes().get("clientId"));
+// toggle.addRenderId((String)processed.getAttributes().get("clientId"));
}
}
}
15 years
JBoss Rich Faces SVN: r16203 - root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-12-23 09:58:36 -0500 (Wed, 23 Dec 2009)
New Revision: 16203
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js
Log:
remove temporary for the richfaces component ajax procession
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js 2009-12-23 12:58:38 UTC (rev 16202)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/toggler.js 2009-12-23 14:58:36 UTC (rev 16203)
@@ -121,13 +121,13 @@
},
ajaxToggle: function(expand){
- this.saveState(expand);
- var source = this.id;
- var event = this.options.eventName;
- var params = this.options.ajax;
- params['org.richfaces.ajax.component'] = source;
- jsf.ajax.request(source, event, params);
-
+
+ this.toggle(expand);
+ var source = this.id;
+ var event = this.options.eventName;
+ var params = this.options.ajax;
+
+ jsf.ajax.request(source, event, params);
},
command: function(name, element){
15 years
JBoss Rich Faces SVN: r16202 - branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-12-23 07:58:38 -0500 (Wed, 23 Dec 2009)
New Revision: 16202
Modified:
branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
Log:
ExtendedDataTable duplicate Id exception
https://jira.jboss.org/jira/browse/RF-8223
Modified: branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2009-12-23 12:31:44 UTC (rev 16201)
+++ branches/community/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2009-12-23 12:58:38 UTC (rev 16202)
@@ -594,6 +594,7 @@
if (null == progressBar) {
progressBar = context.getApplication().createComponent(
UIProgressBar.COMPONENT_TYPE);
+ progressBar.setId(fileUpload.getId() + "_rich_progress");
}
fileUpload.getFacets().put("progress", progressBar);
return progressBar;
15 years