JBoss Rich Faces SVN: r4036 - branches/3.1.x/ui/tree/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-11-16 08:38:10 -0500 (Fri, 16 Nov 2007)
New Revision: 4036
Modified:
branches/3.1.x/ui/tree/src/main/templates/htmlTree.jspx
Log:
http://jira.jboss.com/jira/browse/RF-1364
Modified: branches/3.1.x/ui/tree/src/main/templates/htmlTree.jspx
===================================================================
--- branches/3.1.x/ui/tree/src/main/templates/htmlTree.jspx 2007-11-16 13:34:04 UTC (rev 4035)
+++ branches/3.1.x/ui/tree/src/main/templates/htmlTree.jspx 2007-11-16 13:38:10 UTC (rev 4036)
@@ -42,7 +42,7 @@
<f:call name="writeNamespace" />
<f:call name="utils.encodePassThruWithExclusions">
- <f:parameter value="id,style,class"/>
+ <f:parameter value="id,style,class,rows"/>
</f:call>
<vcp:body />
18 years, 5 months
JBoss Rich Faces SVN: r4035 - trunk/ui/tree/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-11-16 08:34:04 -0500 (Fri, 16 Nov 2007)
New Revision: 4035
Modified:
trunk/ui/tree/src/main/templates/htmlTree.jspx
Log:
http://jira.jboss.com/jira/browse/RF-1364
Modified: trunk/ui/tree/src/main/templates/htmlTree.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-11-16 12:52:31 UTC (rev 4034)
+++ trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-11-16 13:34:04 UTC (rev 4035)
@@ -42,7 +42,7 @@
<f:call name="writeNamespace" />
<f:call name="utils.encodePassThruWithExclusions">
- <f:parameter value="id,style,class"/>
+ <f:parameter value="id,style,class,rows"/>
</f:call>
<vcp:body />
18 years, 5 months
JBoss Rich Faces SVN: r4034 - trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-11-16 07:52:31 -0500 (Fri, 16 Nov 2007)
New Revision: 4034
Modified:
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java
Log:
Ordering list - added Zipper2 class to images.
Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-16 11:40:05 UTC (rev 4033)
+++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-16 12:52:31 UTC (rev 4034)
@@ -34,6 +34,7 @@
import org.ajax4jsf.resource.Java2Dresource;
import org.ajax4jsf.resource.ResourceContext;
import org.ajax4jsf.util.HtmlColor;
+import org.ajax4jsf.util.Zipper2;
import org.richfaces.skin.Skin;
import org.richfaces.skin.SkinFactory;
@@ -68,10 +69,10 @@
protected void paint(ResourceContext context, Graphics2D g2d) {
- int [] data = (int[]) restoreData(context);
- Color textColor = new Color(data[0]);
- Color backgroundColor = new Color(data[1]);
- Color borderColor = new Color(data[2]);
+ Color [] data = (Color[]) restoreData(context);
+ Color textColor = data[0];
+ Color backgroundColor = 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);
@@ -113,9 +114,10 @@
Skin skin = SkinFactory.getInstance().getSkin(context);
Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
- int [] ret = new int[3];
+ byte [] ret = new byte[9];
Color color = null;
+ Zipper2 zipper = new Zipper2(ret);
String color1 = (String) skin.getParameter(context, colorSkinParam);
if (null == color1 || "".equals(color1))
@@ -127,7 +129,7 @@
color = HtmlColor.decode(color1);
- ret[0] = color.getRGB();
+ zipper.addColor(color);
String color2 = (String) skin.getParameter(context, backgroundSkinParam);
if (null == color2 || "".equals(color2))
@@ -138,7 +140,7 @@
}
color = HtmlColor.decode(color2);
- ret[1] = color.getRGB();
+ zipper.addColor(color);
String color3 = (String) skin.getParameter(context, borderSkinParam);
if (null == color3 || "".equals(color3))
@@ -149,11 +151,22 @@
}
color = HtmlColor.decode(color3);
- ret[2] = color.getRGB();
+ zipper.addColor(color);
return ret;
}
+ @Override
+ protected Object deserializeData(byte[] objectArray) {
+ if (objectArray == null) {
+ return null;
+ }
+
+ Zipper2 zipper = new Zipper2(objectArray);
+
+ return new Color[] {zipper.nextColor(), zipper.nextColor(), zipper.nextColor()};
+ }
+
public boolean isCacheable() {
return true;
}
18 years, 5 months
JBoss Rich Faces SVN: r4033 - in trunk/ui/modal-panel/src/main: java/org/richfaces/renderkit and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-11-16 06:40:05 -0500 (Fri, 16 Nov 2007)
New Revision: 4033
Modified:
trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js
trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
add onresizing attribute
Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2007-11-16 05:14:41 UTC (rev 4032)
+++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2007-11-16 11:40:05 UTC (rev 4033)
@@ -143,6 +143,12 @@
<property>
<name>onresize</name>
<classname>java.lang.String</classname>
+ <description>Event must occurs after panel resized </description>
+ <defaultvalue><![CDATA[""]]></defaultvalue>
+ </property>
+ <property>
+ <name>onresizing</name>
+ <classname>java.lang.String</classname>
<description>Event must occurs before panel resized </description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
Modified: trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java
===================================================================
--- trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-11-16 05:14:41 UTC (rev 4032)
+++ trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-11-16 11:40:05 UTC (rev 4033)
@@ -126,6 +126,10 @@
variables.setVariable("onmove", onmove);
String onresize = ScriptUtils.toScript(panel.getAttributes().get("onresize"));
variables.setVariable("onresize", onresize);
+ String onresizing = ScriptUtils.toScript(panel.getAttributes().get("onresizing"));
+ variables.setVariable("onresizing", onresizing);
+
+
}
Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
--- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-11-16 05:14:41 UTC (rev 4032)
+++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-11-16 11:40:05 UTC (rev 4033)
@@ -221,7 +221,10 @@
this.eventOnResize = new Function("event",this.options.onresize).bindAsEventListener(this);
}
-
+ if(this.options.onresizing){
+ this.eventOnResizing = new Function("event",this.options.onresizing).bindAsEventListener(this);
+ }
+
ModalPanel.panels.push(this);
this.eventFirstOnfocus = this.firstOnfocus.bindAsEventListener(this);
Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js
===================================================================
--- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js 2007-11-16 05:14:41 UTC (rev 4032)
+++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js 2007-11-16 11:40:05 UTC (rev 4033)
@@ -83,11 +83,11 @@
if (id.indexOf('panelHeader') > 0) {
var eventOnMove = this.modalPanel.eventOnMove;
if(eventOnMove) eventOnMove(event);
- } else {
- var eventOnResize = this.modalPanel.eventOnResize;
- if(eventOnResize) eventOnResize(event);
- }
-
+ } else{
+ var eventOnResizing = this.modalPanel.eventOnResizing;
+ if(eventOnResizing) eventOnResizing(event);
+ }
+
var diff = this.sizer.doDiff(dx, dy);
var vetoes = this.modalPanel.doResizeOrMove(diff);
@@ -126,6 +126,12 @@
document.onselectstart = this.onselectStartHandler;
this.onselectStartHandler = null;
+
+ var id = this.id;
+ if (id.indexOf('panelHeader') < 0) {
+ var eventOnResize = this.modalPanel.eventOnResize;
+ if(eventOnResize) eventOnResize(event);
+ }
},
doPosition: function() {
Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-11-16 05:14:41 UTC (rev 4032)
+++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-11-16 11:40:05 UTC (rev 4033)
@@ -136,6 +136,7 @@
onhide: #{onhide},
onmove: #{onmove},
onresize: #{onresize},
+ onresizing: #{onresizing},
onbeforeshow: #{onbeforeshow},
keepVisualState: #{component.keepVisualState},
18 years, 5 months
JBoss Rich Faces SVN: r4032 - trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-16 00:14:41 -0500 (Fri, 16 Nov 2007)
New Revision: 4032
Modified:
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTop.java
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java
Log:
Updated icon images for orderingList
Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-15 20:06:03 UTC (rev 4031)
+++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-16 05:14:41 UTC (rev 4032)
@@ -42,6 +42,9 @@
*
*/
public abstract class OrderingListIconBase extends Java2Dresource {
+
+ private static final Dimension DIMENSION = new Dimension(15, 15);
+
protected static final String ICON_COLOR = "headerTextColor";
protected static final String BACKGROUND_COLOR = "headerBackgroundColor";
protected static final String BORDER_COLOR = "subBorderColor";
@@ -57,6 +60,12 @@
abstract protected void paintImage(ResourceContext context, Graphics2D g2d, Color textColor, Color borderColor);
+ protected void paintBaseTriangle(Graphics2D g2d) {
+ for (int i = 0; i < 7; i++) {
+ g2d.drawLine(-3 + i, 1, -3 + i, 1 + (i < 4 ? i : 6 - i));
+ }
+ }
+
protected void paint(ResourceContext context, Graphics2D g2d) {
int [] data = (int[]) restoreData(context);
@@ -71,30 +80,25 @@
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.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+// g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
+// g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+
/*Dimension dim = getDimensions(context);
g2d.setColor(backgroundColor);
g2d.fillRect(0, 0, dim.width, dim.height);*/
-
- Dimension dimension = getDimensions(context);
- g2d.scale(dimension.getHeight()/120,dimension.getHeight()/120);
-
if (textColor != null && backgroundColor != null && g2d != null) {
paintImage(context, g2d, textColor, borderColor);
}
}
- protected Dimension calculateDimensions(Object data){
- return new Dimension(15, 15);
- }
-
public Dimension getDimensions(FacesContext facesContext, Object data) {
- return calculateDimensions(getDataToStore(facesContext, data));
+ return DIMENSION;
}
protected Dimension getDimensions(ResourceContext resourceContext) {
- return calculateDimensions(restoreData(resourceContext));
+ return DIMENSION;
}
/**
Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java 2007-11-15 20:06:03 UTC (rev 4031)
+++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBottom.java 2007-11-16 05:14:41 UTC (rev 4032)
@@ -22,27 +22,56 @@
package org.richfaces.renderkit.html.images;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
-import javax.faces.context.FacesContext;
-
import org.ajax4jsf.resource.ResourceContext;
/**
* @author Siarhej Chalipau
*
*/
-public class OrderingListIconBottom extends OrderingListIconTop {
+public class OrderingListIconBottom extends OrderingListIconBase {
@Override
protected void paintImage(ResourceContext context, Graphics2D g2d,
Color textColor, Color borderColor) {
- g2d.transform(new AffineTransform(1., 0., 0., -1., 0., 112.));
- super.paintImage(context, g2d, textColor, borderColor);
+ g2d.translate(0, -3);
+
+ g2d.setColor(textColor);
+ g2d.translate(7, 5);
+ paintBaseTriangle(g2d);
+ g2d.translate(-7, -5);
+
+ g2d.setColor(borderColor);
+ g2d.drawLine(4, 5, 10, 5);
+ g2d.drawLine(11, 6, 8, 9);
+ g2d.drawLine(6, 9, 3, 6);
+
+ g2d.translate(0, 4);
+ g2d.setColor(textColor);
+ g2d.translate(7, 5);
+ paintBaseTriangle(g2d);
+ g2d.translate(-7, -5);
+
+ g2d.setColor(borderColor);
+ g2d.drawLine(4, 5, 6, 5);
+ g2d.drawLine(8, 5, 10, 5);
+ g2d.drawLine(11, 6, 8, 9);
+ g2d.drawLine(6, 9, 3, 6);
+
+ g2d.translate(0, 4);
+
+ g2d.setColor(borderColor);
+ g2d.drawLine(4, 5, 6, 5);
+ g2d.drawLine(8, 5, 10, 5);
+
+ g2d.drawLine(11, 6, 10, 7);
+ g2d.drawLine(4, 7, 3, 6);
+ g2d.drawLine(4, 7, 10, 7);
+
+ g2d.setColor(textColor);
+ g2d.drawLine(4, 6, 10, 6);
}
}
Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java 2007-11-15 20:06:03 UTC (rev 4031)
+++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconDown.java 2007-11-16 05:14:41 UTC (rev 4032)
@@ -22,13 +22,8 @@
package org.richfaces.renderkit.html.images;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.geom.GeneralPath;
-import javax.faces.context.FacesContext;
-
import org.ajax4jsf.resource.ResourceContext;
/**
@@ -40,22 +35,16 @@
@Override
protected void paintImage(ResourceContext context, Graphics2D g2d,
Color textColor, Color borderColor) {
- GeneralPath path = new GeneralPath();
-
- g2d.translate(15,38);
- path.moveTo(8,8);
- path.lineTo(41,41);
- path.lineTo(42,41);
- path.lineTo(75,8);
- path.closePath();
g2d.setColor(textColor);
- g2d.fill(path);
-
+ g2d.translate(7, 5);
+ paintBaseTriangle(g2d);
+ g2d.translate(-7, -5);
+
g2d.setColor(borderColor);
- g2d.drawLine(8, 8, 41, 41);
- g2d.drawLine(41, 41, 72, 8);
- g2d.drawLine(16, 0, 64, 0);
+ g2d.drawLine(4, 5, 10, 5);
+ g2d.drawLine(11, 6, 7, 10);
+ g2d.drawLine(7, 10, 3, 6);
}
}
Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTop.java
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTop.java 2007-11-15 20:06:03 UTC (rev 4031)
+++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconTop.java 2007-11-16 05:14:41 UTC (rev 4032)
@@ -22,69 +22,24 @@
package org.richfaces.renderkit.html.images;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.Graphics2D;
-import java.awt.geom.GeneralPath;
-import javax.faces.context.FacesContext;
-
import org.ajax4jsf.resource.ResourceContext;
/**
* @author Siarhej Chalipau
*
*/
-public class OrderingListIconTop extends OrderingListIconBase {
+public class OrderingListIconTop extends OrderingListIconBottom {
@Override
protected void paintImage(ResourceContext context, Graphics2D g2d,
Color textColor, Color borderColor) {
- GeneralPath path = new GeneralPath();
- g2d.setColor(textColor);
+ g2d.translate(0, 14);
+ g2d.scale(1, -1);
- // First triangle
- g2d.translate(23,23);
- path.moveTo(0,39);
- path.lineTo(33,8);
- path.lineTo(34,8);
- path.lineTo(67,39);
- path.closePath();
- g2d.fill(path);
-
- // Border or first triangle
- g2d.setColor(borderColor);
- g2d.drawLine(0, 33, 33, 0);
- g2d.drawLine(33, 0, 67, 33);
- g2d.drawLine(8, 41, 59, 41);
-
- // Second triangle
- g2d.setColor(textColor);
- g2d.translate(0,27);
- path.moveTo(0,41);
- path.lineTo(33,8);
- path.lineTo(34,8);
- path.lineTo(67,41);
- path.closePath();
- g2d.fill(path);
-
- // Border of second triangle
- g2d.setColor(borderColor);
- g2d.drawLine(0, 41, 25, 16);
- g2d.drawLine(41, 16, 67, 41);
- g2d.drawLine(8, 49, 59, 49);
-
- // Top Line and its borders.
- g2d.setColor(textColor);
- g2d.translate(-23, -50);
- g2d.drawLine(31, 22, 79, 22);
-
- g2d.setColor(borderColor);
- g2d.drawLine(31, 14, 79, 14);
- g2d.drawRect(23, 22, 1, 1);
- g2d.drawRect(87, 22, 1, 1);
- g2d.drawLine(31, 30, 39, 30);
- g2d.drawLine(79, 30, 71, 30);
+ super.paintImage(context, g2d, textColor, borderColor);
}
}
Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java 2007-11-15 20:06:03 UTC (rev 4031)
+++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconUp.java 2007-11-16 05:14:41 UTC (rev 4032)
@@ -22,39 +22,24 @@
package org.richfaces.renderkit.html.images;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.Graphics2D;
-import java.awt.geom.GeneralPath;
-import javax.faces.context.FacesContext;
-
import org.ajax4jsf.resource.ResourceContext;
/**
* @author Siarhej Chalipau
*
*/
-public class OrderingListIconUp extends OrderingListIconBase {
+public class OrderingListIconUp extends OrderingListIconDown {
@Override
protected void paintImage(ResourceContext context, Graphics2D g2d,
Color textColor, Color borderColor) {
- GeneralPath path = new GeneralPath();
-
- g2d.translate(23,31);
- path.moveTo(0,41);
- path.lineTo(33,8);
- path.lineTo(34,8);
- path.lineTo(67,41);
- path.closePath();
- g2d.setColor(textColor);
- g2d.fill(path);
+ g2d.translate(0, 14);
+ g2d.scale(1, -1);
- g2d.setColor(borderColor);
- g2d.drawLine(0, 33, 33, 0);
- g2d.drawLine(33, 0, 67, 33);
- g2d.drawLine(8, 41, 59, 41);
+ super.paintImage(context, g2d, textColor, borderColor);
}
}
18 years, 5 months
JBoss Rich Faces SVN: r4031 - in trunk/sandbox/ui/orderingList/src/main: java/org/richfaces/renderkit and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-15 15:06:03 -0500 (Thu, 15 Nov 2007)
New Revision: 4031
Modified:
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java
trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java
trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js
Log:
Latest changes for orderingList
Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-15 19:18:19 UTC (rev 4030)
+++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-11-15 20:06:03 UTC (rev 4031)
@@ -1043,6 +1043,10 @@
return activeItem != null && activeItem.equals(getRowData()) || submittedValueHolder != null && (submittedValueHolder.activeItem != null && submittedValueHolder.activeItem.equals(getTranslatedRowKey()));
}
+ public int getModelSize() {
+ return getExtendedDataModel().getRowCount();
+ }
+
public boolean isSelected() {
return selection != null && selection.contains(getRowData()) || submittedValueHolder != null && submittedValueHolder.selectedItems.contains(getTranslatedRowKey());
}
Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-15 19:18:19 UTC (rev 4030)
+++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-15 20:06:03 UTC (rev 4031)
@@ -313,14 +313,42 @@
String clientId = orderingList.getClientId(context);
ResponseWriter writer = context.getResponseWriter();
+ Object key = orderingList.getRowKey();
+ boolean selectedFirst = false;
+ boolean selectedLast = false;
+
+ try {
+ orderingList.setRowKey(new Integer(0));
+ selectedFirst = orderingList.isSelected();
+ orderingList.setRowKey(new Integer(orderingList.getModelSize() - 1));
+ selectedLast = orderingList.isSelected();
+ } finally {
+ try {
+ orderingList.setRowKey(key);
+ } catch (Exception e) {
+ context.getExternalContext().log(e.getLocalizedMessage(), e);
+ }
+ }
+
+ //proper assumption about helpers ordering
+ int divider = HELPERS.length / 2;
+
for (int i = 0; i < HELPERS.length; i++) {
+ boolean enabled = i < divider ? !selectedFirst : !selectedLast;
+ if (i % 2 == 0) {
+ enabled = !enabled;
+ }
+
if (HELPERS[i].isRendered(context, orderingList)) {
- encodeControlFacet(context, orderingList, HELPERS[i], clientId, writer);
+ //proper assumption about helpers ordering
+ encodeControlFacet(context, orderingList, HELPERS[i], clientId, writer,
+ enabled);
}
}
}
- protected void encodeControlFacet(FacesContext context, UIOrderingList orderingList, ControlsHelper helper, String clientId, ResponseWriter writer)
+ protected void encodeControlFacet(FacesContext context, UIOrderingList orderingList, ControlsHelper helper, String clientId, ResponseWriter writer,
+ boolean enabled)
throws IOException {
Locale locale = null;
@@ -371,7 +399,7 @@
if (encodeDiv) {
writer.startElement(HTML.DIV_ELEM, orderingList);
writer.writeAttribute(HTML.id_ATTRIBUTE, clientId + helper.getIdSuffix(), null); //FIXME:
- writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_border", null);
+ writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button_border " + (enabled ? "ol_control_shown" : "ol_control_hidden"), null);
writer.startElement(HTML.DIV_ELEM, orderingList);
writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_button", null);
Modified: trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-15 19:18:19 UTC (rev 4030)
+++ trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-15 20:06:03 UTC (rev 4031)
@@ -8,10 +8,10 @@
.ol_button_layout{padding : 15px 8px 15px 0px;}
.ol_button_border{border : 1px solid #bfbfc0; margin-bottom : 3px;}
-.ol_button{background : url(none) top left #C6D6EA repeat-x; cursor : pointer; padding : 2px; font-family : Arial; font-size :11px;}
-.ol_button_light{background : url(none) top left #C6D6EA repeat-x; border : 1px solid #E79A00;cursor : pointer; padding : 1px; font-family : Arial; font-size :11px;}
+.ol_button{background : none top left #C6D6EA repeat-x; cursor : pointer; padding : 2px; font-family : Arial; font-size :11px;}
+.ol_button_light{background : none top left #C6D6EA repeat-x; border : 1px solid #E79A00;cursor : pointer; padding : 1px; font-family : Arial; font-size :11px;}
.ol_button_dis{background : #bfbfc0; border : 1px solid #bfbfc0; margin-bottom : 3px; padding : 1px}
-.ol_button_press{background : url(none) top left repeat-x #EAF0F8; border : 1px solid #E79A00; padding : 2px 0px 0px 2px;font-family : Arial; font-size :11px;}
+.ol_button_press{background : none top left repeat-x #EAF0F8; border : 1px solid #E79A00; padding : 2px 0px 0px 2px;font-family : Arial; font-size :11px;}
.ol_center_button_col_valign{vertical-align : middle}
.ol_right_button_col_valign{vertical-align : middle}
.ol_button_content{font-family : Arial; font-size :11px; padding : 0px 0px 0px 0px; text-align : center;}
@@ -75,7 +75,7 @@
/*width : 100%;*/
}
-.ol_internal_header_tab th{background : url(none) top left repeat-x #C6D6EA; color : #000000; font-family : Arial; font-size :11px; font-weight : normal; border-bottom : 1px solid #bfbfc0;border-right : 1px solid #bfbfc0;border-left : 1px solid #EAF0F8;border-top : 1px solid #FFFFFF; padding : 2px}
+.ol_internal_header_tab th{background : none top left repeat-x #C6D6EA; color : #000000; font-family : Arial; font-size :11px; font-weight : normal; border-bottom : 1px solid #bfbfc0;border-right : 1px solid #bfbfc0;border-left : 1px solid #EAF0F8;border-top : 1px solid #FFFFFF; padding : 2px}
.ol_internal_header_tab .ol_endcol {
border-right : 0px;
Modified: trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js 2007-11-15 19:18:19 UTC (rev 4030)
+++ trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js 2007-11-15 20:06:03 UTC (rev 4031)
@@ -4,8 +4,8 @@
this.isShown = isShown;
this.isEnabled = isEnabled;
this.action = action;
- this.isEnabled ? this.doEnable() : this.doDisable();
- this.isShown ? this.doShow() : this.doHide();
+ //this.isEnabled ? this.doEnable() : this.doDisable();
+ //this.isShown ? this.doShow() : this.doHide();
}
Control.CLASSES = {
18 years, 5 months
JBoss Rich Faces SVN: r4030 - trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-15 14:18:19 -0500 (Thu, 15 Nov 2007)
New Revision: 4030
Modified:
trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java
Log:
ContextMenuRendererDelegate.java made compileable
Modified: trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java
===================================================================
--- trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java 2007-11-15 18:53:07 UTC (rev 4029)
+++ trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java 2007-11-15 19:18:19 UTC (rev 4030)
@@ -112,4 +112,8 @@
return UIContextMenu.class;
}
+
+ protected InternetResource[] getStyles() {
+ return super.getStyles();
+ }
}
18 years, 5 months
JBoss Rich Faces SVN: r4029 - trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-11-15 13:53:07 -0500 (Thu, 15 Nov 2007)
New Revision: 4029
Modified:
trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
Log:
inter-cells borders removed
Modified: trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-15 18:49:06 UTC (rev 4028)
+++ trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-15 18:53:07 UTC (rev 4029)
@@ -8,10 +8,10 @@
.ol_button_layout{padding : 15px 8px 15px 0px;}
.ol_button_border{border : 1px solid #bfbfc0; margin-bottom : 3px;}
-.ol_button{background : url(ol_images/bg_header.png) top left #C6D6EA repeat-x; cursor : pointer; padding : 2px; font-family : Arial; font-size :11px;}
-.ol_button_light{background : url(ol_images/bg_header.png) top left #C6D6EA repeat-x; border : 1px solid #E79A00;cursor : pointer; padding : 1px; font-family : Arial; font-size :11px;}
+.ol_button{background : url(none) top left #C6D6EA repeat-x; cursor : pointer; padding : 2px; font-family : Arial; font-size :11px;}
+.ol_button_light{background : url(none) top left #C6D6EA repeat-x; border : 1px solid #E79A00;cursor : pointer; padding : 1px; font-family : Arial; font-size :11px;}
.ol_button_dis{background : #bfbfc0; border : 1px solid #bfbfc0; margin-bottom : 3px; padding : 1px}
-.ol_button_press{background : url(ol_images/bg_press.png) top left repeat-x #EAF0F8; border : 1px solid #E79A00; padding : 2px 0px 0px 2px;font-family : Arial; font-size :11px;}
+.ol_button_press{background : url(none) top left repeat-x #EAF0F8; border : 1px solid #E79A00; padding : 2px 0px 0px 2px;font-family : Arial; font-size :11px;}
.ol_center_button_col_valign{vertical-align : middle}
.ol_right_button_col_valign{vertical-align : middle}
.ol_button_content{font-family : Arial; font-size :11px; padding : 0px 0px 0px 0px; text-align : center;}
@@ -75,7 +75,7 @@
/*width : 100%;*/
}
-.ol_internal_header_tab th{background : url(ol_images/bg_header.png) top left repeat-x #C6D6EA; color : #000000; font-family : Arial; font-size :11px; font-weight : normal; border-bottom : 1px solid #bfbfc0;border-right : 1px solid #bfbfc0;border-left : 1px solid #EAF0F8;border-top : 1px solid #FFFFFF; padding : 2px}
+.ol_internal_header_tab th{background : url(none) top left repeat-x #C6D6EA; color : #000000; font-family : Arial; font-size :11px; font-weight : normal; border-bottom : 1px solid #bfbfc0;border-right : 1px solid #bfbfc0;border-left : 1px solid #EAF0F8;border-top : 1px solid #FFFFFF; padding : 2px}
.ol_internal_header_tab .ol_endcol {
border-right : 0px;
@@ -88,7 +88,7 @@
.ol_internal_tab .ol_endcol{border-right : 0px;}
-.ol_internal_tab td{font-family : Arial; font-size :11px; border-bottom : 1px solid #bfbfc0; border-top : 1px solid #FFFFFF; padding : 2px;}
+.ol_internal_tab td{font-family : Arial; font-size :11px; padding : 2px;}
.ol_internal_tab tr.ol_select{background : #EAF0F8}
18 years, 5 months
JBoss Rich Faces SVN: r4028 - in trunk/sandbox/ui/contextMenu/src/main: java/org/richfaces/renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-11-15 13:49:06 -0500 (Thu, 15 Nov 2007)
New Revision: 4028
Modified:
trunk/sandbox/ui/contextMenu/src/main/config/component/contextMenu.xml
trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java
trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java
Log:
moved to javascript rendering
Modified: trunk/sandbox/ui/contextMenu/src/main/config/component/contextMenu.xml
===================================================================
--- trunk/sandbox/ui/contextMenu/src/main/config/component/contextMenu.xml 2007-11-15 18:48:54 UTC (rev 4027)
+++ trunk/sandbox/ui/contextMenu/src/main/config/component/contextMenu.xml 2007-11-15 18:49:06 UTC (rev 4028)
@@ -12,7 +12,7 @@
<renderer>
<name>org.richfaces.DropDownMenuRenderer</name>
- <classname>org.richfaces.renderkit.html.ContextMenuRendererDelegate</classname>
+ <classname>org.richfaces.renderkit.html.ContextMenuRendererBase</classname>
</renderer>
<tag>
<name>contextMenu</name>
Modified: trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java
===================================================================
--- trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2007-11-15 18:48:54 UTC (rev 4027)
+++ trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2007-11-15 18:49:06 UTC (rev 4028)
@@ -25,44 +25,69 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
+import org.ajax4jsf.resource.InternetResource;
import org.richfaces.renderkit.TemplateEncoderRendererBase;
/**
* @author Maksim Kaszynski
*
*/
-public abstract class ContextMenuRendererBase extends
+public class ContextMenuRendererBase extends
TemplateEncoderRendererBase {
-
private final ContextMenuRendererDelegate delegate =
new ContextMenuRendererDelegate();
+
+ private final InternetResource[] ownScripts = {
+ getResource("/org/richfaces/renderkit/html/scripts/json/json-dom.js")
+ };
+ private final InternetResource[] scripts;
+
+ public ContextMenuRendererBase() {
+ InternetResource[] delegateScripts = delegate.getScripts();
+ scripts = new InternetResource[delegateScripts.length + ownScripts.length];
+
+ System.arraycopy(delegateScripts, 0, scripts, 0, delegateScripts.length);
+ System.arraycopy(ownScripts, 0, scripts, delegateScripts.length, ownScripts.length);
+ }
+
@Override
+ protected InternetResource[] getScripts() {
+ return scripts;
+ }
+
+ @Override
+ protected InternetResource[] getStyles() {
+ return delegate.getStyles();
+ }
+
+ @Override
protected Class<? extends UIComponent> getComponentClass() {
return delegate.getComponentClass();
}
@Override
- public void encodeBegin(FacesContext context, UIComponent component)
- throws IOException {
- super.encodeBegin(context, component);
+ protected void doEncodeBegin(ResponseWriter writer, FacesContext context,
+ UIComponent component) throws IOException {
+ writer.startElement(HTML.DIV_ELEM, component);
+ writer.writeAttribute(HTML.id_ATTRIBUTE, component.getClientId(context), "id");
}
+
@Override
- public void encodeChildren(FacesContext context, UIComponent component)
+ public void renderChildren(FacesContext context, UIComponent component)
throws IOException {
- // TODO Auto-generated method stub
- super.encodeChildren(context, component);
+ delegate.encodeChildren(context, component);
}
+
@Override
- public void encodeEnd(FacesContext context, UIComponent component)
- throws IOException {
- // TODO Auto-generated method stub
- super.encodeEnd(context, component);
+ protected void doEncodeEnd(ResponseWriter writer, FacesContext context,
+ UIComponent component) throws IOException {
+ writer.endElement(HTML.DIV_ELEM);
}
-
-
}
Modified: trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java
===================================================================
--- trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java 2007-11-15 18:48:54 UTC (rev 4027)
+++ trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java 2007-11-15 18:49:06 UTC (rev 4028)
@@ -68,6 +68,7 @@
subMenuOptions.addEventHandler("onopen");
subMenuOptions.addEventHandler("onclose");
subMenuOptions.addOption("direction");
+ subMenuOptions.addOption("dummy", "dummy");
function.addParameter(subMenuOptions);
function.appendScript(buffer);
@@ -93,6 +94,8 @@
menuOptions.addEventHandler("onexpand");
menuOptions.addEventHandler("onitemselect");
menuOptions.addEventHandler("ongroupactivate");
+
+ menuOptions.addOption("dummy", "dummy");
function.addParameter(menuOptions);
function.appendScript(buffer);
18 years, 5 months
JBoss Rich Faces SVN: r4027 - trunk/framework/impl/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-11-15 13:48:54 -0500 (Thu, 15 Nov 2007)
New Revision: 4027
Modified:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java
Log:
moved to javascript rendering
Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java 2007-11-15 18:48:47 UTC (rev 4026)
+++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/MacroDefinitionJSContentHandler.java 2007-11-15 18:48:54 UTC (rev 4027)
@@ -85,6 +85,11 @@
private void encodeExpressionString(String string) throws IOException,
SAXException {
+
+ if (string.length() == 0) {
+ this.outputWriter.write("\'\'");
+ }
+
List parsedExpressiion = parseExpressiion(string);
boolean isExpression = false;
18 years, 5 months