JBoss Rich Faces SVN: r6077 - in trunk/ui/dataTable/src/main: java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-02-14 08:34:34 -0500 (Thu, 14 Feb 2008)
New Revision: 6077
Modified:
trunk/ui/dataTable/src/main/config/component/column.xml
trunk/ui/dataTable/src/main/config/component/dataTable.xml
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
RF-1741
Modified: trunk/ui/dataTable/src/main/config/component/column.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/column.xml 2008-02-14 13:27:08 UTC (rev 6076)
+++ trunk/ui/dataTable/src/main/config/component/column.xml 2008-02-14 13:34:34 UTC (rev 6077)
@@ -90,6 +90,11 @@
<classname>java.util.Comparator</classname>
<description></description>
</property>
+ <property>
+ <name>selfSorted</name>
+ <classname>boolean</classname>
+ <description></description>
+ </property>
<property elonly="true">
<name>filterExpression</name>
Modified: trunk/ui/dataTable/src/main/config/component/dataTable.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/dataTable.xml 2008-02-14 13:27:08 UTC (rev 6076)
+++ trunk/ui/dataTable/src/main/config/component/dataTable.xml 2008-02-14 13:34:34 UTC (rev 6077)
@@ -173,5 +173,10 @@
<description>HTML: a script expression; a pointer is moved within of row
</description>
</property>
+ <property>
+ <name>sortPriority</name>
+ <classname>java.util.List</classname>
+ <description></description>
+ </property>
</component>
</components>
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-14 13:27:08 UTC (rev 6076)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-14 13:34:34 UTC (rev 6077)
@@ -170,21 +170,24 @@
writer.writeAttribute("id", clientId, null);
if (column.getValueExpression("comparator") != null
|| column.getValueExpression("sortExpression") != null) {
- UIComponent table = column.getParent();
- String id = table.getClientId(context);
- JSFunction ajaxFunction = AjaxRendererUtils
- .buildAjaxFunction(table, context);
- Map eventOptions = AjaxRendererUtils.buildEventOptions(
- context, table);
- Map parameters = (Map) eventOptions.get("parameters");
- parameters.put(id, SORT_FILTER_PARAMETER);
- parameters.put(SORT_FILTER_PARAMETER, column
- .getClientId(context));
- ajaxFunction.addParameter(eventOptions);
- StringBuffer buffer = new StringBuffer();
- ajaxFunction.appendScript(buffer);
- writer.writeAttribute(HTML.onclick_ATTRIBUTE, buffer
- .toString(), null);
+ StringBuffer buffer;
+ if (col.isSelfSorted()) {
+ UIComponent table = column.getParent();
+ String id = table.getClientId(context);
+ JSFunction ajaxFunction = AjaxRendererUtils
+ .buildAjaxFunction(table, context);
+ Map eventOptions = AjaxRendererUtils.buildEventOptions(
+ context, table);
+ Map parameters = (Map) eventOptions.get("parameters");
+ parameters.put(id, SORT_FILTER_PARAMETER);
+ parameters.put(SORT_FILTER_PARAMETER, column
+ .getClientId(context));
+ ajaxFunction.addParameter(eventOptions);
+ buffer = new StringBuffer();
+ ajaxFunction.appendScript(buffer);
+ writer.writeAttribute(HTML.onclick_ATTRIBUTE, buffer
+ .toString(), null);
+ }
if (Ordering.ASCENDING.equals(col.getSortOrder())) {
writer.writeAttribute(HTML.style_ATTRIBUTE,
"background-color: red", null);
@@ -497,8 +500,11 @@
column.setSortOrder(Ordering.ASCENDING);
}
}
- children.getAttributes().put("filterValue",
- map.get(children.getClientId(context) + SORT_FILTER_PARAMETER));
+ String filterValue = map.get(children.getClientId(context) + SORT_FILTER_PARAMETER);
+ if (filterValue != null) {
+ children.getAttributes()
+ .put("filterValue", filterValue);
+ }
}
}
18 years, 2 months
JBoss Rich Faces SVN: r6076 - trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-02-14 08:27:08 -0500 (Thu, 14 Feb 2008)
New Revision: 6076
Modified:
trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp
Log:
RF-1748
Modified: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp 2008-02-14 13:14:53 UTC (rev 6075)
+++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp 2008-02-14 13:27:08 UTC (rev 6076)
@@ -16,7 +16,7 @@
</f:facet>
<h:outputText value="#{issue.key.value}"></h:outputText>
</dt:column>
- <dt:column filterBy="#{issue.summary}" sortExpression="#{issues.summary}">
+ <dt:column sortExpression="#{issue.summary}">
<f:facet name="header">
<h:outputText value="Summary"></h:outputText>
</f:facet>
18 years, 2 months
JBoss Rich Faces SVN: r6075 - in trunk: ui/scrollableDataTable/src/test/java/org/richfaces/component/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-02-14 08:14:53 -0500 (Thu, 14 Feb 2008)
New Revision: 6075
Modified:
trunk/framework/api/src/main/java/org/richfaces/component/Column.java
trunk/ui/scrollableDataTable/src/test/java/org/richfaces/component/html/MockColumns.java
Log:
RF-1741
Modified: trunk/framework/api/src/main/java/org/richfaces/component/Column.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/component/Column.java 2008-02-14 12:21:05 UTC (rev 6074)
+++ trunk/framework/api/src/main/java/org/richfaces/component/Column.java 2008-02-14 13:14:53 UTC (rev 6075)
@@ -76,5 +76,7 @@
public abstract void setFilterValue(String filterValue);
public abstract String getFilterValue();
-
+
+ public abstract boolean isSelfSorted();
+ public abstract void setSelfSorted(boolean selfSorted);
}
Modified: trunk/ui/scrollableDataTable/src/test/java/org/richfaces/component/html/MockColumns.java
===================================================================
--- trunk/ui/scrollableDataTable/src/test/java/org/richfaces/component/html/MockColumns.java 2008-02-14 12:21:05 UTC (rev 6074)
+++ trunk/ui/scrollableDataTable/src/test/java/org/richfaces/component/html/MockColumns.java 2008-02-14 13:14:53 UTC (rev 6075)
@@ -105,4 +105,14 @@
// TODO Auto-generated method stub
}
+
+ public boolean isSelfSorted() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void setSelfSorted(boolean selfSorted) {
+ // TODO Auto-generated method stub
+
+ }
}
18 years, 2 months
JBoss Rich Faces SVN: r6074 - management/design/columnSortFilterFeatures.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-02-14 07:21:05 -0500 (Thu, 14 Feb 2008)
New Revision: 6074
Modified:
management/design/columnSortFilterFeatures/FuncSpec - Sorting Feature.doc
Log:
Modified: management/design/columnSortFilterFeatures/FuncSpec - Sorting Feature.doc
===================================================================
(Binary files differ)
18 years, 2 months
JBoss Rich Faces SVN: r6073 - management/design/fileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-02-14 07:09:05 -0500 (Thu, 14 Feb 2008)
New Revision: 6073
Modified:
management/design/fileUpload/Func Spec - File Upload Component.doc
Log:
Modified: management/design/fileUpload/Func Spec - File Upload Component.doc
===================================================================
(Binary files differ)
18 years, 2 months
JBoss Rich Faces SVN: r6072 - in trunk/sandbox/ui/inplaceInput/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-14 06:41:29 -0500 (Thu, 14 Feb 2008)
New Revision: 6072
Modified:
trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx
Log:
new shadow
Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-02-14 09:12:40 UTC (rev 6071)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-02-14 11:41:29 UTC (rev 6072)
@@ -124,25 +124,25 @@
<u:selector name=".rich-inplace-shadow-tl">
<u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow"/>
+ <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/>
</u:style>
</u:selector>
<u:selector name=".rich-inplace-shadow-tr">
<u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow"/>
+ <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/>
</u:style>
</u:selector>
<u:selector name=".rich-inplace-shadow-bl">
<u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow"/>
+ <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/>
</u:style>
</u:selector>
<u:selector name=".rich-inplace-shadow-br">
<u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.images.ComboBoxListShadow"/>
+ <f:resource f:key="/org/richfaces/renderkit/html/images/bg_shadow.png"/>
</u:style>
</u:selector>
Modified: trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-14 09:12:40 UTC (rev 6071)
+++ trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-14 11:41:29 UTC (rev 6072)
@@ -16,7 +16,7 @@
new org.ajax4jsf.javascript.PrototypeScript(),
scripts/inplaceinput.js
</h:scripts>
- <f:resource var="saveIcon" name="org.richfaces.renderkit.images.OkControlIcon"/>
+ <f:resource var="saveIcon" name="org.richfaces.renderkit.images.saveControlIcon"/>
<f:resource var="cancelIcon" name="org.richfaces.renderkit.images.CancelControlIcon"/>
<f:resource var="spacer" name="images/spacer.gif"/>
18 years, 2 months
JBoss Rich Faces SVN: r6071 - management/design/progressBar.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-02-14 04:12:40 -0500 (Thu, 14 Feb 2008)
New Revision: 6071
Modified:
management/design/progressBar/Func-Spec-ProgressBar.doc
Log:
Modified: management/design/progressBar/Func-Spec-ProgressBar.doc
===================================================================
(Binary files differ)
18 years, 2 months
JBoss Rich Faces SVN: r6070 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-02-13 14:43:45 -0500 (Wed, 13 Feb 2008)
New Revision: 6070
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer/examples/spacers.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-2243
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer/examples/spacers.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer/examples/spacers.xhtml 2008-02-13 18:40:44 UTC (rev 6069)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer/examples/spacers.xhtml 2008-02-13 19:43:45 UTC (rev 6070)
@@ -4,14 +4,23 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
+
+ <style>
+ .div_near_spacer {
+ height: 2px;
+ border: 0px;
+ font-size: 0px;
+ background-color: #{a4jSkin.panelBorderColor};
+ }
+ </style>
<p>
There is a spacer 100x10<rich:spacer width="100" height="10" title="Here is a spacer..."/>before this.
</p>
<p>
There is 1x5 spacer between two lines below:
- <div style="height:0px; border:1px solid #{a4jSkin.panelBorderColor}"/>
+ <div class="div_near_spacer" />
<rich:spacer width="1" height="5" title="Here is a spacer..."/>
- <div style="height:0px; border:1px solid #{a4jSkin.panelBorderColor}"/>
+ <div class="div_near_spacer" />
</p>
</ui:composition>
\ No newline at end of file
18 years, 2 months
JBoss Rich Faces SVN: r6069 - in trunk/ui/dataTable/src/main/java/org/richfaces: renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-02-13 13:40:44 -0500 (Wed, 13 Feb 2008)
New Revision: 6069
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
RF-1741
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2008-02-13 18:37:42 UTC (rev 6068)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2008-02-13 18:40:44 UTC (rev 6069)
@@ -166,8 +166,6 @@
@Override
protected ExtendedDataModel createDataModel() {
- ExpressionFactory factory = FacesContext.getCurrentInstance().getApplication().getExpressionFactory();
- ELContext context = FacesContext.getCurrentInstance().getELContext();
List<FilterField> filterFields = new LinkedList<FilterField>();
List<SortField2> sortFields = new LinkedList<SortField2>();
List<UIComponent> list = getChildren();
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-13 18:37:42 UTC (rev 6068)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-13 18:40:44 UTC (rev 6069)
@@ -41,6 +41,7 @@
import org.richfaces.component.Column;
import org.richfaces.component.Row;
import org.richfaces.component.UIDataTable;
+import org.richfaces.model.Ordering;
/**
* @author shura
@@ -48,7 +49,7 @@
*/
public abstract class AbstractTableRenderer extends AbstractRowsRenderer {
- private static final String FILTER_PARAMETER_VALUE = "f";
+ private static final String SORT_FILTER_PARAMETER = "fsp";
/**
* Encode all table structure - colgroups definitions, caption, header,
@@ -167,6 +168,31 @@
(org.richfaces.component.UIColumn) column;
String clientId = col.getClientId(context) + facetName;
writer.writeAttribute("id", clientId, null);
+ if (column.getValueExpression("comparator") != null
+ || column.getValueExpression("sortExpression") != null) {
+ UIComponent table = column.getParent();
+ String id = table.getClientId(context);
+ JSFunction ajaxFunction = AjaxRendererUtils
+ .buildAjaxFunction(table, context);
+ Map eventOptions = AjaxRendererUtils.buildEventOptions(
+ context, table);
+ Map parameters = (Map) eventOptions.get("parameters");
+ parameters.put(id, SORT_FILTER_PARAMETER);
+ parameters.put(SORT_FILTER_PARAMETER, column
+ .getClientId(context));
+ ajaxFunction.addParameter(eventOptions);
+ StringBuffer buffer = new StringBuffer();
+ ajaxFunction.appendScript(buffer);
+ writer.writeAttribute(HTML.onclick_ATTRIBUTE, buffer
+ .toString(), null);
+ if (Ordering.ASCENDING.equals(col.getSortOrder())) {
+ writer.writeAttribute(HTML.style_ATTRIBUTE,
+ "background-color: red", null);
+ } else if (Ordering.DESCENDING.equals(col.getSortOrder())) {
+ writer.writeAttribute(HTML.style_ATTRIBUTE,
+ "background-color: green", null);
+ }
+ }
}
UIComponent facet = column.getFacet(facetName);
@@ -182,13 +208,13 @@
JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(table, context);
Map eventOptions = AjaxRendererUtils.buildEventOptions(context, table);
Map parameters = (Map) eventOptions.get("parameters");
- parameters.put(id, FILTER_PARAMETER_VALUE);
+ parameters.put(id, SORT_FILTER_PARAMETER);
ajaxFunction.addParameter(eventOptions);
StringBuffer buffer = new StringBuffer();
ajaxFunction.appendScript(buffer);
writer.startElement(HTML.INPUT_ELEM, column);
writer.writeAttribute(HTML.TYPE_ATTR, "text", null);
- writer.writeAttribute(HTML.NAME_ATTRIBUTE, column.getClientId(context) + FILTER_PARAMETER_VALUE, null);
+ writer.writeAttribute(HTML.NAME_ATTRIBUTE, column.getClientId(context) + SORT_FILTER_PARAMETER, null);
writer.writeAttribute(HTML.value_ATTRIBUTE, column.getAttributes().get("filterValue"), null);
writer.writeAttribute(HTML.onchange_ATTRIBUTE, buffer.toString(), null);
writer.endElement(HTML.INPUT_ELEM);
@@ -455,14 +481,24 @@
@Override
protected void doDecode(FacesContext context, UIComponent component) {
Map<String, String> map = context.getExternalContext().getRequestParameterMap();
- if (FILTER_PARAMETER_VALUE.equals(map.get(component.getClientId(context)))) {
+ if (SORT_FILTER_PARAMETER.equals(map.get(component.getClientId(context)))) {
+ String id = map.get(SORT_FILTER_PARAMETER);
List<UIComponent> list = component.getChildren();
for (Iterator<UIComponent> iterator = list.iterator(); iterator
.hasNext();) {
UIComponent children = iterator.next();
- if (children instanceof org.richfaces.component.UIColumn) {
+ if (children instanceof Column) {
+ Column column = (Column) children;
+ children.setId(children.getId());
+ if(children.getClientId(context).equals(id)) {
+ if(Ordering.ASCENDING.equals(column.getSortOrder())) {
+ column.setSortOrder(Ordering.DESCENDING);
+ } else {
+ column.setSortOrder(Ordering.ASCENDING);
+ }
+ }
children.getAttributes().put("filterValue",
- map.get(children.getClientId(context) + FILTER_PARAMETER_VALUE));
+ map.get(children.getClientId(context) + SORT_FILTER_PARAMETER));
}
}
18 years, 2 months
JBoss Rich Faces SVN: r6068 - in trunk/sandbox/ui/inplaceInput/src/main: java/org/richfaces/renderkit/images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-13 13:37:42 -0500 (Wed, 13 Feb 2008)
New Revision: 6068
Added:
trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/saveControlIcon.java
Removed:
trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/OkControlIcon.java
Modified:
trunk/sandbox/ui/inplaceInput/src/main/config/resources/resource-config.xml
Log:
rename okIcon --> saveIcon, apply new shadow image
Modified: trunk/sandbox/ui/inplaceInput/src/main/config/resources/resource-config.xml
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/config/resources/resource-config.xml 2008-02-13 17:47:33 UTC (rev 6067)
+++ trunk/sandbox/ui/inplaceInput/src/main/config/resources/resource-config.xml 2008-02-13 18:37:42 UTC (rev 6068)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resource-config>
- <resource class="org.richfaces.renderkit.images.OkControlIcon">
- <name>org.richfaces.renderkit.images.OkControlIcon</name>
+ <resource class="org.richfaces.renderkit.images.saveControlIcon">
+ <name>org.richfaces.renderkit.images.saveControlIcon</name>
</resource>
<resource class="org.richfaces.renderkit.images.EditIcon">
<name>org.richfaces.renderkit.images.EditIcon</name>
@@ -15,7 +15,4 @@
<resource class="org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient">
<name>org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient</name>
</resource>
- <resource class="org.richfaces.renderkit.html.images.ComboBoxListShadow">
- <name>org.richfaces.renderkit.html.images.ComboBoxListShadow</name>
- </resource>
</resource-config>
\ No newline at end of file
Deleted: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/OkControlIcon.java
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/OkControlIcon.java 2008-02-13 17:47:33 UTC (rev 6067)
+++ trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/OkControlIcon.java 2008-02-13 18:37:42 UTC (rev 6068)
@@ -1,125 +0,0 @@
-/**
- *
- */
-package org.richfaces.renderkit.images;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.util.Date;
-
-import javax.faces.context.FacesContext;
-
-import org.ajax4jsf.resource.GifRenderer;
-import org.ajax4jsf.resource.InternetResourceBuilder;
-import org.ajax4jsf.resource.Java2Dresource;
-import org.ajax4jsf.resource.ResourceContext;
-import org.ajax4jsf.util.HtmlColor;
-import org.ajax4jsf.util.Zipper2;
-
-/**
- * implementation of the default OK icon renderer
- * @author Anton Belevich
- * @since 3.2.0
- *
- */
-public class OkControlIcon extends Java2Dresource {
-
- protected static final String ICON_COLOR = "#5BC248";
- protected static final String ICON_SHADOW = "#006406";
- protected static final String ICON_BORDER = "#FFFFFF";
-
- private static final Dimension dimensions = new Dimension(11, 11);
-
- public Dimension getDimensions(FacesContext facesContext, Object data) {
- return dimensions;
- }
-
-
- protected Dimension getDimensions(ResourceContext resourceContext) {
- return dimensions;
- }
- public OkControlIcon() {
- setRenderer(new GifRenderer());
- setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
- }
-
- protected Object deserializeData(byte[] objectArray) {
- if (objectArray == null) {
- return null;
- }
- Zipper2 zipper = new Zipper2(objectArray);
- return new Color[] {zipper.nextColor(), zipper.nextColor(), zipper.nextColor()};
- }
-
- protected Object getDataToStore(FacesContext context, Object data){
-
- byte [] ret = new byte[9];
-
- Color color = null;
- Zipper2 zipper = new Zipper2(ret);
-
- color = HtmlColor.decode(ICON_COLOR);
- zipper.addColor(color);
-
- color = HtmlColor.decode(ICON_SHADOW);
- zipper.addColor(color);
-
- color = HtmlColor.decode(ICON_BORDER);
- zipper.addColor(color);
-
- return ret;
- }
-
- protected void paint(ResourceContext context, Graphics2D g2d) {
- Color [] data = (Color[]) restoreData(context);
-
- Color iconColor = data[0];
- Color iconShadow = data[1];
- Color borderColor = data[2];
-
- g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
- g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE);
- g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
- g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
- g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
- g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
-
- g2d.setColor(iconColor);
- g2d.drawLine(1, 6, 4, 9);
- g2d.drawLine(4, 9, 4, 8);
- g2d.drawLine(4, 8, 2, 6);
- g2d.drawLine(2, 5, 5, 8);
- g2d.drawLine(5, 8, 5, 6);
- g2d.drawLine(5, 6, 9, 2);
- g2d.drawLine(9, 2, 9, 3);
- g2d.drawLine(9, 3, 5, 7);
-
- //draw shadow
- g2d.setColor(iconShadow);
- g2d.drawLine(3, 5, 4, 6);
- g2d.drawLine(5, 9, 6, 8);
- g2d.drawLine(6, 8, 6, 7);
- g2d.drawLine(6, 7, 9, 4);
-
- // draw border
- g2d.setColor(borderColor);
- g2d.drawLine(0, 6, 4, 10);
- g2d.drawLine(4, 10, 5,10);
- g2d.drawLine(5,10,7,8);
- g2d.drawLine(7,8,7,7);
- g2d.drawLine(7,7,10,4);
- g2d.drawLine(10,4,10,1);
- g2d.drawLine(10,1,9,1);
- g2d.drawLine(9,1,5,5);
- g2d.drawLine(5,5,4,5);
- g2d.drawLine(4,5,3,4);
- g2d.drawLine(3,4,2,4);
- g2d.drawLine(2,4,0,6);
-
-
-
- }
-}
Added: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/saveControlIcon.java
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/saveControlIcon.java (rev 0)
+++ trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/saveControlIcon.java 2008-02-13 18:37:42 UTC (rev 6068)
@@ -0,0 +1,125 @@
+/**
+ *
+ */
+package org.richfaces.renderkit.images;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.util.Date;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.resource.GifRenderer;
+import org.ajax4jsf.resource.InternetResourceBuilder;
+import org.ajax4jsf.resource.Java2Dresource;
+import org.ajax4jsf.resource.ResourceContext;
+import org.ajax4jsf.util.HtmlColor;
+import org.ajax4jsf.util.Zipper2;
+
+/**
+ * implementation of the default OK icon renderer
+ * @author Anton Belevich
+ * @since 3.2.0
+ *
+ */
+public class saveControlIcon extends Java2Dresource {
+
+ protected static final String ICON_COLOR = "#5BC248";
+ protected static final String ICON_SHADOW = "#006406";
+ protected static final String ICON_BORDER = "#FFFFFF";
+
+ private static final Dimension dimensions = new Dimension(11, 11);
+
+ public Dimension getDimensions(FacesContext facesContext, Object data) {
+ return dimensions;
+ }
+
+
+ protected Dimension getDimensions(ResourceContext resourceContext) {
+ return dimensions;
+ }
+ public saveControlIcon() {
+ setRenderer(new GifRenderer());
+ setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime()));
+ }
+
+ protected Object deserializeData(byte[] objectArray) {
+ if (objectArray == null) {
+ return null;
+ }
+ Zipper2 zipper = new Zipper2(objectArray);
+ return new Color[] {zipper.nextColor(), zipper.nextColor(), zipper.nextColor()};
+ }
+
+ protected Object getDataToStore(FacesContext context, Object data){
+
+ byte [] ret = new byte[9];
+
+ Color color = null;
+ Zipper2 zipper = new Zipper2(ret);
+
+ color = HtmlColor.decode(ICON_COLOR);
+ zipper.addColor(color);
+
+ color = HtmlColor.decode(ICON_SHADOW);
+ zipper.addColor(color);
+
+ color = HtmlColor.decode(ICON_BORDER);
+ zipper.addColor(color);
+
+ return ret;
+ }
+
+ protected void paint(ResourceContext context, Graphics2D g2d) {
+ Color [] data = (Color[]) restoreData(context);
+
+ Color iconColor = data[0];
+ Color iconShadow = data[1];
+ Color borderColor = data[2];
+
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+ g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE);
+ g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
+ g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+ g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+
+ g2d.setColor(iconColor);
+ g2d.drawLine(1, 6, 4, 9);
+ g2d.drawLine(4, 9, 4, 8);
+ g2d.drawLine(4, 8, 2, 6);
+ g2d.drawLine(2, 5, 5, 8);
+ g2d.drawLine(5, 8, 5, 6);
+ g2d.drawLine(5, 6, 9, 2);
+ g2d.drawLine(9, 2, 9, 3);
+ g2d.drawLine(9, 3, 5, 7);
+
+ //draw shadow
+ g2d.setColor(iconShadow);
+ g2d.drawLine(3, 5, 4, 6);
+ g2d.drawLine(5, 9, 6, 8);
+ g2d.drawLine(6, 8, 6, 7);
+ g2d.drawLine(6, 7, 9, 4);
+
+ // draw border
+ g2d.setColor(borderColor);
+ g2d.drawLine(0, 6, 4, 10);
+ g2d.drawLine(4, 10, 5,10);
+ g2d.drawLine(5,10,7,8);
+ g2d.drawLine(7,8,7,7);
+ g2d.drawLine(7,7,10,4);
+ g2d.drawLine(10,4,10,1);
+ g2d.drawLine(10,1,9,1);
+ g2d.drawLine(9,1,5,5);
+ g2d.drawLine(5,5,4,5);
+ g2d.drawLine(4,5,3,4);
+ g2d.drawLine(3,4,2,4);
+ g2d.drawLine(2,4,0,6);
+
+
+
+ }
+}
18 years, 2 months