JBoss Rich Faces SVN: r2086 - in trunk: framework/test/src/test/java/org/ajax4jsf/resource and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-08-06 15:06:24 -0400 (Mon, 06 Aug 2007)
New Revision: 2086
Modified:
trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java
trunk/framework/test/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java
trunk/samples/scrollable-grid-demo/pom.xml
Log:
Fix thread problem in resource test. Add version number to a scrollable-grid-demo, remove unused package declaration
Modified: trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java
===================================================================
--- trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java 2007-08-06 18:55:20 UTC (rev 2085)
+++ trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateManagerTest.java 2007-08-06 19:06:24 UTC (rev 2086)
@@ -22,7 +22,6 @@
import org.ajax4jsf.application.AjaxStateManager.TreeStrutureNode;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import com.sun.media.sound.AlawCodec;
/**
* @author asmirnov
Modified: trunk/framework/test/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java
===================================================================
--- trunk/framework/test/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java 2007-08-06 18:55:20 UTC (rev 2085)
+++ trunk/framework/test/src/test/java/org/ajax4jsf/resource/ResourceServiceThreadsTestCase.java 2007-08-06 19:06:24 UTC (rev 2086)
@@ -21,6 +21,10 @@
package org.ajax4jsf.resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
import javax.faces.context.FacesContext;
import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase;
@@ -30,9 +34,10 @@
/**
* @author shura
- *
+ *
*/
-public class ResourceServiceThreadsTestCase extends AbstractThreadedAjax4JsfTestCase {
+public class ResourceServiceThreadsTestCase extends
+ AbstractThreadedAjax4JsfTestCase {
/**
* @param s
@@ -50,10 +55,12 @@
super.setUp();
service = new InternetResourceService();
MockFilterConfig mockFilterConfig = new MockFilterConfig(servletContext);
- mockFilterConfig.setInitParameter(InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
+ mockFilterConfig.setInitParameter(
+ InternetResourceService.ENABLE_CACHING_PARAMETER, "true");
service.init(mockFilterConfig);
InternetResourceBuilder builder = InternetResourceBuilder.getInstance();
- resource = builder.createResource(this, MockCacheableResource.class.getName());
+ resource = builder.createResource(this, MockCacheableResource.class
+ .getName());
key = resource.getKey();
}
@@ -62,13 +69,12 @@
InternetResourceBuilder.setInstance(null);
resource = null;
service = null;
- key=null;
+ key = null;
}
-
+
public class ResourceRunner extends TestCaseRunnable {
-
+
private String data;
-
/**
* @param data
@@ -78,31 +84,45 @@
this.data = data;
}
+ public void runTestCase(FacesContext context) throws Throwable {
+ MockHttpServletResponse response = new MockHttpServletResponse() {
+ /* (non-Javadoc)
+ * @see org.apache.shale.test.mock.MockHttpServletResponse#addDateHeader(java.lang.String, long)
+ * Default shale implementation is not thread-safe.
+ */
+ public void addDateHeader(String name, long value) {
+ SimpleDateFormat format = new SimpleDateFormat(
+ "EEE, dd MMM yyyy HH:mm:ss zzz");
+ format.setTimeZone(TimeZone.getTimeZone("GMT"));
+ addHeader(name, format.format(new Date(value)));
+ }
- public void runTestCase(FacesContext context) throws Throwable {
- MockHttpServletResponse response = new MockHttpServletResponse();
+ };
MockHttpServletRequest req = new MockHttpServletRequest(session);
req.setServletContext(servletContext);
- req.setPathElements(request.getContextPath(), request.getServletPath(), request.getPathInfo(), data);
+ req.setPathElements(request.getContextPath(), request
+ .getServletPath(), request.getPathInfo(), data);
MockResourceRequest resourceRequest = new MockResourceRequest(req);
- service.serviceResource(key,resourceRequest,response);
- byte[] content = ((MockServletOutputStream)response.getOutputStream()).content();
+ service.serviceResource(key, resourceRequest, response);
+ byte[] content = ((MockServletOutputStream) response
+ .getOutputStream()).content();
String strContent = new String(content);
assertEquals(strContent, "test");
-
+
}
-
+
}
-
+
public void testTreadServiceResource() {
TestCaseRunnable[] runnables = new TestCaseRunnable[1000];
for (int i = 0; i < runnables.length; i++) {
- runnables[i] = new ResourceRunner(String.valueOf(i%10));
-
+ runnables[i] = new ResourceRunner(String.valueOf(i % 10));
+
}
this.runTestCaseRunnables(runnables);
int counter = ((MockCacheableResource) resource).getCounter();
- assertTrue("Resource was generated "+counter+" times", counter<= 10);
+ assertTrue("Resource was generated " + counter + " times",
+ counter <= 10);
}
}
Modified: trunk/samples/scrollable-grid-demo/pom.xml
===================================================================
--- trunk/samples/scrollable-grid-demo/pom.xml 2007-08-06 18:55:20 UTC (rev 2085)
+++ trunk/samples/scrollable-grid-demo/pom.xml 2007-08-06 19:06:24 UTC (rev 2086)
@@ -1,44 +1,47 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>samples</artifactId>
- <groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>scrollable-grid-demo</artifactId>
- <groupId>org.richfaces.samples</groupId>
- <packaging>war</packaging>
- <name>scrollable-grid-demo Maven Webapp</name>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>scrollable-grid</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.samples</groupId>
- <artifactId>skins</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>scrollable-grid-demo</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>scrollable-grid-demo</artifactId>
+ <groupId>org.richfaces.samples</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>scrollable-grid-demo Maven Webapp</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>scrollable-grid</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>skins</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>scrollable-grid-demo</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
</project>
\ No newline at end of file
17 years, 5 months
JBoss Rich Faces SVN: r2085 - in trunk/ui/datascroller/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-06 14:55:20 -0400 (Mon, 06 Aug 2007)
New Revision: 2085
Modified:
trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/ControlsState.java
trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
Log:
http://jira.jboss.com/jira/browse/RF-547 fixed
Modified: trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/ControlsState.java
===================================================================
--- trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/ControlsState.java 2007-08-06 17:15:54 UTC (rev 2084)
+++ trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/ControlsState.java 2007-08-06 18:55:20 UTC (rev 2085)
@@ -44,6 +44,8 @@
private boolean fastForwardRendered = true;
private boolean fastForwardEnabled = true;
+ private boolean controlsSeparatorRendered = false;
+
public boolean isFirstRendered() {
return firstRendered;
}
@@ -116,4 +118,10 @@
public void setFastForwardEnabled(boolean fastForwardEnabled) {
this.fastForwardEnabled = fastForwardEnabled;
}
+ public boolean isControlsSeparatorRendered() {
+ return controlsSeparatorRendered;
+ }
+ public void setControlsSeparatorRendered(boolean controlsSeparatorRendered) {
+ this.controlsSeparatorRendered = controlsSeparatorRendered;
+ }
}
Modified: trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
--- trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-08-06 17:15:54 UTC (rev 2084)
+++ trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-08-06 18:55:20 UTC (rev 2085)
@@ -171,6 +171,11 @@
controlsState.setFastRewindRendered(false);
}
+ UIComponent controlsSeparatorFacet = datascroller.getFacet("controlsSeparator");
+ if (controlsSeparatorFacet != null && controlsSeparatorFacet.isRendered()) {
+ controlsState.setControlsSeparatorRendered(true);
+ }
+
return controlsState;
}
Modified: trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
===================================================================
--- trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2007-08-06 17:15:54 UTC (rev 2084)
+++ trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2007-08-06 18:55:20 UTC (rev 2085)
@@ -10,7 +10,7 @@
border-width : 1px;
border-style: solid;
}
-.dr-dscr-button{
+.dr-dscr-button, .dr-dscr-sepctrl {
border-width: 1px;
border-style: solid;
width : 25px;
@@ -40,7 +40,7 @@
<u:style name="border-color" skin="panelBorderColor" />
</u:selector>
-<u:selector name=".dr-dscr-button">
+<u:selector name=".dr-dscr-button, .dr-dscr-sepctrl">
<u:style name="background-color" skin="additionalBackgroundColor" />
<u:style name="border-color" skin="panelBorderColor" />
<u:style name="font-family" skin="generalFamilyFont" />
Modified: trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
===================================================================
--- trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-08-06 17:15:54 UTC (rev 2084)
+++ trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-08-06 18:55:20 UTC (rev 2085)
@@ -68,6 +68,12 @@
]]></jsp:scriptlet>
</td>
<jsp:scriptlet><![CDATA[
+ }
+ if (controlsState.isControlsSeparatorRendered() &&
+ (controlsState.isFastRewindRendered() || controlsState.isPreviousRendered())) {
+ ]]></jsp:scriptlet>
+ <td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+ <jsp:scriptlet><![CDATA[
}
}
]]></jsp:scriptlet>
@@ -109,6 +115,12 @@
</td>
<jsp:scriptlet><![CDATA[
}
+
+ if (controlsState.isControlsSeparatorRendered() && controlsState.isPreviousRendered()) {
+ ]]></jsp:scriptlet>
+ <td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+ <jsp:scriptlet><![CDATA[
+ }
}
]]></jsp:scriptlet>
@@ -202,6 +214,13 @@
</td>
<jsp:scriptlet><![CDATA[
}
+
+ if (controlsState.isControlsSeparatorRendered() &&
+ (controlsState.isFastForwardRendered() || controlsState.isLastRendered())) {
+ ]]></jsp:scriptlet>
+ <td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+ <jsp:scriptlet><![CDATA[
+ }
}
]]></jsp:scriptlet>
@@ -244,6 +263,12 @@
</td>
<jsp:scriptlet><![CDATA[
}
+
+ if (controlsState.isControlsSeparatorRendered() && controlsState.isLastRendered()) {
+ ]]></jsp:scriptlet>
+ <td class="dr-dscr-sepctrl rich-datascr-ctrls-separator"><u:insertFacet name="controlsSeparator" /></td>
+ <jsp:scriptlet><![CDATA[
+ }
}
]]></jsp:scriptlet>
17 years, 5 months
JBoss Rich Faces SVN: r2084 - in trunk/ui/calendar/src: main/java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-08-06 13:15:54 -0400 (Mon, 06 Aug 2007)
New Revision: 2084
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java
Log:
added atrribute disabled
added reset button
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-08-06 16:56:37 UTC (rev 2083)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-08-06 17:15:54 UTC (rev 2084)
@@ -108,6 +108,12 @@
<defaultvalue>true</defaultvalue>
</property>
<property>
+ <name>disabled</name>
+ <classname>boolean</classname>
+ <description></description>
+ <defaultvalue>false</defaultvalue>
+ </property>
+ <property>
<name>jointPoint</name>
<classname>java.lang.String</classname>
<description></description>
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-08-06 16:56:37 UTC (rev 2083)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-08-06 17:15:54 UTC (rev 2084)
@@ -120,7 +120,12 @@
public abstract boolean isPopup();
public abstract void setPopup(boolean popup);
+
+ public abstract boolean isDisabled();
+ public abstract void setDisabled(boolean disabled);
+
+
public abstract String getButtonLabel();
public abstract void setButtonLabel(String buttonLabel);
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-06 16:56:37 UTC (rev 2083)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-06 17:15:54 UTC (rev 2084)
@@ -32,6 +32,7 @@
direction: '#{component.direction}',
toolTipMode:'#{component.toolTipMode}',
popup: #{component.popup},
+ disabled: #{component.disabled},
<f:call name="writeSymbols" />,
firstWeekDay: #{this:getFirstWeekDay(context, component)},
minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)},
@@ -108,7 +109,8 @@
onclick="$(this.form.id+':calendar').component.doExpand();"
style="#{component.attributes['style']}"
tabindex="#{component.attributes['tabindex']}"
- type="button">
+ type="button"
+ disabled="#{component.attributes['disabled']}">
#{component.attributes['buttonLabel']}
</button>
<jsp:scriptlet>
@@ -120,7 +122,7 @@
id="#{clientId}ResetButton"
type="button"
onclick="$(this.form.id+':calendar').component.resetSelectedDate();"
- >
+ disabled="#{component.attributes['disabled']}">
Reset
</button>
<jsp:scriptlet>
Modified: trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java
===================================================================
--- trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java 2007-08-06 16:56:37 UTC (rev 2083)
+++ trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java 2007-08-06 17:15:54 UTC (rev 2084)
@@ -66,6 +66,8 @@
System.out.println(strarr[i]);
} */
calendar.setButtonLabel("PopUp");
+ //TODO test popup false
+ //TODO test CurrentDate = null
calendar.setPopup(true);
Calendar calendarObject = Calendar.getInstance();
calendarObject.set(2001, Calendar.SEPTEMBER, 11,1,1,1);
@@ -174,7 +176,7 @@
}
public void testCalendarDecode() throws Exception{
-
+ //TODO Add set Date and time
calendar.decode(facesContext);
assertEquals("Tue Sep 11 01:01:01 EEST 2001", calendar.getSubmittedValue().toString());
Calendar calendarObject = Calendar.getInstance();
17 years, 5 months
JBoss Rich Faces SVN: r2083 - in trunk: ui/scrollable-grid/src/main/java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-08-06 12:56:37 -0400 (Mon, 06 Aug 2007)
New Revision: 2083
Modified:
trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml
trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml
trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml
trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml
trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml
trunk/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml
trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java
trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java
trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridComponentTest.java
Log:
removed system.out calls from classes
Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml
===================================================================
--- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml 2007-08-06 16:42:55 UTC (rev 2082)
+++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/columns.xhtml 2007-08-06 16:56:37 UTC (rev 2083)
@@ -3,7 +3,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid">
+ xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid">
<ui:composition>
<sg:column width="200px">
Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml
===================================================================
--- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml 2007-08-06 16:42:55 UTC (rev 2082)
+++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid1.xhtml 2007-08-06 16:56:37 UTC (rev 2083)
@@ -3,7 +3,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid">
+ xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid">
<ui:composition>
<sg:scrollable-grid value="#{modelBuilder.model1}" var="issues"
Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml
===================================================================
--- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml 2007-08-06 16:42:55 UTC (rev 2082)
+++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid2.xhtml 2007-08-06 16:56:37 UTC (rev 2083)
@@ -3,7 +3,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid">
+ xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid">
<ui:composition>
<sg:scrollable-grid value="#{modelBuilder.model2}" var="issues"
Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml
===================================================================
--- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml 2007-08-06 16:42:55 UTC (rev 2082)
+++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/grid3.xhtml 2007-08-06 16:56:37 UTC (rev 2083)
@@ -3,7 +3,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid">
+ xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid">
<ui:composition>
<sg:scrollable-grid value="#{modelBuilder.model3}" var="issues"
Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml
===================================================================
--- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml 2007-08-06 16:42:55 UTC (rev 2082)
+++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/scrollable-grid.xhtml 2007-08-06 16:56:37 UTC (rev 2083)
@@ -3,7 +3,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid"
+ xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid"
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
>
Modified: trunk/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml
===================================================================
--- trunk/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml 2007-08-06 16:42:55 UTC (rev 2082)
+++ trunk/samples/scrollable-grid-demo/src/main/webapp/pages/test.xhtml 2007-08-06 16:56:37 UTC (rev 2083)
@@ -3,7 +3,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/ui/scrollable-grid"
+ xmlns:sg="http://labs.jboss.com/jbossrichfaces/ui/scrollable-grid"
xmlns:a4j="http://richfaces.org/a4j">
<body>
<f:view>
Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java
===================================================================
--- trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java 2007-08-06 16:42:55 UTC (rev 2082)
+++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/component/UIScrollableGrid.java 2007-08-06 16:56:37 UTC (rev 2083)
@@ -51,10 +51,11 @@
public static final String COMPONENT_TYPE = "org.richfaces.component.ScrollableGrid";
public static final String SORT_SINGLE = "single";
public static final String SORT_MULTI = "multi";
+
+ private final static Log log = LogFactory.getLog(UIScrollableGrid.class);
private boolean MODEL_RANGE = false;
- private final static Log log = LogFactory.getLog(UIScrollableGrid.class);
private transient Collection partialUpdateChildren;
@@ -127,25 +128,37 @@
public void processDecodes(FacesContext faces) {
MODEL_RANGE = true;
- System.out.println("UIScrollableGrid.processDecodes()");
+ if (log.isTraceEnabled()) {
+ log.trace("UIScrollableGrid.processDecodes(faces)");
+ }
super.processDecodes(faces);
}
public void processValidators(FacesContext faces) {
MODEL_RANGE = false;
- System.out.println("UIScrollableGrid.processValidators()");
+ if (log.isTraceEnabled()) {
+ log.trace("UIScrollableGrid.processValidators(faces)");
+ }
super.processValidators(faces);
}
public void processUpdates(FacesContext faces) {
MODEL_RANGE = false;
- System.out.println("UIScrollableGrid.processUpdates()");
+
+ if (log.isTraceEnabled()) {
+ log.trace("UIScrollableGrid.processUpdates(faces)");
+ }
+
super.processUpdates(faces);
ranges.clear();
}
public void encodeBegin(FacesContext context) throws IOException {
- System.out.println("UIScrollableGrid.encodeBegin()");
+
+ if (log.isTraceEnabled()) {
+ log.trace("UIScrollableGrid.encodeBegin(context)");
+ }
+
MODEL_RANGE = true;
super.encodeBegin(context);
}
@@ -323,7 +336,12 @@
for (Iterator iter = ranges.iterator(); iter.hasNext();) {
ScrollableGridRange range = (ScrollableGridRange) iter.next();
- System.out.println("Range is: " + range.getFirst() + " - " + range.getLast() + " sortOrder: " + range.getSortOrder() );
+
+ if (log.isDebugEnabled()) {
+ log.debug("Range is: " + range.getFirst() + " - " + range.getLast() + " sortOrder: " + range.getSortOrder() );
+ }
+
+
getExtendedDataModel().walk(faces, visitor,range, argument);
}
@@ -368,11 +386,18 @@
}
public SortListener getSortListener() {
- if (sortListener != null) return sortListener;
+ if (sortListener != null) {
+ return sortListener;
+ }
+
if (SORT_MULTI.equals(getSortMode())) {
+
return MultiColumnSortListener.INSTANCE;
+
} else {
+
return SingleColumnSortListener.INSTANCE;
+
}
}
Modified: trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
===================================================================
--- trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-08-06 16:42:55 UTC (rev 2082)
+++ trunk/ui/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-08-06 16:56:37 UTC (rev 2083)
@@ -321,11 +321,8 @@
state.setFrozenColumnCount(GridUtils.getFrozenColumnsCount(grid));
String row_id = null;
- /*
- System.out.println("row data index: " + grid.getRowIndex());
- System.out.println("rows count " + grid.getRows());
- System.out.println("local rows " + state.getRowIndex());
- */
+
+
for (Iterator iter = grid.getChildren().iterator(); iter.hasNext(); ) {
UIComponent kid = (UIComponent) iter.next();
@@ -457,9 +454,9 @@
state.setColumType(COLUMN_NORMAL_TYPE);
}
- System.out.println("");
- System.out.println("ScrollableGridBaseRenderer.renderGridBody()");
- System.out.println("");
+ if (log.isTraceEnabled()) {
+ log.trace("ScrollableGridBaseRenderer.renderGridBody(context, grid, isFrozen)");
+ }
state.setFrozenColumnCount(GridUtils.getFrozenColumnsCount(grid));
state.setFrozenPart(isFrozen);
Modified: trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java
===================================================================
--- trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java 2007-08-06 16:42:55 UTC (rev 2082)
+++ trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridColumnComponentTest.java 2007-08-06 16:56:37 UTC (rev 2083)
@@ -65,31 +65,11 @@
public void testComponent() throws Exception {
-/*
- HtmlPage renderedView = renderView();
- assertNotNull(renderedView);
- System.out.println(renderedView.getWebResponse().getContentAsString());
- HtmlElement element = renderedView.getHtmlElementById(form.getId() + ":" + component.getId());
- assertNotNull(element);
-*/
-// values[0] = component.saveState(facesContext);
-
}
-/*
- public void testDefaultValues(){
-
- }
-*/
+
public void testContext(){
Object state = component.saveState(facesContext);
-/*
- UIViewRoot root = facesContext.getViewRoot();
- root.processDecodes(facesContext);
- root.processValidators(facesContext);
- root.processUpdates(facesContext);
- root.processApplication(facesContext);
-*/
testRestoreState(state);
}
Modified: trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridComponentTest.java
===================================================================
--- trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridComponentTest.java 2007-08-06 16:42:55 UTC (rev 2082)
+++ trunk/ui/scrollable-grid/src/test/java/org/richfaces/component/html/HtmlScrollableGridComponentTest.java 2007-08-06 16:56:37 UTC (rev 2083)
@@ -104,31 +104,11 @@
public void testComponent() throws Exception {
assertEquals("org.richfaces.renderkit.html.ScrollableGridRenderer", component.getRendererType());
-/*
- HtmlPage renderedView = renderView();
- assertNotNull(renderedView);
- System.out.println(renderedView.getWebResponse().getContentAsString());
- HtmlElement element = renderedView.getHtmlElementById(form.getId() + ":" + component.getId());
- assertNotNull(element);
-*/
-// values[0] = component.saveState(facesContext);
-
+
}
-/*
- public void testDefaultValues(){
-
- }
-*/
public void testContext(){
Object state = component.saveState(facesContext);
-/*
- UIViewRoot root = facesContext.getViewRoot();
- root.processDecodes(facesContext);
- root.processValidators(facesContext);
- root.processUpdates(facesContext);
- root.processApplication(facesContext);
-*/
testRestoreState(state);
}
17 years, 5 months
JBoss Rich Faces SVN: r2082 - in trunk/samples/calendar-sample/src/main/webapp: pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-08-06 12:42:55 -0400 (Mon, 06 Aug 2007)
New Revision: 2082
Modified:
trunk/samples/calendar-sample/src/main/webapp/WEB-INF/web.xml
trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
trunk/samples/calendar-sample/src/main/webapp/pages/index.jsp
Log:
Add ability to change skin "on fly" to calendar demo.
Modified: trunk/samples/calendar-sample/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/WEB-INF/web.xml 2007-08-06 16:32:12 UTC (rev 2081)
+++ trunk/samples/calendar-sample/src/main/webapp/WEB-INF/web.xml 2007-08-06 16:42:55 UTC (rev 2082)
@@ -13,7 +13,16 @@
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value>
- </context-param>
+ </context-param>
+
+ <context-param>
+ <param-name>org.ajax4jsf.SKIN</param-name>
+ <param-value>#{skinBean.skin}</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
+ <param-value>false</param-value>
+ </context-param>
<!--
-->
<filter>
Modified: trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-06 16:32:12 UTC (rev 2081)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-06 16:42:55 UTC (rev 2082)
@@ -27,7 +27,12 @@
<h:messages />
</a4j:outputPanel>
<h:form>
-
+ <h:panelGrid columns="1">
+ <h:selectOneRadio binding="#{skinBean.component}" />
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+ </h:panelGrid>
+ <br />
+ <br />
<calendar:calendar
id="calendar"
data="#{calendarDataModel}"
Modified: trunk/samples/calendar-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/index.jsp 2007-08-06 16:32:12 UTC (rev 2081)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/index.jsp 2007-08-06 16:42:55 UTC (rev 2082)
@@ -7,7 +7,13 @@
</head>
<body>
<f:view>
- <h:form>
+ <h:form>
+ <h:panelGrid columns="1">
+ <h:selectOneRadio binding="#{skinBean.component}" />
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+ </h:panelGrid>
+ <br />
+ <br />
<calendar:calendar id="calendar" data="#{calendarDataModel}" locale="#{calendarBean.locale}">
<f:facet name="header">
<f:verbatim>
17 years, 5 months
JBoss Rich Faces SVN: r2081 - trunk/ui/tooltip/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: dbiatenia
Date: 2007-08-06 12:32:12 -0400 (Mon, 06 Aug 2007)
New Revision: 2081
Modified:
trunk/ui/tooltip/src/main/config/component/toolTip.xml
Log:
default direction is det in 'bottom-right' now.
Modified: trunk/ui/tooltip/src/main/config/component/toolTip.xml
===================================================================
--- trunk/ui/tooltip/src/main/config/component/toolTip.xml 2007-08-06 15:55:58 UTC (rev 2080)
+++ trunk/ui/tooltip/src/main/config/component/toolTip.xml 2007-08-06 16:32:12 UTC (rev 2081)
@@ -102,7 +102,7 @@
<name>direction</name>
<classname>java.lang.String</classname>
<description>Defines direction of the popup list to appear (top-right, top-left bottom-right, bottom-left, auto(default))</description>
- <defaultvalue><![CDATA["top-right"]]></defaultvalue>
+ <defaultvalue><![CDATA["bottom-right"]]></defaultvalue>
</property>
<property>
<name>followmouse</name>
17 years, 5 months
JBoss Rich Faces SVN: r2080 - trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-08-06 11:55:58 -0400 (Mon, 06 Aug 2007)
New Revision: 2080
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
Log:
http://jira.jboss.com/jira/browse/RF-342
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-08-06 15:36:39 UTC (rev 2079)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2007-08-06 15:55:58 UTC (rev 2080)
@@ -4,16 +4,13 @@
xmlns="http://www.w3.org/1999/xhtml" >
<f:verbatim><![CDATA[
.calendar_exterior{
- border : 1px solid #c0c0c0; /*panelBorderColor*/
+ border : 1px solid;
}
.calendar_btn{
cursor : pointer;
}
.calendar_header{
- border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
- background : #C7D7EC; /*additionalBackgroundColor*/
- font-size : 11px; /*generalSizeFont*/
- font-family : verdana; /*generalFamilyFont*/
+ border-bottom : 1px solid;
padding : 7px;
height : 22px;
}
@@ -24,23 +21,15 @@
}
.calendar_cell{
- background-color : #FFFFFF; /*generalBackgroundColor*/
- border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
- border-right : 1px solid #c0c0c0; /*panelBorderColor*/
- font-size : 11px; /*generalSizeFont*/
- font-family : verdana; /*generalFamilyFont*/
+ border-bottom : 1px solid;
+ border-right : 1px solid;
padding : 0px;
vertical-align : middle;
text-align : center;
}
.calendar_tool{
- border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
- background-color : #224986; /*headerBackgroundColor*/
- font-size : 11px; /*headerSizeFont*/
- font-family : verdana; /*headerFamilyFont*/
- color : #ffffff; /*headerTextColor*/
- font-weight : bold;
+ border-bottom : 1px solid;
vertical-align : middle;
text-align : center;
width : 25px;
@@ -48,32 +37,22 @@
}
.calendar_month{
- border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
- background-color : #224986; /*headerBackgroundColor*/
- font-size : 11px; /*headerSizeFont*/
- font-family : verdana; /*headerFamilyFont*/
- color : #ffffff; /*headerTextColor*/
- font-weight : bold;
+ border-bottom : 1px solid;
vertical-align : middle;
text-align : center;
}
.calendar_days{
- border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
- border-right : 0px solid #c0c0c0; /*panelBorderColor*/
- background : #C7D7EC; /*additionalBackgroundColor*/
- font-size : 11px; /*generalSizeFont*/
- font-family : verdana; /*generalFamilyFont*/
+ border-bottom : 1px solid;
+ border-right : 0px solid;
vertical-align : middle;
text-align : center;
height : 22px;
}
.calendar_week{
- border-bottom : 1px solid #c0c0c0; /*panelBorderColor*/
- border-right : 1px solid #c0c0c0; /*panelBorderColor*/
- font-size : 11px; /*generalSizeFont*/
- font-family : verdana; /*generalFamilyFont*/
+ border-bottom : 1px solid;
+ border-right : 1px solid;
background-color : #f5f5f5; /*unknown parameter - need to add*/
vertical-align : middle;
text-align : center;
@@ -95,13 +74,6 @@
background-color : #e4f5e2; /*unknown parameter - need to add*/
}
-.calendar_select{
- background-color : #224986; /*headerBackgroundColor*/
- color : #FFFFFF; /*headerTextColor*/
- font-weight : bold;
-}
-
-
.right_cell{
border-right : 0px;
}
@@ -111,21 +83,15 @@
}
.calendar_toolfooter{
- border-top : 1px solid #c0c0c0; /*panelBorderColor*/
- border-right : 0px solid #c0c0c0; /*panelBorderColor*/
- background : #C7D7EC; /*additionalBackgroundColor*/
- font-size : 11px; /*generalSizeFont*/
- font-family : verdana; /*generalFamilyFont*/
+ border-top : 1px solid;
+ border-right : 0px solid;
padding : 0px 7px 0px 7px;
height : 22px;
}
.calendar_footer{
- border-top : 1px solid #c0c0c0; /*panelBorderColor*/
- border-right : 0px solid #c0c0c0; /*panelBorderColor*/
- background : #C7D7EC; /*additionalBackgroundColor*/
- font-size : 11px; /*generalSizeFont*/
- font-family : verdana; /*generalFamilyFont*/
+ border-top : 1px solid;
+ border-right : 0px solid;
padding : 7px;
height : 22px;
}
@@ -137,39 +103,41 @@
</u:selector>
<u:selector name=".calendar_header">
- <u:style name="border-bottom" skin="panelBorderColor"/>
- <u:style name="background" skin="additionalBackgroundColor"/>
+ <u:style name="border-bottom-color" skin="panelBorderColor"/>
+ <u:style name="background-color" skin="additionalBackgroundColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
<u:selector name=".calendar_cell">
- <u:style name="border-bottom" skin="panelBorderColor"/>
- <u:style name="border-right" skin="panelBorderColor"/>
+ <u:style name="border-bottom-color" skin="panelBorderColor"/>
+ <u:style name="border-right-color" skin="panelBorderColor"/>
<u:style name="background-color" skin="generalBackgroundColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
<u:selector name=".calendar_tool">
- <u:style name="border-bottom" skin="panelBorderColor"/>
+ <u:style name="border-bottom-color" skin="panelBorderColor"/>
<u:style name="background-color" skin="headerBackgroundColor"/>
<u:style name="font-size" skin="headerSizeFont"/>
<u:style name="font-family" skin="headerFamilyFont"/>
+ <u:style name="font-weight" skin="headerWeightFont"/>
<u:style name="color" skin="headerTextColor"/>
</u:selector>
<u:selector name=".calendar_month">
- <u:style name="border-bottom" skin="panelBorderColor"/>
+ <u:style name="border-bottom-color" skin="panelBorderColor"/>
<u:style name="background-color" skin="headerBackgroundColor"/>
<u:style name="font-size" skin="headerSizeFont"/>
<u:style name="font-family" skin="headerFamilyFont"/>
+ <u:style name="font-weight" skin="headerWeightFont"/>
<u:style name="color" skin="headerTextColor"/>
</u:selector>
<u:selector name=".calendar_days">
- <u:style name="border-bottom" skin="panelBorderColor"/>
- <u:style name="border-right" skin="panelBorderColor"/>
+ <u:style name="border-bottom-color" skin="panelBorderColor"/>
+ <u:style name="border-right-color" skin="panelBorderColor"/>
<u:style name="background" skin="additionalBackgroundColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
@@ -181,8 +149,8 @@
/* background-color : #f5f5f5; unknown parameter - need to add*/
<u:selector name=".calendar_week">
- <u:style name="border-bottom" skin="panelBorderColor"/>
- <u:style name="border-right" skin="panelBorderColor"/>
+ <u:style name="border-bottom-color" skin="panelBorderColor"/>
+ <u:style name="border-right-color" skin="panelBorderColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
@@ -214,27 +182,23 @@
<u:selector name=".calendar_select">
<u:style name="background-color" skin="headerBackgroundColor"/>
<u:style name="color" skin="headerTextColor"/>
+ <u:style name="font-weight" skin="headerWeightFont"/>
</u:selector>
- <u:selector name=".calendar_select">
- <u:style name="background-color" skin="headerBackgroundColor"/>
- <u:style name="color" skin="headerTextColor"/>
- </u:selector>
-
<u:selector name=".calendar_toolfooter">
- <u:style name="border-top" skin="panelBorderColor"/>
- <u:style name="border-right" skin="panelBorderColor"/>
+ <u:style name="border-top-color" skin="panelBorderColor"/>
+ <u:style name="border-right-color" skin="panelBorderColor"/>
<u:style name="background" skin="additionalBackgroundColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
<u:selector name=".calendar_footer">
- <u:style name="border-top" skin="panelBorderColor"/>
- <u:style name="border-right" skin="panelBorderColor"/>
+ <u:style name="border-top-color" skin="panelBorderColor"/>
+ <u:style name="border-right-color" skin="panelBorderColor"/>
<u:style name="background" skin="additionalBackgroundColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
-</f:template>
\ No newline at end of file
+</f:template>
17 years, 5 months
JBoss Rich Faces SVN: r2079 - in trunk/ui/datascroller/src/main: resources/org/richfaces/renderkit/html/css and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-06 11:36:39 -0400 (Mon, 06 Aug 2007)
New Revision: 2079
Modified:
trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
Log:
http://jira.jboss.com/jira/browse/RF-544 fixed
Modified: trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
--- trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-08-06 15:16:42 UTC (rev 2078)
+++ trunk/ui/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-08-06 15:36:39 UTC (rev 2079)
@@ -233,14 +233,12 @@
out.startElement("td", component);
if (isCurrentPage) {
- out.writeAttribute("align", "center", null);
//out.writeAttribute("class", "dr-dscr-act rich-datascr-act "+scroller.getStyleClass(), null);
out.writeAttribute("class", "dr-dscr-act rich-datascr-act",
null);
out.writeAttribute("style", "" + scroller.getSelectedStyle(),
null);
} else {
- out.writeAttribute("align", "center", null);
//out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact "+scroller.getStyleClass(), null);
out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact",
null);
Modified: trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
===================================================================
--- trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2007-08-06 15:16:42 UTC (rev 2078)
+++ trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2007-08-06 15:36:39 UTC (rev 2079)
@@ -15,17 +15,20 @@
border-style: solid;
width : 25px;
cursor : pointer;
+ text-align: center;
}
.dr-dscr-act{
border-top-width: 2px;
border-top-style: solid;
width : 25px;
+ text-align: center;
}
.dr-dscr-inact{
border-top-width: 2px;
border-top-style: solid;
width : 25px;
cursor : pointer;
+ text-align: center;
}
Modified: trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
===================================================================
--- trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-08-06 15:16:42 UTC (rev 2078)
+++ trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-08-06 15:36:39 UTC (rev 2079)
@@ -46,7 +46,7 @@
};
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FIRST_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -62,7 +62,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("««");
]]></jsp:scriptlet>
@@ -86,7 +86,7 @@
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FAST_REWIND_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -102,7 +102,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("«");
]]></jsp:scriptlet>
@@ -127,7 +127,7 @@
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.PREVIOUS_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -143,7 +143,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
</td>
<jsp:scriptlet><![CDATA[
}
@@ -181,7 +181,7 @@
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.NEXT_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -197,7 +197,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
</td>
<jsp:scriptlet><![CDATA[
@@ -221,7 +221,7 @@
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FAST_FORWARD_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -237,7 +237,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("»");
]]></jsp:scriptlet>
@@ -262,7 +262,7 @@
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.LAST_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -278,7 +278,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("»»");
]]></jsp:scriptlet>
17 years, 5 months
JBoss Rich Faces SVN: r2078 - in trunk/ui/datascroller/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-06 11:16:42 -0400 (Mon, 06 Aug 2007)
New Revision: 2078
Modified:
trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
Log:
http://jira.jboss.com/jira/browse/RF-543 fixed
Modified: trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss
===================================================================
--- trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2007-08-06 15:15:07 UTC (rev 2077)
+++ trunk/ui/datascroller/src/main/resources/org/richfaces/renderkit/html/css/datascroller.xcss 2007-08-06 15:16:42 UTC (rev 2078)
@@ -44,6 +44,9 @@
<u:style name="font-size" skin="generalSizeFont" />
</u:selector>
+<u:selector name=".dr-dscr-button-dsbld">
+ <u:style name="color" skin="panelBorderColor" default="gray" />
+</u:selector>
<u:selector name=".dr-dscr-act">
<u:style name=" border-top-color" skin="generalTextColor" />
@@ -65,5 +68,4 @@
<u:style name="background-color" skin="tableBackgroundColor" />
</u:selector>
-
</f:template>
Modified: trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx
===================================================================
--- trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-08-06 15:15:07 UTC (rev 2077)
+++ trunk/ui/datascroller/src/main/templates/org/richfaces/htmlDatascroller.jspx 2007-08-06 15:16:42 UTC (rev 2078)
@@ -34,19 +34,19 @@
if (controlsState.isFirstRendered()){
if (controlsState.isFirstEnabled()){
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("onclick", getOnClick(context,component,component.FIRST_FACET_NAME));
variables.setVariable("facet", component.FIRST_FACET_NAME);
facet=component.FIRST_FACET_NAME;
}else{
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
variables.setVariable("onclick", "");
variables.setVariable("facet", component.FIRST_DISABLED_FACET_NAME);
facet=component.FIRST_DISABLED_FACET_NAME;
};
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FIRST_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -62,7 +62,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("««");
]]></jsp:scriptlet>
@@ -74,19 +74,19 @@
<jsp:scriptlet><![CDATA[
if (controlsState.isFastRewindRendered()){
if (controlsState.isFastRewindEnabled()){
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("onclick", getOnClick(context,component,component.FAST_REWIND_FACET_NAME));
variables.setVariable("facet", component.FAST_REWIND_FACET_NAME);
facet=component.FAST_REWIND_FACET_NAME;
}else{
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
variables.setVariable("onclick", "");
variables.setVariable("facet", component.FAST_REWIND_DISABLED_FACET_NAME);
facet=component.FAST_REWIND_DISABLED_FACET_NAME;
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FAST_REWIND_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -102,7 +102,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("«");
]]></jsp:scriptlet>
@@ -115,19 +115,19 @@
<jsp:scriptlet><![CDATA[
if (controlsState.isPreviousRendered()){
if (controlsState.isPreviousEnabled()){
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("onclick", getOnClick(context,component,component.PREVIOUS_FACET_NAME));
variables.setVariable("facet", component.PREVIOUS_FACET_NAME);
facet=component.PREVIOUS_FACET_NAME;
}else{
variables.setVariable("onclick", "");
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
variables.setVariable("facet", component.PREVIOUS_DISABLED_FACET_NAME);
facet=component.PREVIOUS_DISABLED_FACET_NAME;
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.PREVIOUS_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -143,7 +143,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
</td>
<jsp:scriptlet><![CDATA[
}
@@ -170,18 +170,18 @@
if (controlsState.isNextRendered()){
if (controlsState.isNextEnabled()){
variables.setVariable("onclick", getOnClick(context,component,component.NEXT_FACET_NAME));
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("facet", component.NEXT_FACET_NAME);
facet=component.NEXT_FACET_NAME;
}else{
variables.setVariable("onclick", "");
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
variables.setVariable("facet", component.NEXT_DISABLED_FACET_NAME);
facet=component.NEXT_DISABLED_FACET_NAME;
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.NEXT_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -197,7 +197,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
</td>
<jsp:scriptlet><![CDATA[
@@ -209,19 +209,19 @@
if (controlsState.isFastForwardRendered()){
if (controlsState.isFastForwardEnabled()){
variables.setVariable("onclick", getOnClick(context,component,component.FAST_FORWARD_FACET_NAME));
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("facet", component.FAST_FORWARD_FACET_NAME);
facet=component.FAST_FORWARD_FACET_NAME;
}
else{
variables.setVariable("onclick", "");
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
variables.setVariable("facet", component.FAST_FORWARD_DISABLED_FACET_NAME);
facet=component.FAST_FORWARD_DISABLED_FACET_NAME;
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.FAST_FORWARD_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -237,7 +237,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("»");
]]></jsp:scriptlet>
@@ -251,18 +251,18 @@
if (controlsState.isLastRendered()){
if (controlsState.isLastEnabled()){
variables.setVariable("onclick", getOnClick(context,component,component.LAST_FACET_NAME));
- variables.setVariable("color", "");
+ variables.setVariable("buttonClass", "");
variables.setVariable("facet", component.LAST_FACET_NAME);
facet=component.LAST_FACET_NAME;
}else{
variables.setVariable("onclick", "");
- variables.setVariable("color", "color: " + org.richfaces.skin.SkinFactory.getInstance().getSkin(context).getParameter(context, "panelBorderColor", "gray")+ ";");
+ variables.setVariable("buttonClass", "dr-dscr-button-dsbld rich-datascr-button-dsbld");
variables.setVariable("facet", component.LAST_DISABLED_FACET_NAME);
facet=component.LAST_DISABLED_FACET_NAME;
}
if(component.getFacet(facet)!=null ) {
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet>
<![CDATA[if(component.LAST_FACET_NAME.equals(facet)){]]>
</jsp:scriptlet>
@@ -278,7 +278,7 @@
<jsp:scriptlet><![CDATA[
}else{
]]></jsp:scriptlet>
- <td style="#{color}" align="center" class="dr-dscr-button rich-datascr-button" onclick="#{onclick}">
+ <td align="center" class="#{buttonClass} dr-dscr-button rich-datascr-button" onclick="#{onclick}">
<jsp:scriptlet><![CDATA[
writer.write("»»");
]]></jsp:scriptlet>
17 years, 5 months
JBoss Rich Faces SVN: r2077 - trunk/framework/impl/src/main/java/org/richfaces/skin.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-06 11:15:07 -0400 (Mon, 06 Aug 2007)
New Revision: 2077
Modified:
trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
Log:
Warning text in SkinFactoryImpl updated
Modified: trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2007-08-06 14:56:08 UTC (rev 2076)
+++ trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2007-08-06 15:15:07 UTC (rev 2077)
@@ -214,8 +214,8 @@
useBase ? A4J_BASE_SKIN_PARAMETER
: A4J_SKIN_PARAMETER);
if (null != currentSkinName) {
- log.warn("Init parameter for a skin name changed to "+ (useBase ? A4J_BASE_SKIN_PARAMETER
- : A4J_SKIN_PARAMETER));
+ log.warn("Init parameter for a skin name changed to "+ (useBase ? BASE_SKIN_PARAMETER
+ : SKIN_PARAMETER));
}
}
17 years, 5 months