JBoss Rich Faces SVN: r21783 - trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-18 14:15:04 -0500 (Fri, 18 Feb 2011)
New Revision: 21783
Modified:
trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
Log:
RF-10570 Duplicate class attribute generated by extendedDataTable when a row is selected
Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2011-02-18 18:08:38 UTC (rev 21782)
+++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2011-02-18 19:15:04 UTC (rev 21783)
@@ -773,9 +773,6 @@
}
String rowClass = getRowClass(rowHolder);
- if (!"".equals(rowClass)) {
- writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, rowClass, null);
- }
StringBuilder builder = new StringBuilder();
Collection<Object> selection = table.getSelection();
@@ -794,8 +791,9 @@
}
builder.append("rf-edt-r-sht");
}
- if (builder.length() > 0) {
- writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, builder.toString(), null);
+ rowClass = concatClasses(builder.toString(), rowClass);
+ if (rowClass.length() > 0) {
+ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, rowClass, null);
}
Iterator<UIComponent> columns = null;
Part part = state.getPart();
15 years, 2 months
JBoss Rich Faces SVN: r21782 - trunk/examples/richfaces-showcase.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2011-02-18 13:08:38 -0500 (Fri, 18 Feb 2011)
New Revision: 21782
Modified:
trunk/examples/richfaces-showcase/readme.txt
Log:
RF-10531 updated readme with encryption information
Modified: trunk/examples/richfaces-showcase/readme.txt
===================================================================
--- trunk/examples/richfaces-showcase/readme.txt 2011-02-18 18:06:24 UTC (rev 21781)
+++ trunk/examples/richfaces-showcase/readme.txt 2011-02-18 18:08:38 UTC (rev 21782)
@@ -1,11 +1,7 @@
-'richfaces-showcase' is an application intended to show RichFaces components in action. It contains set of small use-cases implemented using RichFaces components.
-Except basic samples - use-cases for demo choosen from most popular questions at user forums - so you will be able to find much useful information there and will be able
-just to re-use some code to implement the same cases for your applications.
+RichFaces showcase is an application intended to show RichFaces components in action. It contains set of small use-cases implemented using RichFaces components. These use-cases for the demo are chosen from most popular questions on the user forums. You will be able to find a lot of useful information and will be able to re-use some of it to implement the same cases for your applications.
-
1 Building and Running the application
-
1.1. Requirements
- Maven 2.1.0 or later
@@ -16,7 +12,6 @@
- Eclipse IDE + JBoss Tools (to explore and run the application in IDE).
- You're free to use any other IDE also but we haven't tested an application in other environments.
-
1.3 Build/Deploy
1.3.1) Tomcat
@@ -37,22 +32,28 @@
2) Publishing to Google Application Engine
-In M2 we completed resource plugin which generates static resources and that allow us to create Google App Engine compatible application using RichFaces.
+We have completed a resource plugin which generates static resources which allow us to create Google App Engine compatible applications using RichFaces. This means deploying to and working with GAE is a piece of cake. Here is how you can deploy your own RichFaces showcase example.
+
+--) Update the GAE application name, and register it with google. Do this by updating the /webapp-gae/WEB-INF/appengine-web.xml following the GAE standard documentation.
+
+--) Only if using MyFaces: Configure the MyFaces encryption secret values in the /webapp-gae/WEB-INF/web.xml. Replace the "-- Insert some secret here --" with a base64 encoded password. This is important because otherwise MyFaces will generate random keys, and this causes issues in a cluster environment like GAE.
+
+See below for more information:
+ MyFaces - http://wiki.apache.org/myfaces/Secure_Your_Application
+ Mojarra - http://wikis.sun.com/display/GlassFish/JavaServerFacesRI#JavaServerFacesR...
+
+--) Build using:
+
+mvn clean package -Pgae -Denforcer.skip=true
+
+note: The enforcer.skip property is only needed if building from SNAPSHOT sources
-just execute
- * mvn clean package -Pgae -Denforcer.skip=true
-(enforcer skipped as resource plugin using snapshot plugin, and required only if you using snapshots sources)
+--) Use GAE SDK and the appcfg script just as you would for any other GAE application.
-And now you're ready to publish the application to GAE. just use appcfg as for any other one like described at google documentation. Do not forget to register your
-own application name and rename the demo application accordingly.
-
-more details about the resource plugin(it could be highly usefull not only in case of GAE usage but for general cases like serving resources at separate content systems) -
-will be published at our wiki and announced at RichFaces usage space.
-
-There are some additional changes were made in order to make richfaces-showcase GAE compatible:
+There are some additional changes that were made in order to make richfaces-showcase GAE compatible:
* WebConfiguration class from com.sun.faces were patched removing code which is not compatible with GAE
- * web.xml with additional properties for GAE created and placed at src\main\webapp-gae\WEB-INF\ (it replaces common one durinf build with GAE profile)
- * check pom.xml GAE profile section in order to check additional dependencies for that configuration.
+ * web.xml with additional properties for GAE created and placed at src\main\webapp-gae\WEB-INF\ (it replaces common one during build with GAE profile)
+ * check pom.xml GAE profile section in order to check additional dependencies for that configuration.
3) Working with the project in Eclipse IDE:
In order to explore, run and deploy the application in Eclipse IDE you can use one of the following options:
15 years, 2 months
JBoss Rich Faces SVN: r21781 - in trunk/archetypes/rf-gae-sample: src/main/resources/archetype-resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2011-02-18 13:06:24 -0500 (Fri, 18 Feb 2011)
New Revision: 21781
Modified:
trunk/archetypes/rf-gae-sample/readme.txt
trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt
Log:
RF-10531 updated readme with encryption information
Modified: trunk/archetypes/rf-gae-sample/readme.txt
===================================================================
--- trunk/archetypes/rf-gae-sample/readme.txt 2011-02-18 18:00:36 UTC (rev 21780)
+++ trunk/archetypes/rf-gae-sample/readme.txt 2011-02-18 18:06:24 UTC (rev 21781)
@@ -1,4 +1,4 @@
-RichFaces 4 Archetype
+RichFaces 4 Google Application Engine Archetype
GENERATING THE PROJECT
@@ -23,15 +23,20 @@
4) Once uploaded, visit your application using http://<application-name>.appspot.com
4.1) check all the information about deployed application at https://appengine.google.com/dashboard?&app_id=<your-application-id>
-NOTE:
-During build the "org.richfaces.cdk:maven-resource-plugin" executed and generated static resources(web-app\static-resources\) for all skins in order to
+NOTEs:
+--)During build the "org.richfaces.cdk:maven-resource-plugin" executed and generated static resources(web-app\static-resources\) for all skins in order to
solve the compatibility problem with GAE and java2D API.
-NOTE: about additional artifacts in webapp folder:
-1) java-gae-jsf-ri - contains modified WebConfiguration.java class which will be put to Web-inf\classes when building with GAE profile. It solves compatibilities
+--) We have configured the MyFaces encryption secret values in the /webapp-gae/WEB-INF/web.xml. We have used "RichFacesTmpKey" as the base64 encoded SECRET values. It is wise to change the base encryption for any type of public application whether using MyFaces or Mojarra.
+
+See below for more information:
+ MyFaces - http://wiki.apache.org/myfaces/Secure_Your_Application
+ Mojarra - http://wikis.sun.com/display/GlassFish/JavaServerFacesRI#JavaServerFacesR...
+
+--) java-gae-jsf-ri - contains modified WebConfiguration.java class which will be put to Web-inf\classes when building with GAE profile. It solves compatibilities
issues exist in GAE for JSF applications.
-2) Webapp-gae folder contains GAE descriptor(appengine-web.xml) and modified application web.xml. They will be placed in the WEB-INF folder. The web.xml
+--) Webapp-gae folder contains GAE descriptor(appengine-web.xml) and modified application web.xml. They will be placed in the WEB-INF folder. The web.xml
is different in order to use static resources generated by plugin instead of dynamic resources. And also restricts threading with
com.sun.faces.enableThreading context parameter as GAE not allows threads.
Modified: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt
===================================================================
--- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt 2011-02-18 18:00:36 UTC (rev 21780)
+++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt 2011-02-18 18:06:24 UTC (rev 21781)
@@ -1,6 +1,15 @@
-RichFaces 4 Archetype
+RichFaces 4 Google Application Engine Archetype
-1) Build by running:
+GENERATING THE PROJECT
+
+This archetype creates a simple RichFaces 4 application with all the settings and custom artifacts you need to perform deploy to GAE cloud.
+
+1) To generate a project from the archetype, run
+
+ mvn archetype:generate -DarchetypeGroupId=org.richfaces.archetypes -DarchetypeArtifactId=richfaces-archetype-gae -DarchetypeVersion=<richfaces-version>
+ -DgroupId=<yourGroupId> -DartifactId=<yourArtifactId> -Dversion=1.0-SNAPSHOT
+
+2) Navigate into the new project directory and build by running:
mvn clean install
*BEFORE NEXT STEP:
@@ -9,20 +18,25 @@
-- Download and install the GAE SDK for deployment and local server tools
3) Execute appcfg from GAE SDK to publish to your account:
- appcfg update <PATH: "generated-application-target-folder/output application folder">
+ appcfg update <PATH: "generated-application-target-folder/output application folder">
4) Once uploaded, visit your application using http://<application-name>.appspot.com
4.1) check all the information about deployed application at https://appengine.google.com/dashboard?&app_id=<your-application-id>
-NOTE:
-During build the "org.richfaces.cdk:maven-resource-plugin" executed and generated static resources(web-app\static-resources\) for all skins in order to
+NOTEs:
+--)During build the "org.richfaces.cdk:maven-resource-plugin" executed and generated static resources(web-app\static-resources\) for all skins in order to
solve the compatibility problem with GAE and java2D API.
-NOTE: about additional artifacts in webapp folder:
-1) java-gae-jsf-ri - contains modified WebConfiguration.java class which will be put to Web-inf\classes when building with GAE profile. It solves compatibilities
+--) We have configured the MyFaces encryption secret values in the /webapp-gae/WEB-INF/web.xml. We have used "RichFacesTmpKey" as the base64 encoded SECRET values. It is wise to change the base encryption for any type of public application whether using MyFaces or Mojarra.
+
+See below for more information:
+ MyFaces - http://wiki.apache.org/myfaces/Secure_Your_Application
+ Mojarra - http://wikis.sun.com/display/GlassFish/JavaServerFacesRI#JavaServerFacesR...
+
+--) java-gae-jsf-ri - contains modified WebConfiguration.java class which will be put to Web-inf\classes when building with GAE profile. It solves compatibilities
issues exist in GAE for JSF applications.
-2) Webapp-gae folder contains GAE descriptor(appengine-web.xml) and modified application web.xml. They will be placed in the WEB-INF folder. The web.xml
+--) Webapp-gae folder contains GAE descriptor(appengine-web.xml) and modified application web.xml. They will be placed in the WEB-INF folder. The web.xml
is different in order to use static resources generated by plugin instead of dynamic resources. And also restricts threading with
com.sun.faces.enableThreading context parameter as GAE not allows threads.
15 years, 2 months
JBoss Rich Faces SVN: r21780 - in trunk/ui: core/ui/src/main/resources/META-INF and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-18 13:00:36 -0500 (Fri, 18 Feb 2011)
New Revision: 21780
Added:
trunk/ui/common/ui/src/main/resources/META-INF/faces-config.xml
Modified:
trunk/ui/core/ui/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml
Log:
https://issues.jboss.org/browse/RF-10543
Added: trunk/ui/common/ui/src/main/resources/META-INF/faces-config.xml
===================================================================
--- trunk/ui/common/ui/src/main/resources/META-INF/faces-config.xml (rev 0)
+++ trunk/ui/common/ui/src/main/resources/META-INF/faces-config.xml 2011-02-18 18:00:36 UTC (rev 21780)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- This file is for the only purpose of defining name that will be used in the assembled file -->
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+ version="2.0">
+
+ <name>richfaces_ui</name>
+
+</faces-config>
\ No newline at end of file
Modified: trunk/ui/core/ui/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml
===================================================================
--- trunk/ui/core/ui/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml 2011-02-18 18:00:24 UTC (rev 21779)
+++ trunk/ui/core/ui/src/main/resources/META-INF/behaviors-handler-delegate.faces-config.xml 2011-02-18 18:00:36 UTC (rev 21780)
@@ -3,14 +3,6 @@
<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
version="2.0">
- <name>richfaces</name>
-
- <ordering>
- <before>
- <others />
- </before>
- </ordering>
-
<factory>
<tag-handler-delegate-factory>org.richfaces.view.facelets.html.BehaviorsTagHandlerDelegateFactoryImpl</tag-handler-delegate-factory>
</factory>
15 years, 2 months
JBoss Rich Faces SVN: r21779 - in trunk: ui/input/ui/src/main/resources/META-INF/resources/org.richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2011-02-18 13:00:24 -0500 (Fri, 18 Feb 2011)
New Revision: 21779
Modified:
trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js
Log:
https://jira.jboss.org/browse/RF-10536
Modified: trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml
===================================================================
--- trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml 2011-02-18 17:58:06 UTC (rev 21778)
+++ trunk/examples/input-demo/src/main/webapp/examples/calendar.xhtml 2011-02-18 18:00:24 UTC (rev 21779)
@@ -73,11 +73,12 @@
styleClass="hello"
boundaryDatesMode = "scroll"
defaultLabel = "bla-bla-bla"
- enableManualInput="false"
+ enableManualInput="true"
showApplyButton="#{calendarBean.showApply}"
>
-
+ <f:ajax event="change" render="output" />
</calendar:calendar>
+ <h:outputText id="output" value="#{calendarBean.selectedDate}"/>
<h:outputText id="echo-text" value="#{calendarBean.selectedDate}" />
</h:panelGroup>
<h:panelGrid columns="2">
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2011-02-18 17:58:06 UTC (rev 21778)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2011-02-18 18:00:24 UTC (rev 21779)
@@ -988,7 +988,7 @@
if (field.value!=dateStr)
{
field.value=dateStr;
- this.invokeEvent("change",field, event, this.selectedDate);
+ this.invokeEvent("change", rf.$(this.id), event, this.selectedDate);
}
},
15 years, 2 months
JBoss Rich Faces SVN: r21778 - trunk/examples/iteration-demo/src/main/webapp/resources/images.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-18 12:58:06 -0500 (Fri, 18 Feb 2011)
New Revision: 21778
Added:
trunk/examples/iteration-demo/src/main/webapp/resources/images/minus.gif
trunk/examples/iteration-demo/src/main/webapp/resources/images/plus.gif
Removed:
trunk/examples/iteration-demo/src/main/webapp/resources/images/+.gif
trunk/examples/iteration-demo/src/main/webapp/resources/images/-.gif
Log:
Renamed iteration-demo files
Deleted: trunk/examples/iteration-demo/src/main/webapp/resources/images/+.gif
===================================================================
(Binary files differ)
Deleted: trunk/examples/iteration-demo/src/main/webapp/resources/images/-.gif
===================================================================
(Binary files differ)
Copied: trunk/examples/iteration-demo/src/main/webapp/resources/images/minus.gif (from rev 21750, trunk/examples/iteration-demo/src/main/webapp/resources/images/-.gif)
===================================================================
(Binary files differ)
Copied: trunk/examples/iteration-demo/src/main/webapp/resources/images/plus.gif (from rev 21750, trunk/examples/iteration-demo/src/main/webapp/resources/images/+.gif)
===================================================================
(Binary files differ)
15 years, 2 months
JBoss Rich Faces SVN: r21777 - modules/build/resources/trunk/faces-shade-transformers/src/main/java/org/richfaces/build/shade/resource.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-18 12:54:10 -0500 (Fri, 18 Feb 2011)
New Revision: 21777
Modified:
modules/build/resources/trunk/faces-shade-transformers/src/main/java/org/richfaces/build/shade/resource/BaseFacesResourceTransformer.java
modules/build/resources/trunk/faces-shade-transformers/src/main/java/org/richfaces/build/shade/resource/FacesConfigXmlResourceTransformer.java
Log:
https://issues.jboss.org/browse/RF-10559
Modified: modules/build/resources/trunk/faces-shade-transformers/src/main/java/org/richfaces/build/shade/resource/BaseFacesResourceTransformer.java
===================================================================
--- modules/build/resources/trunk/faces-shade-transformers/src/main/java/org/richfaces/build/shade/resource/BaseFacesResourceTransformer.java 2011-02-18 17:48:57 UTC (rev 21776)
+++ modules/build/resources/trunk/faces-shade-transformers/src/main/java/org/richfaces/build/shade/resource/BaseFacesResourceTransformer.java 2011-02-18 17:54:10 UTC (rev 21777)
@@ -92,8 +92,6 @@
if (!Namespace.NO_NAMESPACE.equals(attribute.getNamespace())) {
attribute.setNamespace(namespacesFactory.getNamespace(attribute.getNamespace()));
- } else {
- attribute.setNamespace(element.getNamespace());
}
}
Modified: modules/build/resources/trunk/faces-shade-transformers/src/main/java/org/richfaces/build/shade/resource/FacesConfigXmlResourceTransformer.java
===================================================================
--- modules/build/resources/trunk/faces-shade-transformers/src/main/java/org/richfaces/build/shade/resource/FacesConfigXmlResourceTransformer.java 2011-02-18 17:48:57 UTC (rev 21776)
+++ modules/build/resources/trunk/faces-shade-transformers/src/main/java/org/richfaces/build/shade/resource/FacesConfigXmlResourceTransformer.java 2011-02-18 17:54:10 UTC (rev 21777)
@@ -82,12 +82,13 @@
private static final String CURRENT_VERSION = "2.0";
private static final String VERSION = "version";
private static final String FACES_CONFIG_FILE_NAME = "faces-config.xml";
+ private static final String DOT_FACES_CONFIG_FILE_NAME = ".faces-config.xml";
private static final Set<String> AGGREGATOR_ELEMENTS_NAME_SET = new HashSet<String>(Arrays.asList(APPLICATION,
FACTORY, LIFECYCLE));
private static final Set<String> UNHANDLED_ELEMENTS_NAME_SET = new HashSet<String>(Arrays.asList(ORDERING,
- ABSOLUTE_ORDERING, NAME));
+ ABSOLUTE_ORDERING));
private static final String RENDER_KIT_ID_EXPRESSION = MessageFormat.format("./{0}:{1}|./{1}", JAVAEE_PREFIX,
RENDER_KIT_ID);
@@ -104,6 +105,8 @@
private List<Element> simpleElements = new ArrayList<Element>();
+ private String configName = null;
+
private boolean hasProcessedConfigFiles;
private ThreeState metadataComplete = ThreeState.UNDEFINED;
@@ -173,7 +176,19 @@
continue;
}
- if (AGGREGATOR_ELEMENTS_NAME_SET.contains(name)) {
+ if (NAME.equals(name)) {
+ String childConfigName = child.getTextTrim();
+
+ if (childConfigName.length() != 0) {
+ if (configName != null && !configName.equals(childConfigName)) {
+ throw new IllegalArgumentException(MessageFormat.format("Conflicting <name> elements detected in faces-config.xml files: ''{0}'' & ''{1}''", configName, childConfigName));
+ }
+
+ if (configName == null) {
+ configName = childConfigName;
+ }
+ }
+ } else if (AGGREGATOR_ELEMENTS_NAME_SET.contains(name)) {
List<Element> elementsList = aggregatorElements.get(name);
if (elementsList == null) {
elementsList = new ArrayList<Element>();
@@ -209,7 +224,7 @@
return false;
}
- return name.equals(FACES_CONFIG_FILE_NAME);
+ return name.equals(FACES_CONFIG_FILE_NAME) || name.endsWith(DOT_FACES_CONFIG_FILE_NAME);
}
public boolean hasTransformedResource() {
@@ -237,6 +252,13 @@
document.addContent(rootElement);
List<Element> rootElementChildren = new ArrayList<Element>();
+
+ if (configName != null) {
+ Element nameElement = new Element(NAME, javaEENamespace);
+ nameElement.setText(configName);
+ rootElementChildren.add(nameElement);
+ }
+
rootElementChildren.addAll(simpleElements);
for (Map.Entry<String, List<Element>> entry: aggregatorElements.entrySet()) {
15 years, 2 months
JBoss Rich Faces SVN: r21776 - in trunk/ui/common/ui/src/main/resources/META-INF: richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-18 12:48:57 -0500 (Fri, 18 Feb 2011)
New Revision: 21776
Modified:
trunk/ui/common/ui/src/main/resources/META-INF/resources/org.richfaces/icons.ecss
trunk/ui/common/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
Log:
RF-10145 Update core & component images
Modified: trunk/ui/common/ui/src/main/resources/META-INF/resources/org.richfaces/icons.ecss
===================================================================
--- trunk/ui/common/ui/src/main/resources/META-INF/resources/org.richfaces/icons.ecss 2011-02-18 17:21:34 UTC (rev 21775)
+++ trunk/ui/common/ui/src/main/resources/META-INF/resources/org.richfaces/icons.ecss 2011-02-18 17:48:57 UTC (rev 21776)
@@ -15,82 +15,82 @@
}
.rf-ico-chevron-hdr {
- background-image: "url(#{resource['org.richfaces.images:Chevron.png']})"
+ background-image: "url(#{resource['org.richfaces.images:chevron.png']})"
}
.rf-ico-chevron, .rf-ico-chevron-dis, .rf-ico-chevron-hdr-dis {
- background-image: "url(#{resource['org.richfaces.images:ChevronDisabled.png']})"
+ background-image: "url(#{resource['org.richfaces.images:chevronDisabled.png']})"
}
.rf-ico-chevron-down-hdr {
- background-image: "url(#{resource['org.richfaces.images:ChevronDown.png']})"
+ background-image: "url(#{resource['org.richfaces.images:chevronDown.png']})"
}
.rf-ico-chevron-down, .rf-ico-chevron-down-dis, .rf-ico-chevron-down-hdr-dis {
- background-image: "url(#{resource['org.richfaces.images:ChevronDownDisabled.png']})"
+ background-image: "url(#{resource['org.richfaces.images:chevronDownDisabled.png']})"
}
.rf-ico-chevron-left-hdr {
- background-image: "url(#{resource['org.richfaces.images:ChevronLeft.png']})"
+ background-image: "url(#{resource['org.richfaces.images:chevronLeft.png']})"
}
.rf-ico-chevron-left, .rf-ico-chevron-left-dis, .rf-ico-chevron-left-hdr-dis {
- background-image: "url(#{resource['org.richfaces.images:ChevronLeftDisabled.png']})"
+ background-image: "url(#{resource['org.richfaces.images:chevronLeftDisabled.png']})"
}
.rf-ico-chevron-up-hdr {
- background-image: "url(#{resource['org.richfaces.images:ChevronUp.png']})"
+ background-image: "url(#{resource['org.richfaces.images:chevronUp.png']})"
}
.rf-ico-chevron-up, .rf-ico-chevron-up-dis, .rf-ico-chevron-up-hdr-dis {
- background-image: "url(#{resource['org.richfaces.images:ChevronUpDisabled.png']})"
+ background-image: "url(#{resource['org.richfaces.images:chevronUpDisabled.png']})"
}
.rf-ico-disc-hdr {
- background-image: "url(#{resource['org.richfaces.images:Disc.png']})"
+ background-image: "url(#{resource['org.richfaces.images:disc.png']})"
}
.rf-ico-disc, .rf-ico-disc-dis, .rf-ico-disc-hdr-dis {
- background-image: "url(#{resource['org.richfaces.images:DiscDisabled.png']})"
+ background-image: "url(#{resource['org.richfaces.images:discDisabled.png']})"
}
.rf-ico-grid-hdr {
- background-image: "url(#{resource['org.richfaces.images:Grid.png']})"
+ background-image: "url(#{resource['org.richfaces.images:grid.png']})"
}
.rf-ico-grid, .rf-ico-grid-dis, .rf-ico-grid-hdr-dis {
- background-image: "url(#{resource['org.richfaces.images:GridDisabled.png']})"
+ background-image: "url(#{resource['org.richfaces.images:gridDisabled.png']})"
}
.rf-ico-triangle-hdr {
- background-image: "url(#{resource['org.richfaces.images:Triangle.png']})"
+ background-image: "url(#{resource['org.richfaces.images:triangle.png']})"
}
.rf-ico-triangle, .rf-ico-triangle-dis, .rf-ico-triangle-hdr-dis {
- background-image: "url(#{resource['org.richfaces.images:TriangleDisabled.png']})"
+ background-image: "url(#{resource['org.richfaces.images:triangleDisabled.png']})"
}
.rf-ico-triangle-down-hdr {
- background-image: "url(#{resource['org.richfaces.images:TriangleDown.png']})"
+ background-image: "url(#{resource['org.richfaces.images:triangleDown.png']})"
}
.rf-ico-triangle-down, .rf-ico-triangle-down-dis, .rf-ico-triangle-down-hdr-dis {
- background-image: "url(#{resource['org.richfaces.images:TriangleDownDisabled.png']})"
+ background-image: "url(#{resource['org.richfaces.images:triangleDownDisabled.png']})"
}
.rf-ico-triangle-left-hdr {
- background-image: "url(#{resource['org.richfaces.images:TriangleLeft.png']})"
+ background-image: "url(#{resource['org.richfaces.images:triangleLeft.png']})"
}
.rf-ico-triangle-left, .rf-ico-triangle-left-dis, .rf-ico-triangle-left-hdr-dis {
- background-image: "url(#{resource['org.richfaces.images:TriangleLeftDisabled.png']})"
+ background-image: "url(#{resource['org.richfaces.images:triangleLeftDisabled.png']})"
}
.rf-ico-triangle-up-hdr {
- background-image: "url(#{resource['org.richfaces.images:TriangleUp.png']})"
+ background-image: "url(#{resource['org.richfaces.images:triangleUp.png']})"
}
.rf-ico-triangle-up, .rf-ico-triangle-up-dis, .rf-ico-triangle-up-hdr-dis {
- background-image: "url(#{resource['org.richfaces.images:TriangleUpDisabled.png']})"
+ background-image: "url(#{resource['org.richfaces.images:triangleUpDisabled.png']})"
}
Modified: trunk/ui/common/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
===================================================================
--- trunk/ui/common/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-18 17:21:34 UTC (rev 21775)
+++ trunk/ui/common/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2011-02-18 17:48:57 UTC (rev 21776)
@@ -1,29 +1,29 @@
-org.richfaces.images\:Chevron.png=org.richfaces.renderkit.html.iconimages.PanelIconChevron
-org.richfaces.images\:ChevronDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconChevron{disabled=true}
+org.richfaces.images\:chevron.png=org.richfaces.renderkit.html.iconimages.PanelIconChevron
+org.richfaces.images\:chevronDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconChevron{disabled=true}
-org.richfaces.images\:ChevronDown.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronDown
-org.richfaces.images\:ChevronDownDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronDown{disabled=true}
+org.richfaces.images\:chevronDown.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronDown
+org.richfaces.images\:chevronDownDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronDown{disabled=true}
-org.richfaces.images\:ChevronLeft.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronLeft
-org.richfaces.images\:ChevronLeftDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronLeft{disabled=true}
+org.richfaces.images\:chevronLeft.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronLeft
+org.richfaces.images\:chevronLeftDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronLeft{disabled=true}
-org.richfaces.images\:ChevronUp.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronUp
-org.richfaces.images\:ChevronUpDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronUp{disabled=true}
+org.richfaces.images\:chevronUp.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronUp
+org.richfaces.images\:chevronUpDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconChevronUp{disabled=true}
-org.richfaces.images\:Disc.png=org.richfaces.renderkit.html.iconimages.PanelIconDisc
-org.richfaces.images\:DiscDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconDisc{disabled=true}
+org.richfaces.images\:disc.png=org.richfaces.renderkit.html.iconimages.PanelIconDisc
+org.richfaces.images\:discDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconDisc{disabled=true}
-org.richfaces.images\:Grid.png=org.richfaces.renderkit.html.iconimages.PanelIconGrid
-org.richfaces.images\:GridDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconGrid{disabled=true}
+org.richfaces.images\:grid.png=org.richfaces.renderkit.html.iconimages.PanelIconGrid
+org.richfaces.images\:gridDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconGrid{disabled=true}
-org.richfaces.images\:Triangle.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangle
-org.richfaces.images\:TriangleDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangle{disabled=true}
+org.richfaces.images\:triangle.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangle
+org.richfaces.images\:triangleDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangle{disabled=true}
-org.richfaces.images\:TriangleDown.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleDown
-org.richfaces.images\:TriangleDownDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleDown{disabled=true}
+org.richfaces.images\:triangleDown.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleDown
+org.richfaces.images\:triangleDownDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleDown{disabled=true}
-org.richfaces.images\:TriangleLeft.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleLeft
-org.richfaces.images\:TriangleLeftDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleLeft{disabled=true}
+org.richfaces.images\:triangleLeft.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleLeft
+org.richfaces.images\:triangleLeftDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleLeft{disabled=true}
-org.richfaces.images\:TriangleUp.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleUp
-org.richfaces.images\:TriangleUpDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleUp{disabled=true}
\ No newline at end of file
+org.richfaces.images\:triangleUp.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleUp
+org.richfaces.images\:triangleUpDisabled.png=org.richfaces.renderkit.html.iconimages.PanelIconTriangleUp{disabled=true}
\ No newline at end of file
15 years, 2 months
JBoss Rich Faces SVN: r21775 - trunk/ui/output/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-18 12:21:34 -0500 (Fri, 18 Feb 2011)
New Revision: 21775
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java
Log:
RF-10533 Panels: hide common ajax attributes
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 2011-02-18 16:58:26 UTC (rev 21774)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractCollapsiblePanel.java 2011-02-18 17:21:34 UTC (rev 21775)
@@ -138,12 +138,6 @@
@Attribute
public abstract String getHeaderClass();
- @Attribute(hidden = true)
- public abstract String getOncomplete();
-
- @Attribute(hidden = true)
- public abstract String getOnbeforedomupdate();
-
@Attribute(events = @EventName("switch"))
public abstract String getOnswitch();
15 years, 2 months
JBoss Rich Faces SVN: r21774 - trunk/ui/output/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-02-18 11:58:26 -0500 (Fri, 18 Feb 2011)
New Revision: 21774
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java
Log:
RF-10054 Panels: attributes bypassUpdates and immediate ignored
- NPE checking was added.
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-02-18 16:51:30 UTC (rev 21773)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-02-18 16:58:26 UTC (rev 21774)
@@ -96,15 +96,18 @@
if (previous == null || !previous.equalsIgnoreCase(activeItem)) {
AbstractPanelMenuItem prevItm = null;
+ AbstractPanelMenuItem actItm = null;
if (previous != null) {
prevItm = getItem(previous);
}
- AbstractPanelMenuItem actItm = getItem(activeItem);
+ if (activeItem != null) {
+ actItm = getItem(activeItem);
+ }
ItemChangeEvent event = new ItemChangeEvent(this, previous,prevItm, activeItem, actItm);
if (isImmediate() || (actItm != null && actItm.isImmediate())) {
event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
- } else if (actItm.isBypassUpdates()) {
+ } else if (actItm!= null && actItm.isBypassUpdates()) {
event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
} else {
event.setPhaseId(PhaseId.INVOKE_APPLICATION);
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-18 16:51:30 UTC (rev 21773)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-18 16:58:26 UTC (rev 21774)
@@ -388,11 +388,15 @@
setSubmittedActiveItem(null);
if (previous == null || !previous.equalsIgnoreCase(activeItem)) {
UIComponent prevComp = null;
- UIComponent actvComp = (UIComponent)getItem(activeItem);
+ UIComponent actvComp = null;
if (previous != null) {
prevComp = (UIComponent)getItem(previous);
}
+ if (activeItem != null) {
+ actvComp = (UIComponent)getItem(activeItem);
+ }
+
new ItemChangeEvent(this, previous, prevComp, activeItem, actvComp).queue();
}
}
15 years, 2 months