JBoss Rich Faces SVN: r13356 - in trunk/test-applications/jsp/src/main: webapp/ColorPicker and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2009-04-02 07:04:33 -0400 (Thu, 02 Apr 2009)
New Revision: 13356
Modified:
trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java
trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml
Log:
Modified: trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java 2009-04-02 11:03:37 UTC (rev 13355)
+++ trunk/test-applications/jsp/src/main/java/colorPicker/ColorPicker.java 2009-04-02 11:04:33 UTC (rev 13356)
@@ -52,8 +52,8 @@
requiredMessage = "custom required message";
valid = true;
validatorMessage = "custom validator message";
- value = "rgb(255, 250, 240)";
- facetsValue = "rgb(0, 0, 0)";
+ value = new String();
+ facetsValue = new String();
bindLabel = "Click Binding";
showEvent = "onclick";
}
Modified: trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp 2009-04-02 11:03:37 UTC (rev 13355)
+++ trunk/test-applications/jsp/src/main/webapp/ColorPicker/ColorPicker.jsp 2009-04-02 11:04:33 UTC (rev 13356)
@@ -15,8 +15,8 @@
onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
onmouseup="#{event.onmouseup}"
rendered="#{colorPicker.rendered and !colorPicker.facets}"
- required="#{colorPicker.required}"
- requiredMessage="#{colorPicker.requiredMessage}"
+
+
showEvent="#{colorPicker.showEvent}"
validator="#{colorPicker.validate}"
validatorMessage="#{colorPicker.validatorMessage}"
@@ -32,8 +32,8 @@
onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
onmouseup="#{event.onmouseup}"
rendered="#{colorPicker.rendered and colorPicker.facets}"
- required="#{colorPicker.required}"
- requiredMessage="#{colorPicker.requiredMessage}"
+
+
showEvent="#{colorPicker.showEvent}" validator="#{colorPicker.validate}"
validatorMessage="#{colorPicker.validatorMessage}"
value="#{colorPicker.facetsValue}"
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml 2009-04-02 11:03:37 UTC (rev 13355)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml 2009-04-02 11:04:33 UTC (rev 13356)
@@ -7,9 +7,4 @@
<managed-bean-class>colorPicker.ColorPicker</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
- <managed-bean>
- <managed-bean-name>secondPicker</managed-bean-name>
- <managed-bean-class>ColorPicker.secondPicker</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
</faces-config>
\ No newline at end of file
15 years
JBoss Rich Faces SVN: r13355 - trunk/cdk/generator/src/main/resources/META-INF/schema/entities.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2009-04-02 07:03:37 -0400 (Thu, 02 Apr 2009)
New Revision: 13355
Modified:
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_form_attributes.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_checkbox_attributes.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_events.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_radio_attributes.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_label_attributes.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_select_attributes.ent
trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_textarea_attributes.ent
Log:
RF-5945 - updated descriptions for attributes for some components
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_form_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_form_attributes.ent 2009-04-02 00:05:09 UTC (rev 13354)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_form_attributes.ent 2009-04-02 11:03:37 UTC (rev 13355)
@@ -20,12 +20,12 @@
<property>
<name>onreset</name>
<classname>java.lang.String</classname>
- <description>The onreset event occurs when a form is reset. It only applies to the FORM element</description>
+ <description>HTML: script expression; a form is reseted. It only applies to the FORM element</description>
</property>
<property>
<name>onsubmit</name>
<classname>java.lang.String</classname>
- <description>The onsubmit event occurs when a form is submitted. It only applies to the FORM element</description>
+ <description>HTML: script expression; a form is submitted. It only applies to the FORM element</description>
</property>
<property>
<name>target</name>
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_checkbox_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_checkbox_attributes.ent 2009-04-02 00:05:09 UTC (rev 13354)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_checkbox_attributes.ent 2009-04-02 11:03:37 UTC (rev 13355)
@@ -20,16 +20,16 @@
<name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
</property>
<property>
- <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+ <name>onblur</name><classname>java.lang.String</classname><description>HTML: script expression; the element lost the focus</description>
</property>
<property>
- <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+ <name>onchange</name><classname>java.lang.String</classname><description>HTML: script expression; the element value was changed</description>
</property>
<property>
- <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+ <name>onfocus</name><classname>java.lang.String</classname><description>HTML: script expression; the element got the focus</description>
</property>
<property>
- <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description>
+ <name>onselect</name><classname>java.lang.String</classname><description>HTML: script expression; text is selected in an input field</description>
</property>
<property>
<name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_events.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_events.ent 2009-04-02 00:05:09 UTC (rev 13354)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_events.ent 2009-04-02 11:03:37 UTC (rev 13355)
@@ -3,6 +3,6 @@
<property>
<name>onselect</name>
<classname>java.lang.String</classname>
- <description>HTML: script expression; The onselect event occurs when you select some text in a text field. This attribute may be used with the INPUT and TEXTAREA elements</description>
+ <description>HTML: script expression; some text is selected in a text field. This attribute may be used with the INPUT and TEXTAREA elements</description>
</property>
</properties>
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_radio_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_radio_attributes.ent 2009-04-02 00:05:09 UTC (rev 13354)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_input_radio_attributes.ent 2009-04-02 11:03:37 UTC (rev 13355)
@@ -20,16 +20,16 @@
<name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
</property>
<property>
- <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+ <name>onblur</name><classname>java.lang.String</classname><description>HTML: script expression; an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
</property>
<property>
- <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+ <name>onchange</name><classname>java.lang.String</classname><description>HTML: script expression; element's value is changed</description>
</property>
<property>
- <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+ <name>onfocus</name><classname>java.lang.String</classname><description>HTML: script expression; the element got the focus</description>
</property>
<property>
- <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description>
+ <name>onselect</name><classname>java.lang.String</classname><description>HTML: script expression; text is selected in an input field</description>
</property>
<property>
<name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_label_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_label_attributes.ent 2009-04-02 00:05:09 UTC (rev 13354)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_label_attributes.ent 2009-04-02 11:03:37 UTC (rev 13355)
@@ -6,10 +6,10 @@
</property>
<property>
- <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+ <name>onblur</name><classname>java.lang.String</classname><description>HTML: script expression; an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
</property>
<property>
- <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+ <name>onfocus</name><classname>java.lang.String</classname><description>HTML: script expression; the element got the focus</description>
</property>
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_select_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_select_attributes.ent 2009-04-02 00:05:09 UTC (rev 13354)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_select_attributes.ent 2009-04-02 11:03:37 UTC (rev 13355)
@@ -16,13 +16,13 @@
<property>
- <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+ <name>onblur</name><classname>java.lang.String</classname><description>HTML: script expression; an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
</property>
<property>
- <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+ <name>onchange</name><classname>java.lang.String</classname><description>HTML: script expression; element's value is changed</description>
</property>
<property>
- <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+ <name>onfocus</name><classname>java.lang.String</classname><description>HTML: script expression; the element got the focus</description>
</property>
<property>
Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_textarea_attributes.ent
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_textarea_attributes.ent 2009-04-02 00:05:09 UTC (rev 13354)
+++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/html_textarea_attributes.ent 2009-04-02 11:03:37 UTC (rev 13355)
@@ -20,16 +20,16 @@
<name>disabled</name><classname>java.lang.String</classname><description>Disabled state of an element or button</description>
</property>
<property>
- <name>onblur</name><classname>java.lang.String</classname><description> JavaScript code. The onblur event occurs when an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
+ <name>onblur</name><classname>java.lang.String</classname><description>HTML: script expression; an element loses focus either by the pointing device or by tabbing navigation. It may be used with the same elements as onfocus</description>
</property>
<property>
- <name>onchange</name><classname>java.lang.String</classname><description>Element's value changes</description>
+ <name>onchange</name><classname>java.lang.String</classname><description>HTML: script expression; element's value is changed</description>
</property>
<property>
- <name>onfocus</name><classname>java.lang.String</classname><description>JavaScript code</description>
+ <name>onfocus</name><classname>java.lang.String</classname><description>HTML: script expression; the element got the focus</description>
</property>
<property>
- <name>onselect</name><classname>java.lang.String</classname><description>Text is selected in an input field</description>
+ <name>onselect</name><classname>java.lang.String</classname><description>HTML: script expression; text is selected in an input field</description>
</property>
<property>
<name>readonly</name><classname>java.lang.String</classname><description>Flag indicating that this component will prohibit
15 years
JBoss Rich Faces SVN: r13354 - in trunk: samples/layout-sample/src/main/webapp/pages and 12 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-04-01 20:05:09 -0400 (Wed, 01 Apr 2009)
New Revision: 13354
Added:
trunk/samples/themes/src/design/
trunk/samples/themes/src/design/draw_direction_2.png
trunk/samples/themes/src/design/images/
trunk/samples/themes/src/design/images/bg_footer.png
trunk/samples/themes/src/design/images/bg_footer_left.png
trunk/samples/themes/src/design/images/bg_footer_right.png
trunk/samples/themes/src/design/images/bg_grad_page.png
trunk/samples/themes/src/design/images/bg_header.png
trunk/samples/themes/src/design/images/bg_header_left.png
trunk/samples/themes/src/design/images/bg_header_right.png
trunk/samples/themes/src/design/images/bg_left.png
trunk/samples/themes/src/design/images/bg_left_strut.png
trunk/samples/themes/src/design/images/bg_page.png
trunk/samples/themes/src/design/images/bg_right.png
trunk/samples/themes/src/design/images/bg_right_strut.png
trunk/samples/themes/src/design/images/spacer.gif
trunk/samples/themes/src/design/page_1.css
trunk/samples/themes/src/design/page_1.html
trunk/samples/themes/src/design/page_2.css
trunk/samples/themes/src/design/page_2.html
trunk/samples/themes/src/design/temp_3000.psd
trunk/samples/themes/src/main/java/META-INF/
trunk/samples/themes/src/main/java/META-INF/MANIFEST.MF
Removed:
trunk/samples/themes/src/main/java/org/richfaces/theme/App.java
trunk/samples/themes/src/test/java/org/richfaces/theme/AppTest.java
Modified:
trunk/samples/layout-sample/pom.xml
trunk/samples/layout-sample/src/main/webapp/pages/index.xhtml
trunk/samples/themes/pom.xml
trunk/ui/layout/pom.xml
trunk/ui/layout/src/main/config/component/layoutPanel.xml
trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java
trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java
trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
Log:
Import Lex Dmitriev design.
Modified: trunk/samples/layout-sample/pom.xml
===================================================================
--- trunk/samples/layout-sample/pom.xml 2009-04-01 22:44:20 UTC (rev 13353)
+++ trunk/samples/layout-sample/pom.xml 2009-04-02 00:05:09 UTC (rev 13354)
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
-<project>
+<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>
@@ -37,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
- <artifactId>layout</artifactId>
+ <artifactId>richfaces-ui</artifactId>
<version>3.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -45,5 +46,16 @@
<artifactId>skins</artifactId>
<version>3.3.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>themes</artifactId>
+ <version>3.3.1-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>layout</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/samples/layout-sample/src/main/webapp/pages/index.xhtml
===================================================================
(Binary files differ)
Modified: trunk/samples/themes/pom.xml
===================================================================
--- trunk/samples/themes/pom.xml 2009-04-01 22:44:20 UTC (rev 13353)
+++ trunk/samples/themes/pom.xml 2009-04-02 00:05:09 UTC (rev 13354)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>samples</artifactId>
@@ -24,13 +24,6 @@
<goal>generate</goal>
</goals>
</execution>
- <execution>
- <id>generate-test-sources</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>generate-tests</goal>
- </goals>
- </execution>
</executions>
</plugin>
</plugins>
Added: trunk/samples/themes/src/design/draw_direction_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/draw_direction_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_footer.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_footer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_footer_left.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_footer_left.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_footer_right.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_footer_right.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_grad_page.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_grad_page.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_header.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_header.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_header_left.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_header_left.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_header_right.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_header_right.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_left.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_left.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_left_strut.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_left_strut.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_page.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_page.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_right.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_right.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/bg_right_strut.png
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/bg_right_strut.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/images/spacer.gif
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/images/spacer.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/design/page_1.css
===================================================================
--- trunk/samples/themes/src/design/page_1.css (rev 0)
+++ trunk/samples/themes/src/design/page_1.css 2009-04-02 00:05:09 UTC (rev 13354)
@@ -0,0 +1,22 @@
+.page_size{width : 90%;}
+.menu_width{width : 300px;}
+
+body {margin : 0px; background : url(images/bg_page.png) top left #93C4E5;}
+.common_box {margin : 0px; background : url(images/bg_grad_page.png) top left repeat-x;}
+.header_bg_left {background : url(images/bg_header_left.png) top left no-repeat;}
+.header_bg_right {background : url(images/bg_header_right.png) top right no-repeat; height : 105px;}
+.header_content {margin : 0px 10px 0px 10px; height : 80px; position : relative;}
+.spacer{font-size : 1px;}
+.left_col {background : url(images/bg_left.png) top left no-repeat; vertical-align : top}
+.left_strut {background : url(images/bg_left_strut.png) top left no-repeat; height : 389px; width : 14px}
+.bg_tabbody {background : #c0c0c0}
+
+.menu_col {border-right : 2px solid #C0C0C0; vertical-align : top; background : #FFFFFF;}
+.content_col {vertical-align : top; width : 100%; background : #FFFFFF;}
+
+.right_col {background : url(images/bg_right.png) top right no-repeat; vertical-align : top}
+.right_strut {background : url(images/bg_right_strut.png) top right no-repeat; height : 389px; width : 14px}
+.footer_bg_left {background : url(images/bg_footer_left.png) top left no-repeat;}
+.footer_bg_right {background : url(images/bg_footer_right.png) top right no-repeat; height : 72px;}
+.footer_bg_content {margin : 0px 10px 0px 10px; height : 53px; position : relative;}
+
Property changes on: trunk/samples/themes/src/design/page_1.css
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/design/page_1.html
===================================================================
--- trunk/samples/themes/src/design/page_1.html (rev 0)
+++ trunk/samples/themes/src/design/page_1.html 2009-04-02 00:05:09 UTC (rev 13354)
@@ -0,0 +1,74 @@
+<html>
+<head>
+<title></title>
+<link rel="STYLESHEET" type="text/css" href="page_1.css">
+</head>
+
+<body>
+
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td align="center" class="common_box">
+
+ <table height="100%" border="0" cellpadding="0" cellspacing="0" class="page_size">
+ <tr>
+ <td colspan="3" class="header_bg_left">
+ <div class="header_bg_right">
+ <div class="spacer" style="height : 15px"></div>
+ <div class="header_content">
+<!-- begin header -->
+ <br>
+<!-- end header -->
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td class="left_col">
+ <div class="left_strut">
+ <br>
+ </div>
+ </td>
+ <td width="100%" height="100%" class="bg_tabbody">
+ <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
+ <tr>
+ <td class="menu_col">
+ <div class="menu_width spacer"></div>
+<!-- begin menu -->
+ <br>
+<!-- end meny -->
+ </td>
+ <td class="content_col">
+<!-- begin content -->
+ <br>
+<!-- end content -->
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td class="right_col">
+ <div class="right_strut">
+ <br>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3" class="footer_bg_left">
+ <div class="footer_bg_right">
+ <div class="footer_bg_content">
+<!-- begin footer -->
+ <br>
+<!-- end footer -->
+
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+ </td>
+ </tr>
+</table>
+
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/samples/themes/src/design/page_1.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/design/page_2.css
===================================================================
--- trunk/samples/themes/src/design/page_2.css (rev 0)
+++ trunk/samples/themes/src/design/page_2.css 2009-04-02 00:05:09 UTC (rev 13354)
@@ -0,0 +1,65 @@
+.menu_width{width : 300px;}
+
+body {
+ margin : 0px;
+ background : #f1f1f1; /*generalBackgroundColor*/
+}
+
+.page_size {
+ width : 100%;
+ height : 100%;
+}
+
+.header_bg {
+ background : url(images/bg_header.png) top left repeat-x #005000; /*headerBackgroundColor*/
+ border-bottom : 1px solid #f1f1f1; /*generalBackgroundColor*/
+}
+
+.header_content {
+ margin : 0px 0px 0px 0px;
+ height : 95px; position : relative;
+}
+
+.spacer{font-size : 1px;}
+
+.menu_col {
+ border-right : 2px solid #C0C0C0; /*panelBorderColor*/
+ border-top : 2px solid #C0C0C0; /*panelBorderColor*/
+ border-bottom : 2px solid #C0C0C0; /*panelBorderColor*/
+ vertical-align : top;
+ background : #f1f1f1; /*generalBackgroundColor*/
+}
+
+.content_col {
+ border-top : 2px solid #C0C0C0; /*panelBorderColor*/
+ border-bottom : 2px solid #C0C0C0; /*panelBorderColor*/
+ vertical-align : top;
+ width : 100%;
+ background : #f1f1f1; /*generalBackgroundColor*/
+}
+
+*.menu_col, *.content_col, *.footer_bg {
+ color : #000000; /*generalTextColor*/
+ font-size : 11px; /*generalSizeFont*/
+ font-family : Arial, Verdana, sans-serif ; /*generalFamilyFont*/
+
+}
+
+*.header_content {
+ color : #FFFFFF; /*headerTextColor*/
+ font-size : 12px; /*headerSizeFont*/
+ font-family : Arial, Verdana, sans-serif ; /*headerFamilyFont*/
+
+}
+
+.footer_bg {
+ border-top : 1px solid #f1f1f1; /*generalBackgroundColor*/
+ background : url(images/bg_footer.png) top left repeat-x #c0c0c0; /*panelBorderColor*/
+}
+
+.footer_bg_content {
+ margin : 0px 0px 0px 0px;
+ height : 45px;
+ position : relative;
+}
+
Property changes on: trunk/samples/themes/src/design/page_2.css
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/design/page_2.html
===================================================================
--- trunk/samples/themes/src/design/page_2.html (rev 0)
+++ trunk/samples/themes/src/design/page_2.html 2009-04-02 00:05:09 UTC (rev 13354)
@@ -0,0 +1,50 @@
+<html>
+<head>
+<title></title>
+<link rel="STYLESHEET" type="text/css" href="page_2.css">
+</head>
+
+<body>
+
+ <table border="0" cellpadding="0" cellspacing="0" class="page_size">
+ <tr>
+ <td class="header_bg">
+ <div class="header_content">
+<!-- begin header -->
+ <br>
+<!-- end header -->
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td width="100%" height="100%" class="bg_tabbody">
+ <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
+ <tr>
+ <td class="menu_col">
+ <div class="menu_width spacer"></div>
+<!-- begin menu -->
+ <br>
+<!-- end meny -->
+ </td>
+ <td class="content_col">
+<!-- begin content -->
+ <br>
+<!-- end content -->
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="footer_bg">
+ <div class="footer_bg_content">
+<!-- begin footer -->
+ <br>
+<!-- end footer -->
+ </div>
+ </td>
+ </tr>
+ </table>
+
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/samples/themes/src/design/page_2.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/design/temp_3000.psd
===================================================================
(Binary files differ)
Property changes on: trunk/samples/themes/src/design/temp_3000.psd
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/samples/themes/src/main/java/META-INF/MANIFEST.MF
===================================================================
--- trunk/samples/themes/src/main/java/META-INF/MANIFEST.MF (rev 0)
+++ trunk/samples/themes/src/main/java/META-INF/MANIFEST.MF 2009-04-02 00:05:09 UTC (rev 13354)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/samples/themes/src/main/java/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/samples/themes/src/main/java/org/richfaces/theme/App.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/App.java 2009-04-01 22:44:20 UTC (rev 13353)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/App.java 2009-04-02 00:05:09 UTC (rev 13354)
@@ -1,13 +0,0 @@
-package org.richfaces.theme;
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
Deleted: trunk/samples/themes/src/test/java/org/richfaces/theme/AppTest.java
===================================================================
--- trunk/samples/themes/src/test/java/org/richfaces/theme/AppTest.java 2009-04-01 22:44:20 UTC (rev 13353)
+++ trunk/samples/themes/src/test/java/org/richfaces/theme/AppTest.java 2009-04-02 00:05:09 UTC (rev 13354)
@@ -1,38 +0,0 @@
-package org.richfaces.theme;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- /**
- * Create the test case
- *
- * @param testName name of the test case
- */
- public AppTest( String testName )
- {
- super( testName );
- }
-
- /**
- * @return the suite of tests being tested
- */
- public static Test suite()
- {
- return new TestSuite( AppTest.class );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- assertTrue( true );
- }
-}
Modified: trunk/ui/layout/pom.xml
===================================================================
--- trunk/ui/layout/pom.xml 2009-04-01 22:44:20 UTC (rev 13353)
+++ trunk/ui/layout/pom.xml 2009-04-02 00:05:09 UTC (rev 13354)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<project>
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ui</artifactId>
@@ -50,10 +50,5 @@
<artifactId>richfaces-impl</artifactId>
<version>3.3.1-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core</artifactId>
- <version>3.3.1-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
Modified: trunk/ui/layout/src/main/config/component/layoutPanel.xml
===================================================================
--- trunk/ui/layout/src/main/config/component/layoutPanel.xml 2009-04-01 22:44:20 UTC (rev 13353)
+++ trunk/ui/layout/src/main/config/component/layoutPanel.xml 2009-04-02 00:05:09 UTC (rev 13354)
@@ -35,6 +35,13 @@
<description>
</description>
</property>
+
+ <property>
+ <name>width</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
</component>
</components>
Modified: trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java
===================================================================
--- trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java 2009-04-01 22:44:20 UTC (rev 13353)
+++ trunk/ui/layout/src/main/java/org/richfaces/component/UILayoutPanel.java 2009-04-02 00:05:09 UTC (rev 13354)
@@ -29,4 +29,17 @@
public abstract void setPosition(LayoutPosition newvalue);
+ /**
+ * Get Panel width.
+ * @return
+ */
+ public abstract String getWidth();
+
+ /**
+ * Set Panel width.
+ * @param newvalue
+ */
+ public abstract void setWidth(String newvalue);
+
+
}
Modified: trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java
===================================================================
--- trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java 2009-04-01 22:44:20 UTC (rev 13353)
+++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java 2009-04-02 00:05:09 UTC (rev 13354)
@@ -18,12 +18,13 @@
/**
* @author asmirnov
- *
+ *
*/
public abstract class AbstractLayoutRenderer extends
HeaderResourcesRendererBase {
- public void renderLayout(FacesContext context, UILayout layout) throws IOException {
+ public void renderLayout(FacesContext context, UILayout layout)
+ throws IOException {
// Detect layout content;
UILayoutPanel top = null;
UILayoutPanel bottom = null;
@@ -35,80 +36,115 @@
if (child instanceof UILayoutPanel) {
UILayoutPanel layoutPanel = (UILayoutPanel) child;
LayoutPosition position = layoutPanel.getPosition();
- if( LayoutPosition.top.equals(position)){
- if(null != top){
- throw new FacesException("Duplicate layoutPanel's with same position"+position);
+ if (LayoutPosition.top.equals(position)) {
+ if (null != top) {
+ throw new FacesException(
+ "Duplicate layoutPanel's with same position"
+ + position);
}
top = layoutPanel;
- } else if( LayoutPosition.bottom.equals(position)){
- if(null != bottom){
- throw new FacesException("Duplicate layoutPanel's with same position"+position);
+ } else if (LayoutPosition.bottom.equals(position)) {
+ if (null != bottom) {
+ throw new FacesException(
+ "Duplicate layoutPanel's with same position"
+ + position);
}
bottom = layoutPanel;
- } else if( LayoutPosition.left.equals(position)){
- if(null != left){
- throw new FacesException("Duplicate layoutPanel's with same position"+position);
+ } else if (LayoutPosition.left.equals(position)) {
+ if (null != left) {
+ throw new FacesException(
+ "Duplicate layoutPanel's with same position"
+ + position);
}
left = layoutPanel;
columns++;
- } else if( LayoutPosition.right.equals(position)){
- if(null != right){
- throw new FacesException("Duplicate layoutPanel's with same position"+position);
+ } else if (LayoutPosition.right.equals(position)) {
+ if (null != right) {
+ throw new FacesException(
+ "Duplicate layoutPanel's with same position"
+ + position);
}
right = layoutPanel;
columns++;
- } else if( null == position || LayoutPosition.center.equals(position)){
- if(null != center){
- throw new FacesException("Duplicate layoutPanel's with same position"+position);
+ } else if (null == position
+ || LayoutPosition.center.equals(position)) {
+ if (null != center) {
+ throw new FacesException(
+ "Duplicate layoutPanel's with same position"
+ + position);
}
center = layoutPanel;
columns++;
} else {
-
+
}
}
}
- if(columns>0 && null == center){
- throw new FacesException("Center layout panel for multi-column layout is not defined");
- }
ResponseWriter writer = context.getResponseWriter();
- if(null != top){
+ if (null != top) {
renderChild(context, top);
}
- if(columns>1){
- // Render Y! CSS Grid
- writer.startElement(HTML.DIV_ELEM, layout);
- // calculate class.
- String yahooClass = "yui-g";
- if(columns >2){
- yahooClass = "yui-gb";
- } else {
- Object width = center.getAttributes().get("width");
- if("75%".equals(width)){
- yahooClass = "yui-gc";
- } else if("66%".equals(width)){
- yahooClass = "yui-gd";
+ if (columns > 0) {
+ // Reorder panels to fill ordeg left->center->right.
+ if (null == left) {
+ if (null == center) {
+ left = right;
+ right = null;
+ } else {
+ left = center;
+ center = right;
+ right = null;
}
+ } else if (null == center) {
+ center = right;
+ right = null;
}
- writer.writeAttribute(HTML.class_ATTRIBUTE, yahooClass, null);
- if(null != left){
+ if (columns > 1) {
+ // Render Y! CSS Grid
+ writer.startElement(HTML.DIV_ELEM, layout);
+ // calculate class.
+ String yahooClass = calculateLayoutClass(left, right, center);
+ writer.writeAttribute(HTML.class_ATTRIBUTE, yahooClass, null);
left.getAttributes().put("first", "first");
center.getAttributes().remove("first");
renderChild(context, left);
+ renderChild(context, center);
+ if (null != right) {
+ right.getAttributes().remove("first");
+ renderChild(context, right);
+ }
+ writer.endElement(HTML.DIV_ELEM);
} else {
- center.getAttributes().put("first", "first");
+ renderChild(context, left);
}
- renderChild(context, center);
- if(null != right){
- right.getAttributes().remove("first");
- renderChild(context, right);
- }
- writer.endElement(HTML.DIV_ELEM);
- } else if (columns == 1) {
- renderChild(context, center);
}
- if(null != bottom){
+ if (null != bottom) {
renderChild(context, bottom);
}
}
+
+ /**
+ * @param left
+ * @param right
+ * @param center
+ * @return
+ */
+ protected String calculateLayoutClass(UILayoutPanel left,
+ UILayoutPanel right, UILayoutPanel center) {
+ String yahooClass = "yui-g";
+ if (null != left && null != right && null != center) {
+ // We have only equal size for an three-column layout.
+ yahooClass = "yui-gb";
+ } else if(null != left && null != center){
+ String leftWidth = left.getWidth();
+ String centerWidth = center.getWidth();
+ // Calculate properly class.
+ if ("75%".equals(leftWidth)) {
+ yahooClass = "yui-gc";
+ } else if ("66%".equals(leftWidth)) {
+ yahooClass = "yui-gd";
+ }
+ }
+ return yahooClass;
+ }
}
Modified: trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
===================================================================
--- trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-04-01 22:44:20 UTC (rev 13353)
+++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-04-02 00:05:09 UTC (rev 13354)
@@ -12,10 +12,8 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.ajax4jsf.renderkit.AjaxComponentRendererBase;
import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
-import org.ajax4jsf.renderkit.html.AjaxPageRenderer;
import org.richfaces.component.UIPage;
import org.richfaces.skin.SkinFactory;
import org.richfaces.skin.Theme;
15 years
JBoss Rich Faces SVN: r13353 - in trunk/ui/fileUpload/src/main/java/org/richfaces: renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-01 18:44:20 -0400 (Wed, 01 Apr 2009)
New Revision: 13353
Modified:
trunk/ui/fileUpload/src/main/java/org/richfaces/component/UIFileUpload.java
trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
Log:
Refactoring: rich:fileUpload
Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/component/UIFileUpload.java
===================================================================
--- trunk/ui/fileUpload/src/main/java/org/richfaces/component/UIFileUpload.java 2009-04-01 22:43:30 UTC (rev 13352)
+++ trunk/ui/fileUpload/src/main/java/org/richfaces/component/UIFileUpload.java 2009-04-01 22:44:20 UTC (rev 13353)
@@ -200,11 +200,11 @@
String actionString = uploadActionEvent.getAction();
if ("progress".equals(actionString)) {
- setupProgressBarValueExpression(facesContext, uid);
Map<String, Object> sessionMap = externalContext.getSessionMap();
Map<String, Integer> requestsSizeMap = (Map<String, Integer>) sessionMap.get(FileUploadConstants.REQUEST_SIZE_BEAN_NAME);
if (requestsSizeMap != null) {
+ setupProgressBarValueExpression(facesContext, uid);
ajaxContext.setResponseData(requestsSizeMap.get(uid));
} else {
ajaxContext.setResponseData(null);
Modified: trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2009-04-01 22:43:30 UTC (rev 13352)
+++ trunk/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2009-04-01 22:44:20 UTC (rev 13353)
@@ -346,7 +346,6 @@
v = bundle2.getString(name);
ByteArrayOutputStream b = new ByteArrayOutputStream();
b.write(v.getBytes());
- b.toString("UTF-8");
} catch (Exception e) {
// no value has been found
}
@@ -526,7 +525,7 @@
body.append(component.getClientId(context));
body.append("').component.getFileSize(data);");
oncomplete.addToBody(body);
- return getActionScript(context, component, "progress", oncomplete);
+ return getActionScript(context, component, FileUploadConstants.FILE_UPLOAD_ACTION_PROGRESS, oncomplete);
}
15 years
JBoss Rich Faces SVN: r13352 - in trunk/framework/impl/src/main/java/org: richfaces/component and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-01 18:43:30 -0400 (Wed, 01 Apr 2009)
New Revision: 13352
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java
trunk/framework/impl/src/main/java/org/richfaces/component/FileUploadConstants.java
trunk/framework/impl/src/main/java/org/richfaces/context/RequestContext.java
Log:
Refactoring:
- FileUploadConstants
- RequestContext
- SelectUtils
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java 2009-04-01 21:49:08 UTC (rev 13351)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/util/SelectUtils.java 2009-04-01 22:43:30 UTC (rev 13352)
@@ -261,9 +261,9 @@
public static Converter getConverterForProperty(FacesContext facesContext, UIOutput component, String property){
Converter converter = component.getConverter();
if(converter == null){
- ValueBinding valueBinding = component.getValueBinding(property);
- if(valueBinding != null){
- Class valueType = valueBinding.getType(facesContext);
+ ValueExpression ve = component.getValueExpression(property);
+ if(ve != null){
+ Class<?> valueType = ve.getType(facesContext.getELContext());
if(valueType == null || String.class.equals(valueType) || Object.class.equals(valueType)){
//No converter needed
} else {
Modified: trunk/framework/impl/src/main/java/org/richfaces/component/FileUploadConstants.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/component/FileUploadConstants.java 2009-04-01 21:49:08 UTC (rev 13351)
+++ trunk/framework/impl/src/main/java/org/richfaces/component/FileUploadConstants.java 2009-04-01 22:43:30 UTC (rev 13352)
@@ -53,6 +53,8 @@
public static final String FILE_UPLOAD_ACTION_STOP = "richfaces_file_upload_action_stop";
+ public static final String FILE_UPLOAD_ACTION_PROGRESS = "progress";
+
private FileUploadConstants() {
//private constructor
}
Modified: trunk/framework/impl/src/main/java/org/richfaces/context/RequestContext.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/context/RequestContext.java 2009-04-01 21:49:08 UTC (rev 13351)
+++ trunk/framework/impl/src/main/java/org/richfaces/context/RequestContext.java 2009-04-01 22:43:30 UTC (rev 13352)
@@ -71,11 +71,17 @@
}
public void setAttribute(String name, Object value) {
- if (attributesMap == null) {
- attributesMap = new HashMap<String, Object>();
+ if (value != null) {
+ if (attributesMap == null) {
+ attributesMap = new HashMap<String, Object>();
+ }
+
+ attributesMap.put(name, value);
+ } else {
+ if (attributesMap != null) {
+ attributesMap.remove(name);
+ }
}
-
- attributesMap.put(name, value);
}
}
15 years
JBoss Rich Faces SVN: r13351 - trunk/ui/modal-panel/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-01 17:49:08 -0400 (Wed, 01 Apr 2009)
New Revision: 13351
Modified:
trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
https://jira.jboss.org/jira/browse/RF-6440
Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2009-04-01 17:33:51 UTC (rev 13350)
+++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2009-04-01 21:49:08 UTC (rev 13351)
@@ -54,7 +54,7 @@
</div>
<div class="dr-mpnl-panel rich-mpnl_panel" >
- <div id="#{clientId}CDiv" style="position: absolute; left: 0px; top: 0px; z-index: 9;">
+ <div id="#{clientId}CDiv" style="position: absolute; left: 0px; top: 0px; z-index: 9;" class="rich-mp-container">
<div id="#{clientId}ShadowDiv" class="dr-mpnl-shadow rich-mpnl-shadow"
style="#{component.shadowStyle}" >
@@ -113,7 +113,7 @@
<![CDATA[}]]>
</jsp:scriptlet>
- <table id="#{clientId}ContentTable" style="#{tableStyle}" border="0" cellpadding="0" cellspacing="0">
+ <table id="#{clientId}ContentTable" style="#{tableStyle}" border="0" cellpadding="0" cellspacing="0" class="rich-mp-content-table">
<jsp:scriptlet>
<![CDATA[if(component.getFacet("header")!=null && component.getFacet("header").isRendered()) {]]>
</jsp:scriptlet>
15 years
JBoss Rich Faces SVN: r13350 - in trunk/framework: impl/src/main/java/org/ajax4jsf/application and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-01 13:33:51 -0400 (Wed, 01 Apr 2009)
New Revision: 13350
Modified:
trunk/framework/api/src/main/java/org/ajax4jsf/application/StateHolder.java
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateHolder.java
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java
Log:
https://jira.jboss.org/jira/browse/RF-6647
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/application/StateHolder.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/application/StateHolder.java 2009-04-01 17:22:01 UTC (rev 13349)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/application/StateHolder.java 2009-04-01 17:33:51 UTC (rev 13350)
@@ -20,10 +20,12 @@
*/
package org.ajax4jsf.application;
+import javax.faces.context.FacesContext;
+
public interface StateHolder {
- public Object[] getState(String viewId, String sequence);
+ public Object[] getState(FacesContext context, String viewId, String sequence);
- public void saveState(String viewId, String sequence, Object state[]);
+ public void saveState(FacesContext context, String viewId, String sequence, Object state[]);
}
\ No newline at end of file
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateHolder.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateHolder.java 2009-04-01 17:22:01 UTC (rev 13349)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateHolder.java 2009-04-01 17:33:51 UTC (rev 13350)
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.io.Serializable;
-import java.lang.ref.WeakReference;
import java.util.Map;
import javax.faces.context.ExternalContext;
@@ -66,38 +65,57 @@
if (_log.isDebugEnabled()) {
_log.debug("Request for a view states holder instance");
}
- StateHolder instance = null;
- synchronized (session) {
- instance = (StateHolder) sessionMap.get(STATE_HOLDER);
- if (null == instance) {
- // Create and store in session new state holder.
- int numbersOfViewsInSession = ContextInitParameters
- .getNumbersOfViewsInSession(context);
- int numbersOfLogicalViews = ContextInitParameters
- .getNumbersOfLogicalViews(context);
- if (_log.isDebugEnabled()) {
- _log
- .debug("No AjaxStateHolder instance in session, create new for hold "
- + numbersOfViewsInSession
- + " viewId and "
- + numbersOfLogicalViews
- + " logical views for each");
+ StateHolder instance = (StateHolder) sessionMap.get(STATE_HOLDER);
+ if (instance == null) {
+ synchronized (session) {
+ instance = (StateHolder) sessionMap.get(STATE_HOLDER);
+ if (null == instance) {
+ // Create and store in session new state holder.
+ int numbersOfViewsInSession = ContextInitParameters
+ .getNumbersOfViewsInSession(context);
+ int numbersOfLogicalViews = ContextInitParameters
+ .getNumbersOfLogicalViews(context);
+ if (_log.isDebugEnabled()) {
+ _log
+ .debug("No AjaxStateHolder instance in session, create new for hold "
+ + numbersOfViewsInSession
+ + " viewId and "
+ + numbersOfLogicalViews
+ + " logical views for each");
+ }
+ instance = new AjaxStateHolder(numbersOfViewsInSession,
+ numbersOfLogicalViews);
+ sessionMap.put(STATE_HOLDER, instance);
}
- instance = new AjaxStateHolder(numbersOfViewsInSession,
- numbersOfLogicalViews);
- sessionMap.put(STATE_HOLDER, instance);
}
}
+
return instance;
}
+ /**
+ * Updates instance of AjaxStateHolder saved in session in order
+ * to force replication in clustered environment
+ *
+ * @param context
+ */
+ protected void updateInstance(FacesContext context) {
+ ExternalContext externalContext = context.getExternalContext();
+ Object session = externalContext.getSession(true);
+ Map<String, Object> sessionMap = externalContext.getSessionMap();
+
+ synchronized (session) {
+ sessionMap.put(STATE_HOLDER, this);
+ }
+ }
+
/*
* (non-Javadoc)
*
* @see org.ajax4jsf.application.StateHolder#getState(java.lang.String,
* java.lang.Object)
*/
- public Object[] getState(String viewId, String sequence) {
+ public Object[] getState(FacesContext context, String viewId, String sequence) {
if (null == viewId) {
throw new NullPointerException(
"viewId parameter for get saved view state is null");
@@ -132,7 +150,7 @@
* @see org.ajax4jsf.application.StateHolder#saveState(java.lang.String,
* java.lang.Object, java.lang.Object)
*/
- public void saveState(String viewId, String sequence, Object[] state) {
+ public void saveState(FacesContext context, String viewId, String sequence, Object[] state) {
if (null == viewId) {
throw new NullPointerException(
"viewId parameter for save view state is null");
@@ -167,6 +185,8 @@
}
}
+ //serialization is synchronized in writeObject()
+ updateInstance(context);
}
}
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2009-04-01 17:22:01 UTC (rev 13349)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2009-04-01 17:33:51 UTC (rev 13350)
@@ -453,7 +453,7 @@
String viewId, String renderKitId) {
String id = restoreLogicalViewId(context, viewId, renderKitId);
StateHolder stateHolder = getStateHolder(context);
- Object[] restoredState = stateHolder.getState(viewId, id);
+ Object[] restoredState = stateHolder.getState(context, viewId, id);
if (restoredState != null && id != null) {
context.getExternalContext().getRequestMap().put(AJAX_VIEW_SEQUENCE, id);
@@ -495,7 +495,7 @@
UIViewRoot viewRoot = context.getViewRoot();
StateHolder stateHolder = getStateHolder(context);
String id = getLogicalViewId(context);
- stateHolder.saveState(viewRoot.getViewId(), id, new Object[] {
+ stateHolder.saveState(context, viewRoot.getViewId(), id, new Object[] {
treeStructure, state });
serializedView = new Object[]{id, null};
return serializedView;
Modified: trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java
===================================================================
--- trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java 2009-04-01 17:22:01 UTC (rev 13349)
+++ trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java 2009-04-01 17:33:51 UTC (rev 13350)
@@ -66,19 +66,19 @@
Object state = new Object();
Object state2 = new Object();
StateHolder ajaxStateHolder = AjaxStateHolder.getInstance(facesContext);
- assertNull(ajaxStateHolder.getState("foo", "_id1"));
- ajaxStateHolder.saveState("foo", "_id1", new Object[]{state});
- ajaxStateHolder.saveState("foo", "_id2", new Object[]{state2});
- assertNull(ajaxStateHolder.getState("bar", "_id1"));
- assertSame(state2,ajaxStateHolder.getState("foo",null));
- assertSame(state,ajaxStateHolder.getState("foo","_id1"));
- assertSame(state,ajaxStateHolder.getState("foo","_id3"));
+ assertNull(ajaxStateHolder.getState(facesContext, "foo", "_id1"));
+ ajaxStateHolder.saveState(facesContext, "foo", "_id1", new Object[]{state});
+ ajaxStateHolder.saveState(facesContext, "foo", "_id2", new Object[]{state2});
+ assertNull(ajaxStateHolder.getState(facesContext, "bar", "_id1"));
+ assertSame(state2,ajaxStateHolder.getState(facesContext, "foo",null));
+ assertSame(state,ajaxStateHolder.getState(facesContext, "foo","_id1"));
+ assertSame(state,ajaxStateHolder.getState(facesContext, "foo","_id3"));
Object state3 = new Object();
Object state4 = new Object();
- ajaxStateHolder.saveState("bar", "_id1", new Object[]{state3});
- ajaxStateHolder.saveState("bar", "_id2", new Object[]{state4});
- assertSame(state3,ajaxStateHolder.getState("bar","_id1"));
- assertSame(state,ajaxStateHolder.getState("foo","_id3"));
+ ajaxStateHolder.saveState(facesContext, "bar", "_id1", new Object[]{state3});
+ ajaxStateHolder.saveState(facesContext, "bar", "_id2", new Object[]{state4});
+ assertSame(state3,ajaxStateHolder.getState(facesContext, "bar","_id1"));
+ assertSame(state,ajaxStateHolder.getState(facesContext, "foo","_id3"));
}
15 years
JBoss Rich Faces SVN: r13349 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-04-01 13:22:01 -0400 (Wed, 01 Apr 2009)
New Revision: 13349
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java
Log:
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java 2009-04-01 17:19:20 UTC (rev 13348)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/SuggestionBoxTest.java 2009-04-01 17:22:01 UTC (rev 13349)
@@ -245,23 +245,23 @@
AssertValueEquals(inputId, "Belarus");
assertSelectedCapitals("Minsk");
- type(inputId, "Belarus,Arm");
+ typeOn(inputId, ",Arm");
waitForAjaxCompletion();
selenium.keyDown(inputId, "\\13");//enter
AssertValueEquals(inputId, "Belarus,Armenia");
assertSelectedCapitals("Minsk", "Yerevan");
- type(inputId, "Belarus[Rus");
+ typeOn(inputId, ",Rus");
waitForAjaxCompletion();
selenium.keyDown(inputId, "\\13");//enter
- AssertValueEquals(inputId, "Belarus[Russia");
- assertSelectedCapitals("Minsk", "Moscow");
+ AssertValueEquals(inputId, "Belarus,Armenia,Russia");
+ assertSelectedCapitals("Minsk" , "Yerevan" , "Moscow");
- writeStatus("@ is not supported token");
- type(inputId, "Belarus@Kaz");
- waitForAjaxCompletion();
- selenium.keyDown(inputId, "\\13");//enter
- AssertValueEquals(inputId, "Belarus@Kaz");
+// writeStatus("@ is not supported token");
+// typeOn(inputId, "@Kaz");
+// waitForAjaxCompletion();
+// selenium.keyDown(inputId, "\\13");//enter
+// AssertValueEquals(inputId, "Belarus@Kaz");
}
@Test
15 years
JBoss Rich Faces SVN: r13348 - in trunk/docs/userguide/en/src/main: resources/images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-04-01 13:19:20 -0400 (Wed, 01 Apr 2009)
New Revision: 13348
Added:
trunk/docs/userguide/en/src/main/resources/images/colorPicker_arrows.png
trunk/docs/userguide/en/src/main/resources/images/colorPicker_facets.png
trunk/docs/userguide/en/src/main/resources/images/colorPicker_init.png
trunk/docs/userguide/en/src/main/resources/images/colorPicker_rgb.png
Modified:
trunk/docs/userguide/en/src/main/docbook/included/colorPicker.xml
Log:
https://jira.jboss.org/jira/browse/RF-6581 - Definition of Custom Style Classes section
Modified: trunk/docs/userguide/en/src/main/docbook/included/colorPicker.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/colorPicker.xml 2009-04-01 16:27:48 UTC (rev 13347)
+++ trunk/docs/userguide/en/src/main/docbook/included/colorPicker.xml 2009-04-01 17:19:20 UTC (rev 13348)
@@ -90,7 +90,7 @@
component could be saved in hex or RGB color models.
You can explicitly define a color model in the
<property>
- <emphasis>"colorMode"</emphasis>
+ <emphasis>"colorMode"</emphasis>
</property>
attribute.
</para>
@@ -101,7 +101,21 @@
<![CDATA[...
<rich:colorPicker value="#{bean.color}" colorMode="rgb" />
...]]>
- </programlisting>
+ </programlisting>
+ <figure>
+ <title>
+ Usage of the
+ <property>
+ <emphasis>"colorMode"</emphasis>
+ </property>
+ attribute.
+ </title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/colorPicker_rgb.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
<para>
The
<emphasis role="bold">
@@ -123,20 +137,6 @@
<rich:colorPicker value="#{bean.color}" flat="true" />
...]]>
</programlisting>
- <figure>
- <title>
- Usage of the
- <emphasis>
- <property><flat></property>
- </emphasis>
- attribute
- </title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/colorPicker_flat.png"/>
- </imageobject>
- </mediaobject>
- </figure>
<para>
The <property><emphasis>"showEvent"</emphasis></property> attribute defines
the event that shows
@@ -163,7 +163,137 @@
with the help of the
<property><emphasis>"arrows"</emphasis></property> facet.
- </para>
-
- </section>
+ </para>
+ <programlisting role="XML">
+<![CDATA[...
+<rich:colorPicker value="#{bean.color}">
+ <f:facet name="icon">
+ <h:graphicImage value="/pages/colorPicker_ico.png" />
+ </f:facet>
+ <f:facet name="arrows">
+ <f:verbatim>
+ <div style="width: 33px; height: 5px; border: 1px solid #bed6f8; background:none;"></div>
+ </f:verbatim>
+ </f:facet>
+</rich:colorPicker>
+...]]>
+ </programlisting>
+ <figure>
+ <title>
+ Usage of the
+ <emphasis>
+ <property><icon></property>
+ </emphasis>, and <emphasis>
+ <property><arrows></property>
+ </emphasis>
+ facets
+ </title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/colorPicker_facets.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+
+ <!-- Definition of Custom Style Classes-->
+ <section>
+ <title>Definition of Custom Style Classes</title>
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
+
+ <figure>
+ <title>Classes names</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/colorPicker_cn.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <table id="colorPicker_cn_inline">
+ <title>
+ Classes names for the representation of the input field and icon containing selected color
+ </title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>.rich-colorPicker-span input</entry>
+ <entry>Defines styles for the input filed containing selected color</entry>
+ </row>
+ <row>
+ <entry>.rich-colorPicker-icon</entry>
+ <entry>Defines styles for the icon</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <table id="colorPicker_cn_widget">
+ <title>Classes names for the widget</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>.rich-colorPicker-ext</entry>
+ <entry>Defines styles for the wrapper <div> element of a widget</entry>
+ </row>
+ <row>
+ <entry>.rich-colorPicker-color</entry>
+ <entry>Defines styles for the color palette</entry>
+ </row>
+ <row>
+ <entry>.rich-colorPicker-current-color</entry>
+ <entry>Defines styles for the currently selected color</entry>
+ </row>
+ <row>
+ <entry>.rich-colorPicker-new-color</entry>
+ <entry>Defines styles for the already selected color</entry>
+ </row>
+ <row>
+ <entry>.rich-colorPicker-colors-input</entry>
+ <entry>Defines styles for the hex, RGB, and HSB input fileds</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <table id="colorPicker_cn_buttons">
+ <title>Classes names for the buttons representation</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>.rich-colorPicker-submit</entry>
+ <entry>Defines styles for the "Apply" button</entry>
+ </row>
+ <row>
+ <entry>.rich-colorPicker-cancel</entry>
+ <entry>Defines styles for the "Cancel" button</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+
+<section>
+ <title>Relevant Resources Links</title>
+ <para>
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/colorPicker.jsf?c=col...">Here</ulink>
+ you can see the example of <emphasis role="bold">
+ <property><rich:colorPicker></property> component
+ </emphasis> usage and sources for the given example. </para>
+ </section>
</section>
Added: trunk/docs/userguide/en/src/main/resources/images/colorPicker_arrows.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/colorPicker_arrows.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/userguide/en/src/main/resources/images/colorPicker_facets.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/colorPicker_facets.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/userguide/en/src/main/resources/images/colorPicker_init.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/colorPicker_init.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/userguide/en/src/main/resources/images/colorPicker_rgb.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/colorPicker_rgb.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
15 years
JBoss Rich Faces SVN: r13347 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-01 12:27:48 -0400 (Wed, 01 Apr 2009)
New Revision: 13347
Added:
trunk/framework/api/src/main/java/org/richfaces/model/ComplexTreeRowKey.java
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java
trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelKey.java
Log:
NPE in StackingTreeModel fixed
Added: trunk/framework/api/src/main/java/org/richfaces/model/ComplexTreeRowKey.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/ComplexTreeRowKey.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/model/ComplexTreeRowKey.java 2009-04-01 16:27:48 UTC (rev 13347)
@@ -0,0 +1,36 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.model;
+
+/**
+ * Marks complex tree row keys containing several segments
+ *
+ * @author Nick Belaevski
+ * @since 3.3.1
+ */
+
+public interface ComplexTreeRowKey {
+
+ public int getKeySegmentsCount();
+
+ public Object getKeySegment(int i);
+}
Modified: trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java 2009-04-01 16:20:07 UTC (rev 13346)
+++ trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java 2009-04-01 16:27:48 UTC (rev 13347)
@@ -192,7 +192,21 @@
while (hasNext) {
T segment = iterator.next();
- appendSegment(result, segment.toString());
+
+ if (segment instanceof ComplexTreeRowKey) {
+ ComplexTreeRowKey complexKey = (ComplexTreeRowKey) segment;
+
+ int segmentsCount = complexKey.getKeySegmentsCount();
+ for (int i = 0; i < segmentsCount; i++) {
+ appendSegment(result, complexKey.getKeySegment(i).toString());
+ if (i < segmentsCount - 1) {
+ result.append(AbstractTreeDataModel.SEPARATOR);
+ }
+ }
+
+ } else {
+ appendSegment(result, segment.toString());
+ }
hasNext = iterator.hasNext();
Modified: trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelKey.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelKey.java 2009-04-01 16:20:07 UTC (rev 13346)
+++ trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelKey.java 2009-04-01 16:27:48 UTC (rev 13347)
@@ -28,7 +28,7 @@
*
* @author Nick Belaevski
*/
-public class StackingTreeModelKey<T> implements Serializable {
+public class StackingTreeModelKey<T> implements Serializable, ComplexTreeRowKey {
/**
*
*/
@@ -84,4 +84,20 @@
public Object getModelKey() {
return modelKey;
}
+
+ public int getKeySegmentsCount() {
+ return 2;
+ }
+
+ public Object getKeySegment(int i) {
+ switch (i) {
+ case 0:
+ return modelId;
+ case 1:
+ return modelKey;
+
+ default:
+ throw new IllegalArgumentException(String.valueOf(i));
+ }
+ }
}
\ No newline at end of file
15 years