JBoss Rich Faces SVN: r20799 - tags.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-12-26 12:19:44 -0500 (Sun, 26 Dec 2010)
New Revision: 20799
Added:
tags/4.0.0.20101226-M5/
Log:
[maven-scm] copy for tag 4.0.0.20101226-M5
Copied: tags/4.0.0.20101226-M5 (from rev 20798, branches/4.0.0.M5)
13 years, 4 months
JBoss Rich Faces SVN: r20797 - branches/4.0.0.M5/examples/richfaces-showcase.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-12-26 11:55:59 -0500 (Sun, 26 Dec 2010)
New Revision: 20797
Modified:
branches/4.0.0.M5/examples/richfaces-showcase/pom.xml
Log:
Removed validation-api from showcase pom.xml
Modified: branches/4.0.0.M5/examples/richfaces-showcase/pom.xml
===================================================================
--- branches/4.0.0.M5/examples/richfaces-showcase/pom.xml 2010-12-24 20:10:20 UTC (rev 20796)
+++ branches/4.0.0.M5/examples/richfaces-showcase/pom.xml 2010-12-26 16:55:59 UTC (rev 20797)
@@ -36,10 +36,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<scope>provided</scope>
13 years, 4 months
JBoss Rich Faces SVN: r20796 - in trunk/ui/input/ui/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-12-24 15:10:20 -0500 (Fri, 24 Dec 2010)
New Revision: 20796
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js
trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml
Log:
RF-4464
Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js
===================================================================
--- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js 2010-12-24 19:12:09 UTC (rev 20795)
+++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js 2010-12-24 20:10:20 UTC (rev 20796)
@@ -44,13 +44,16 @@
this.element = jQuery(this.attachToDom());
this.input = this.element.children(".rf-insl-inp-cntr").children(".rf-insl-inp");
this.track = this.element.children(".rf-insl-trc-cntr").children(".rf-insl-trc");
- this.handle = this.track.children(".rf-insl-hnd, .rf-insl-hnd-dis");
+ var handleContainer = this.track.children("span");
+ this.handle = handleContainer.children(".rf-insl-hnd, .rf-insl-hnd-dis");
this.tooltip = this.element.children(".rf-insl-tt");
var value = Number(this.input.val());
if (isNaN(value)) {
value = this.minValue;
}
+ handleContainer.css("display", "block");
+ this.track.css("padding-right", this.handle.width() + "px");
this.__setValue(value, null, true);
if (!this.disabled) {
@@ -95,8 +98,8 @@
}
if (value != this.value) {
this.input.val(value);
- var left = (value - this.minValue) * (this.track.width() - this.handle.width()) / this.range;
- this.handle.css("margin-left", left + "px");
+ var left = 100 * (value - this.minValue) / this.range;
+ this.handle.css("margin-left", left + "%");
this.tooltip.text(value);
this.tooltip.setPosition(this.handle,{from: 'LT', offset: [0, 5]}); //TODO Seems offset doesn't work now.
this.value = value;
@@ -168,7 +171,7 @@
},
__mousemoveHandler: function (event) {
- var value = this.range * (event.pageX - this.track.position().left) / (this.track.width()
+ var value = this.range * (event.pageX - this.track.position().left - this.handle.width() / 2) / (this.track.width()
- this.handle.width()) + this.minValue;
value = Math.round(value / this.step) * this.step; //TODO Add normal support of float values. E.g. '0.3' should be instead of '0.30000000000000004'.
this.__setValue(value, event);
Modified: trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml 2010-12-24 19:12:09 UTC (rev 20795)
+++ trunk/ui/input/ui/src/main/templates/inputnumberslider.template.xml 2010-12-24 20:10:20 UTC (rev 20796)
@@ -53,7 +53,9 @@
<span class="rf-insl-mx">#{component.attributes['maxValue']}</span>
</c:if>
<span class="rf-insl-trc #{component.attributes['trackClass']}">
- <span class="rf-insl-hnd#{component.attributes['disabled'] ? '-dis' : ''} #{component.attributes['handleClass']}" />
+ <span>
+ <span class="rf-insl-hnd#{component.attributes['disabled'] ? '-dis' : ''} #{component.attributes['handleClass']}" />
+ </span>
</span>
</span>
<c:if test="#{component.attributes['showArrows']}">
13 years, 4 months
JBoss Rich Faces SVN: r20795 - trunk/ui/iteration/ui/src/main/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-12-24 14:12:09 -0500 (Fri, 24 Dec 2010)
New Revision: 20795
Modified:
trunk/ui/iteration/ui/src/main/java/org/richfaces/model/DeclarativeTreeDataModelImpl.java
Log:
Small performance optimization in declarative tree model impl.
Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/model/DeclarativeTreeDataModelImpl.java
===================================================================
--- trunk/ui/iteration/ui/src/main/java/org/richfaces/model/DeclarativeTreeDataModelImpl.java 2010-12-24 18:15:26 UTC (rev 20794)
+++ trunk/ui/iteration/ui/src/main/java/org/richfaces/model/DeclarativeTreeDataModelImpl.java 2010-12-24 19:12:09 UTC (rev 20795)
@@ -34,6 +34,7 @@
import org.richfaces.convert.DeclarativeModelSequenceKeyConverter;
import org.richfaces.model.iterators.DeclarativeTreeDataModelCompositeTuplesIterator;
+import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
@@ -45,6 +46,8 @@
private static final Converter DEFAULT_CONVERTER = new DeclarativeModelSequenceKeyConverter();
+ private static final Predicate<Object> TREE_MODEL_ADAPTOR_INSTANCE_PREDICATE = Predicates.instanceOf(TreeModelAdaptor.class);
+
private AbstractTree tree;
private UIComponent currentComponent;
@@ -68,7 +71,7 @@
return true;
}
- return !Iterables.any(currentComponent.getChildren(), Predicates.instanceOf(TreeModelAdaptor.class));
+ return !Iterables.any(currentComponent.getChildren(), TREE_MODEL_ADAPTOR_INSTANCE_PREDICATE);
}
public Iterator<TreeDataModelTuple> children() {
13 years, 4 months
JBoss Rich Faces SVN: r20794 - in trunk/ui/iteration/ui/src: main/resources/META-INF/resources/org.richfaces and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-12-24 13:15:26 -0500 (Fri, 24 Dec 2010)
New Revision: 20794
Modified:
trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SortingFilteringRowsRenderer.java
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.js
trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
Log:
re-fix RF-9931
Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SortingFilteringRowsRenderer.java
===================================================================
--- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SortingFilteringRowsRenderer.java 2010-12-24 16:57:48 UTC (rev 20793)
+++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/SortingFilteringRowsRenderer.java 2010-12-24 18:15:26 UTC (rev 20794)
@@ -26,6 +26,7 @@
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Set;
import javax.el.ELContext;
import javax.el.ELException;
@@ -94,37 +95,35 @@
}
protected void decodeSorting(FacesContext context, UIDataTableBase dataTableBase, String value) {
-
- Collection<Object> sortPriority = dataTableBase.getSortPriority();
-
- if(sortPriority == null) {
- sortPriority = new LinkedHashSet<Object>();
- }
-
+ Set<Object> sortPriority = new LinkedHashSet<Object>();
+
String[] values = value.split(SEPARATOR);
- if (Boolean.parseBoolean(values[2]) || SortMode.single.equals(dataTableBase.getSortMode())) {
+ String columnId = values[0];
+ String sortOrder = values[1];
+ boolean isClear = Boolean.parseBoolean(values[2]);
+
+ if (isClear || SortMode.single.equals(dataTableBase.getSortMode())) {
for (Iterator<UIComponent> iterator = dataTableBase.columns(); iterator.hasNext();) {
UIComponent column = iterator.next();
- if (values[0].equals(column.getId())) {
- updateSortOrder(context, column, values[1]);
- sortPriority.add(values[0]);
+ if (columnId.equals(column.getId())) {
+ updateSortOrder(context, column, sortOrder);
+ sortPriority.add(columnId);
} else {
updateAttribute(context, column, SORT_ORDER_STRING, SortOrder.unsorted);
}
}
} else {
- updateSortOrder(context, dataTableBase.findComponent(values[0]), values[1]);
- sortPriority = dataTableBase.getSortPriority();
- if (sortPriority != null) {
- sortPriority.remove(values[0]);
- sortPriority.addAll(sortPriority);
+ updateSortOrder(context, dataTableBase.findComponent(columnId), sortOrder);
+ Collection<?> priority = dataTableBase.getSortPriority();
+ if (priority != null) {
+ priority.remove(columnId);
+ sortPriority.addAll(priority);
}
- sortPriority.add(values[0]);
+ sortPriority.add(columnId);
}
-
updateAttribute(context, dataTableBase, SORT_PRIORITY_STRING, sortPriority);
- context.getPartialViewContext().getRenderIds().add(dataTableBase.getClientId(context)); // TODO Use partial re-rendering here.
- }
+ context.getPartialViewContext().getRenderIds().add(dataTableBase.getClientId(context));
+ }
private void updateSortOrder(FacesContext context, UIComponent component, String value) {
SortOrder sortOrder = SortOrder.ascending;
Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.js
===================================================================
--- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.js 2010-12-24 16:57:48 UTC (rev 20793)
+++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.js 2010-12-24 18:15:26 UTC (rev 20794)
@@ -27,7 +27,7 @@
var createParameters = function(type, id, arg1, arg2) {
var parameters = {};
var key = this.id + type;
- parameters[key] = ((id || "") + ":" + (arg1 || "") + ":" + (arg2 || true));
+ parameters[key] = (id + ":" + (arg1 || "") + ":" + arg2);
var eventOptions = this.options.ajaxEventOption;
for (key in eventOptions) {
Modified: trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
===================================================================
--- trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-12-24 16:57:48 UTC (rev 20793)
+++ trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-12-24 18:15:26 UTC (rev 20794)
@@ -39,7 +39,6 @@
import org.jboss.test.faces.htmlunit.HtmlUnitEnvironment;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.richfaces.component.AbstractExtendedDataTable;
import org.richfaces.component.SortOrder;
@@ -278,7 +277,6 @@
facesRequest.release();
}
- @Ignore
@Test
public final void testSortingWithoutClean() throws IOException {
FacesRequest facesRequest = startFacesRequest();
13 years, 4 months
JBoss Rich Faces SVN: r20793 - trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-12-24 11:57:48 -0500 (Fri, 24 Dec 2010)
New Revision: 20793
Modified:
trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
Log:
Failing test ignored
Modified: trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
===================================================================
--- trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-12-24 16:20:03 UTC (rev 20792)
+++ trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-12-24 16:57:48 UTC (rev 20793)
@@ -278,6 +278,7 @@
facesRequest.release();
}
+ @Ignore
@Test
public final void testSortingWithoutClean() throws IOException {
FacesRequest facesRequest = startFacesRequest();
13 years, 4 months
JBoss Rich Faces SVN: r20792 - trunk/ui/output/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-12-24 11:20:03 -0500 (Fri, 24 Dec 2010)
New Revision: 20792
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolbar.java
Log:
RF-9967
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolbar.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolbar.java 2010-12-24 16:16:11 UTC (rev 20791)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractToolbar.java 2010-12-24 16:20:03 UTC (rev 20792)
@@ -32,7 +32,8 @@
import org.richfaces.renderkit.html.ToolbarRendererBase;
@JsfComponent(family = AbstractToolbar.COMPONENT_FAMILY, type = AbstractToolbar.COMPONENT_TYPE,
- renderer=@JsfRenderer(type = ToolbarRendererBase.RENDERER_TYPE), tag = @Tag(name="toolbar")
+ renderer=@JsfRenderer(type = ToolbarRendererBase.RENDERER_TYPE), tag = @Tag(name="toolbar"),
+ attributes = {"core-props.xml"}
)
public abstract class AbstractToolbar extends UIComponentBase {
13 years, 4 months
JBoss Rich Faces SVN: r20791 - trunk/ui/validator/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-12-24 11:16:11 -0500 (Fri, 24 Dec 2010)
New Revision: 20791
Modified:
trunk/ui/validator/ui/src/main/java/org/richfaces/component/UIAjaxValidator.java
trunk/ui/validator/ui/src/main/java/org/richfaces/component/UIGraphValidator.java
Log:
Legacy 3.x code removal
Modified: trunk/ui/validator/ui/src/main/java/org/richfaces/component/UIAjaxValidator.java
===================================================================
--- trunk/ui/validator/ui/src/main/java/org/richfaces/component/UIAjaxValidator.java 2010-12-24 14:26:38 UTC (rev 20790)
+++ trunk/ui/validator/ui/src/main/java/org/richfaces/component/UIAjaxValidator.java 2010-12-24 16:16:11 UTC (rev 20791)
@@ -39,8 +39,6 @@
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
-import org.ajax4jsf.component.AjaxComponent;
-import org.ajax4jsf.component.AjaxSupport;
import org.ajax4jsf.context.AjaxContext;
import org.richfaces.event.ValidatorEvent;
@@ -48,7 +46,7 @@
* JSF component class
*
*/
-public abstract class UIAjaxValidator extends UIComponentBase implements AjaxComponent, AjaxSupport, AjaxContainer {
+public abstract class UIAjaxValidator extends UIComponentBase implements AjaxContainer {
public static final String COMPONENT_TYPE = "org.richfaces.AjaxValidator";
@@ -65,6 +63,8 @@
}
}
+ public abstract String getOnsubmit();
+
/**
* @param parent
* @throws FacesException
Modified: trunk/ui/validator/ui/src/main/java/org/richfaces/component/UIGraphValidator.java
===================================================================
--- trunk/ui/validator/ui/src/main/java/org/richfaces/component/UIGraphValidator.java 2010-12-24 14:26:38 UTC (rev 20790)
+++ trunk/ui/validator/ui/src/main/java/org/richfaces/component/UIGraphValidator.java 2010-12-24 16:16:11 UTC (rev 20791)
@@ -38,8 +38,8 @@
import javax.faces.context.FacesContext;
import javax.faces.validator.Validator;
+import org.richfaces.el.CapturingELResolver;
import org.richfaces.el.ELContextWrapper;
-import org.richfaces.el.util.CapturingELResolver;
import org.richfaces.validator.FacesBeanValidator;
import org.richfaces.validator.GraphValidator;
import org.richfaces.validator.GraphValidatorState;
13 years, 4 months
JBoss Rich Faces SVN: r20790 - trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-12-24 09:26:38 -0500 (Fri, 24 Dec 2010)
New Revision: 20790
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.js
Log:
RF-9560 collapsiblePanel: use 'pointer' cursor over the switch control
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss 2010-12-24 12:38:25 UTC (rev 20789)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss 2010-12-24 14:26:38 UTC (rev 20790)
@@ -7,6 +7,7 @@
}
.rf-cp-hdr{
+ cursor: pointer;
background-color:'#{richSkin.headerBackgroundColor}';
border-color:'#{richSkin.headerBackgroundColor}';
font-size:'#{richSkin.headerSizeFont}';
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.js 2010-12-24 12:38:25 UTC (rev 20789)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.js 2010-12-24 14:26:38 UTC (rev 20790)
@@ -52,7 +52,7 @@
];
this.options.cycledSwitching = true;
- rf.Event.bindById(this.id + ":header", "click", this.__onHeaderClick, this)
+ rf.Event.bindById(this.id + ":header", "click", this.__onHeaderClick, this);
},
switchPanel : function (to) {
13 years, 4 months
JBoss Rich Faces SVN: r20789 - management/design-4x/message.
by richfaces-svn-commits＠lists.jboss.org
Author: Ochikvina
Date: 2010-12-24 07:38:25 -0500 (Fri, 24 Dec 2010)
New Revision: 20789
Modified:
management/design-4x/message/message.html
management/design-4x/message/messages.html
Log:
Added names of skin parameters.
Modified: management/design-4x/message/message.html
===================================================================
--- management/design-4x/message/message.html 2010-12-23 19:24:00 UTC (rev 20788)
+++ management/design-4x/message/message.html 2010-12-24 12:38:25 UTC (rev 20789)
@@ -10,6 +10,8 @@
/*--- RF Message styles ---*/
.rf-msg {
+ font-family:Verdana, sans-serif;/*generalFamilyFont*/
+ font-size:11px;/*generalSizeFont*/
}
.rf-msg-mkr {
padding-right:2px;
Modified: management/design-4x/message/messages.html
===================================================================
--- management/design-4x/message/messages.html 2010-12-23 19:24:00 UTC (rev 20788)
+++ management/design-4x/message/messages.html 2010-12-24 12:38:25 UTC (rev 20789)
@@ -10,8 +10,8 @@
/*--- RF Message styles ---*/
.rf-msgs{
- font-family:Verdana, sans-serif;
- font-size:11px;
+ font-family:Verdana, sans-serif;/*generalFamilyFont*/
+ font-size:11px;/*generalSizeFont*/
}
.rf-msgs ul{
list-style:none;
13 years, 4 months