Author: nbelaevski
Date: 2010-05-31 18:15:59 -0400 (Mon, 31 May 2010)
New Revision: 17434
Added:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageFooterGradient.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageHeaderGradient.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PanelGradient.java
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss
Removed:
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.css
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.css
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/img/
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/BaseDescriptor.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/SampleDescriptor.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorItem.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorList.java
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/page.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/panel.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml
Log:
Added skinning bindings to richfaces-showcase
Beans in richfaces-showcase made serializable
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/BaseDescriptor.java
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/BaseDescriptor.java 2010-05-31
21:03:08 UTC (rev 17433)
+++
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/BaseDescriptor.java 2010-05-31
22:15:59 UTC (rev 17434)
@@ -1,9 +1,14 @@
package org.richfaces.demo.common.navigation;
+import java.io.Serializable;
+
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-public class BaseDescriptor {
+public class BaseDescriptor implements Serializable {
+
+ private static final long serialVersionUID = 5614594358147757458L;
+
private String id;
private String name;
private boolean newItem;
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java 2010-05-31
21:03:08 UTC (rev 17433)
+++
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java 2010-05-31
22:15:59 UTC (rev 17434)
@@ -1,17 +1,16 @@
package org.richfaces.demo.common.navigation;
-import java.io.Serializable;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
-public class DemoDescriptor extends BaseDescriptor implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = 8753024677503886789L;
+public class DemoDescriptor extends BaseDescriptor {
+
+ private static final long serialVersionUID = 6822187362271025752L;
+
private static final String BASE_SAMPLES_DIR = "/richfaces/";
+
private List<SampleDescriptor> samples;
public SampleDescriptor getSampleById(String id) {
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java 2010-05-31
21:03:08 UTC (rev 17433)
+++
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java 2010-05-31
22:15:59 UTC (rev 17434)
@@ -1,16 +1,14 @@
package org.richfaces.demo.common.navigation;
-import java.io.Serializable;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
-public class GroupDescriptor extends BaseDescriptor implements Serializable{
- /**
- *
- */
+public class GroupDescriptor extends BaseDescriptor {
+
private static final long serialVersionUID = -3481702232804120885L;
+
private List<DemoDescriptor> demos;
@XmlElementWrapper(name="demos")
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/SampleDescriptor.java
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/SampleDescriptor.java 2010-05-31
21:03:08 UTC (rev 17433)
+++
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/SampleDescriptor.java 2010-05-31
22:15:59 UTC (rev 17434)
@@ -1,12 +1,8 @@
package org.richfaces.demo.common.navigation;
-import java.io.Serializable;
-public class SampleDescriptor extends BaseDescriptor implements Serializable{
+public class SampleDescriptor extends BaseDescriptor {
- /**
- *
- */
private static final long serialVersionUID = 2704627392818039062L;
}
Added:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageFooterGradient.java
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageFooterGradient.java
(rev 0)
+++
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageFooterGradient.java 2010-05-31
22:15:59 UTC (rev 17434)
@@ -0,0 +1,27 @@
+package org.richfaces.demo.images;
+
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.geom.AffineTransform;
+
+import org.richfaces.renderkit.html.BaseGradient;
+import org.richfaces.skin.Skin;
+
+public class PageFooterGradient extends BaseGradient {
+
+ private static final int HEIGHT = 96;
+
+ public PageFooterGradient() {
+ super(1, HEIGHT, -1, Skin.HEADER_BACKGROUND_COLOR,
Skin.GENERAL_BACKGROUND_COLOR);
+ }
+
+ @Override
+ protected void paintGradient(Graphics2D g2d, Dimension dim) {
+ Dimension halfHeightDim = new Dimension();
+ halfHeightDim.setSize(dim.getWidth(), dim.getHeight() / 2);
+ super.paintGradient(g2d, halfHeightDim);
+ AffineTransform transform = new AffineTransform(1, 0, 0, -1, 0, HEIGHT);
+ g2d.transform(transform);
+ super.paintGradient(g2d, halfHeightDim);
+ }
+}
Added:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageHeaderGradient.java
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageHeaderGradient.java
(rev 0)
+++
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PageHeaderGradient.java 2010-05-31
22:15:59 UTC (rev 17434)
@@ -0,0 +1,10 @@
+package org.richfaces.demo.images;
+
+import org.richfaces.renderkit.html.BaseGradient;
+import org.richfaces.skin.Skin;
+
+public class PageHeaderGradient extends BaseGradient {
+ public PageHeaderGradient() {
+ super(1, 80, 30, Skin.HEADER_BACKGROUND_COLOR, Skin.HEADER_GRADIENT_COLOR);
+ }
+}
Added:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PanelGradient.java
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PanelGradient.java
(rev 0)
+++
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/images/PanelGradient.java 2010-05-31
22:15:59 UTC (rev 17434)
@@ -0,0 +1,10 @@
+package org.richfaces.demo.images;
+
+import org.richfaces.renderkit.html.BaseGradient;
+import org.richfaces.skin.Skin;
+
+public class PanelGradient extends BaseGradient {
+ public PanelGradient() {
+ super(30, 50, 20, Skin.HEADER_GRADIENT_COLOR, Skin.HEADER_BACKGROUND_COLOR);
+ }
+}
\ No newline at end of file
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorItem.java
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorItem.java 2010-05-31
21:03:08 UTC (rev 17433)
+++
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorItem.java 2010-05-31
22:15:59 UTC (rev 17434)
@@ -1,8 +1,12 @@
package org.richfaces.demo.tables.model.cars;
+import java.io.Serializable;
import java.math.BigDecimal;
-public class InventoryVendorItem {
+public class InventoryVendorItem implements Serializable {
+
+ private static final long serialVersionUID = -5424674835711375626L;
+
BigDecimal activity;
BigDecimal changePrice;
BigDecimal changeSearches;
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorList.java
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorList.java 2010-05-31
21:03:08 UTC (rev 17433)
+++
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/model/cars/InventoryVendorList.java 2010-05-31
22:15:59 UTC (rev 17434)
@@ -1,9 +1,12 @@
package org.richfaces.demo.tables.model.cars;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-public class InventoryVendorList {
+public class InventoryVendorList implements Serializable {
+ private static final long serialVersionUID = -6547391197128734913L;
+
private String vendor;
private List<InventoryVendorItem> vendorItems;
Deleted:
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.css
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.css 2010-05-31
21:03:08 UTC (rev 17433)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.css 2010-05-31
22:15:59 UTC (rev 17434)
@@ -1,77 +0,0 @@
-.rich-page{width:100%;}
-.body{
- background: #FFFFFF;
- margin:0px;
-}
-*{
- font-size:11px;
-}
-.header_bg{
- background-image:url(#{resource['rich/img/header_background.png']});
- border-bottom:1px solid;
- border-bottom-color:#FFFFFF;
- background-color:#BED6F8;
- background-repeat:repeat-x;
- background-position:top left;
-}
-
-.footer_bg{
- background-image:url(#{resource['rich/img/footer_background.png']});
- border-top:1px solid;
- border-top-color:#FFFFFF;
- background-color:#BED6F8;
- background-repeat:repeat-x;
- background-position:center left;
-}
-
-.menu_col{
- background:#FFFFFF;
- vertical-align:top;
- border-top:2px solid;
- border-top-color:#BED6F8;
- border-right:2px solid;
- border-right-color:#BED6F8;
- border-bottom:2px solid;
- border-bottom-color:#BED6F8;
-}
-
-.content_col{
- background:#FFFFFF;
- vertical-align:top;
- width:100%;
- border-top:2px solid;
- border-top-color:#BED6F8;
- border-bottom:2px solid;
- border-bottom-color:#BED6F8;
-}
-*.menu_col, *.content_col, *.footer_bg{
- font-family:Arial, Verdana, sans-serif ;
- color:#000000;
- font-size:11px;
-}
-*.header_content{
- font-family:Arial, Verdana, sans-serif;
- color:#000000;
- font-size:11px;
-}
-
-
-.page_size {
- width : 100%
- height : 100%
-}
-
-
-.header_content {
- margin : 0px 0px 0px 0px
- height : 95px position : relative
-}
-
-.spacer{font-size : 1px}
-
-
-.footer_bg_content {
- margin : 0px 0px 0px 0px
- height : 45px
- position : relative
-}
\ No newline at end of file
Copied:
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss (from
rev 17432,
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.css)
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss
(rev 0)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/page.ecss 2010-05-31
22:15:59 UTC (rev 17434)
@@ -0,0 +1,80 @@
+.rich-page{
+ width:100%;
+}
+
+.body {
+ background-color: '#{richSkin.generalBackgroundColor}';
+ margin: 0px;
+}
+
+* {
+ font-size: 11px;
+}
+
+.header_bg{
+ background-image:
"url(#{resource['org.richfaces.demo.images.PageHeaderGradient']})";
+ border-bottom: 1px solid #FFFFFF;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ background-repeat: repeat-x;
+ background-position: top left;
+}
+
+.footer_bg{
+ background-image:
"url(#{resource['org.richfaces.demo.images.PageFooterGradient']})";
+ border-top: 1px solid #FFFFFF;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ background-repeat:repeat-x;
+ background-position:center left;
+}
+
+.menu_col{
+ background-color: '#{richSkin.generalBackgroundColor}';
+ vertical-align:top;
+ border-top:2px solid;
+ border-top-color: '#{richSkin.panelBorderColor}';
+ border-right:2px solid;
+ border-right-color: '#{richSkin.panelBorderColor}';
+ border-bottom:2px solid;
+ border-bottom-color: '#{richSkin.panelBorderColor}';
+}
+
+.content_col{
+ background-color: '#{richSkin.generalBackgroundColor}';
+ vertical-align:top;
+ width: 100%;
+ border-top:2px solid;
+ border-top-color: '#{richSkin.panelBorderColor}';
+ border-bottom:2px solid;
+ border-bottom-color: '#{richSkin.panelBorderColor}';
+}
+*.menu_col, *.content_col, *.footer_bg {
+ font-family: Arial, Verdana, sans-serif;
+ color: '#{richSkin.generalTextColor}';
+ font-size: 11px;
+}
+*.header_content{
+ font-family: Arial, Verdana, sans-serif;
+ color: '#{richSkin.headerTextColor}';
+ font-size: 11px;
+}
+
+.page_size {
+ width: 100%;
+ height: 100%;
+}
+
+
+.header_content {
+ margin: 0px 0px 0px 0px;
+ position : relative
+}
+
+.spacer{
+ font-size : 1px;
+}
+
+.footer_bg_content {
+ margin: 0px 0px 0px 0px;
+ height: 45px;
+ position: relative;
+}
\ No newline at end of file
Deleted:
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.css
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.css 2010-05-31
21:03:08 UTC (rev 17433)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.css 2010-05-31
22:15:59 UTC (rev 17434)
@@ -1,26 +0,0 @@
-.rich-panel{
- border-width: 1px;
- border-style: solid;
- padding : 1px;
- color:#000000;
- font-family:Arial,Verdana,sans-serif;
- font-size:11px;
- background-color:#FFFFFF;
- border-color:#BED6F8;
-}
-
-.rich-panel-header{
- padding : 2px;
- border-width: 1px;
- border-style: solid;
- background-color:#BED6F8;
- border-color:#BED6F8;
- font-weight:bold;
- background-position:left top;
- background-repeat:repeat-x;
- background-image: url(#{resource['rich/img/panel_header.png']})
-}
-
-.rich-panel-body{
- padding : 10px;
-}
Copied:
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss (from
rev 17425,
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.css)
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss
(rev 0)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/css/panel.ecss 2010-05-31
22:15:59 UTC (rev 17434)
@@ -0,0 +1,27 @@
+.rich-panel{
+ border-width: 1px;
+ border-style: solid;
+ padding : 1px;
+ color: '#{richSkin.generalTextColor}';
+ font-family:Arial,Verdana,sans-serif;
+ font-size:11px;
+ background-color: '#{richSkin.generalBackgroundColor}';
+ border-color: '#{richSkin.panelBorderColor}';
+}
+
+.rich-panel-header{
+ padding : 2px;
+ border-width: 1px;
+ border-style: solid;
+ background-color: '#{richSkin.headerBackgroundColor}';
+ border-color: '#{richSkin.panelBorderColor}';
+ font-weight:bold;
+ background-position:left top;
+ background-repeat:repeat-x;
+ background-image:
"url(#{resource['org.richfaces.demo.images.PanelGradient']})";
+ color: '#{richSkin.headerTextColor}';
+}
+
+.rich-panel-body{
+ padding : 10px;
+}
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/page.xhtml
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/page.xhtml 2010-05-31
21:03:08 UTC (rev 17433)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/page.xhtml 2010-05-31
22:15:59 UTC (rev 17434)
@@ -26,7 +26,7 @@
<composite:renderFacet name="pageHeader"/>
</h:head>
<h:body>
- <h:outputStylesheet name="rich/css/page.css" />
+ <h:outputStylesheet name="rich/css/page.ecss" />
<table border="0" cellpadding="0" cellspacing="0"
class="rich-page #{cc.attrs.pageClass}">
<tbody>
<tr>
Modified:
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/panel.xhtml
===================================================================
---
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/panel.xhtml 2010-05-31
21:03:08 UTC (rev 17433)
+++
root/examples/richfaces-showcase/trunk/src/main/webapp/resources/rich/panel.xhtml 2010-05-31
22:15:59 UTC (rev 17434)
@@ -20,7 +20,7 @@
</composite:interface>
<composite:implementation>
- <h:outputStylesheet name="rich/css/panel.css" />
+ <h:outputStylesheet name="rich/css/panel.ecss" />
<div class="rich-panel #{cc.attrs.styleClass}"
id="#{cc.attrs.id}"
style="#{cc.attrs.style}"
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-05-31
21:03:08 UTC (rev 17433)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/main.xhtml 2010-05-31
22:15:59 UTC (rev 17434)
@@ -12,7 +12,7 @@
<title>Components Gallery</title>
</h:head>
<h:body>
- <h:outputStylesheet name="rich/css/page.css" />
+ <h:outputStylesheet name="rich/css/page.ecss" />
<table border="0" cellpadding="0" cellspacing="0"
class="rich-page #{cc.attrs.pageClass}">
<tbody>