You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jl...@apache.org on 2006/04/07 21:50:40 UTC
svn commit: r392372 - in /myfaces/tomahawk/trunk/sandbox/core/src/main:
java/org/apache/myfaces/custom/fisheye/ tld/entities/
Author: jlust
Date: Fri Apr 7 12:50:37 2006
New Revision: 392372
URL: http://svn.apache.org/viewcvs?rev=392372&view=rev
Log:
added the conservativeTrigger attribute
Modified:
myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenu.java
myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuRenderer.java
myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuTag.java
myfaces/tomahawk/trunk/sandbox/core/src/main/tld/entities/html_fisheyelist_attributes.xml
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenu.java?rev=392372&r1=392371&r2=392372&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenu.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenu.java Fri Apr 7 12:50:37 2006
@@ -42,6 +42,7 @@
public static final String VERTICAL_ORIENTATION = "vertical";
private String _attachEdge;
+ private Boolean _conservativeTrigger;
private Integer _effectUnits;
private Integer _itemHeight;
private Integer _itemMaxHeight;
@@ -67,6 +68,16 @@
}
+ public Boolean getConservativeTrigger()
+ {
+ if (_conservativeTrigger != null)
+ {
+ return _conservativeTrigger;
+ }
+ ValueBinding vb = getValueBinding("conservativeTrigger");
+ return vb != null ? (Boolean) vb.getValue(getFacesContext()) : null;
+ }
+
public Integer getEffectUnits()
{
if (_effectUnits != null)
@@ -168,6 +179,7 @@
_itemPadding = (Integer) values[7];
_attachEdge = (String) values[8];
_labelEdge = (String) values[9];
+ _conservativeTrigger = (Boolean) values[10];
}
/**
@@ -175,7 +187,7 @@
*/
public Object saveState(FacesContext context)
{
- Object[] values = new Object[12];
+ Object[] values = new Object[11];
values[0] = super.saveState(context);
values[1] = _itemWidth;
values[2] = _itemHeight;
@@ -186,12 +198,18 @@
values[7] = _itemPadding;
values[8] = _attachEdge;
values[9] = _labelEdge;
+ values[10] = _conservativeTrigger;
return values;
}
public void setAttachEdge(String attachEdge)
{
this._attachEdge = attachEdge;
+ }
+
+ public void setConservativeTrigger(Boolean conservativeTrigger)
+ {
+ this._conservativeTrigger = conservativeTrigger;
}
public void setEffectUnits(Integer effectUnits)
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuRenderer.java?rev=392372&r1=392371&r2=392372&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuRenderer.java Fri Apr 7 12:50:37 2006
@@ -56,6 +56,7 @@
public static final String ITEM_WIDTH_ATTR = "dojo:itemWidth";
public static final String LABEL_EDGE_ATTR = "dojo:labelEdge";
public static final String ORIENTATION_ATTR = "dojo:orientation";
+ public static final String CONSERVATIVE_TRIGGER_ATTR = "dojo:conservativeTrigger";
public static final String RENDERER_TYPE = "org.apache.myfaces.FishEyeList";
/**
@@ -114,6 +115,8 @@
.getAttachEdge());
writeAttribute(writer, fisheye, LABEL_EDGE_ATTR, fisheye
.getLabelEdge());
+ writeAttribute(writer, fisheye, CONSERVATIVE_TRIGGER_ATTR, fisheye
+ .getConservativeTrigger());
}
}
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuTag.java?rev=392372&r1=392371&r2=392372&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuTag.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/fisheye/HtmlFishEyeNavigationMenuTag.java Fri Apr 7 12:50:37 2006
@@ -30,6 +30,7 @@
public class HtmlFishEyeNavigationMenuTag extends DivTag
{
private String _attachEdge;
+ private String _conservativeTrigger;
private String _effectUnits;
private String _itemHeight;
private String _itemMaxHeight;
@@ -49,6 +50,11 @@
return HtmlFishEyeNavigationMenu.COMPONENT_TYPE;
}
+ public String getConservativeTrigger()
+ {
+ return _conservativeTrigger;
+ }
+
public String getEffectUnits()
{
return _effectUnits;
@@ -113,6 +119,11 @@
this._attachEdge = attachEdge;
}
+ public void setConservativeTrigger(String conservativeTrigger)
+ {
+ this._conservativeTrigger = conservativeTrigger;
+ }
+
public void setEffectUnits(String effectUnits)
{
this._effectUnits = effectUnits;
@@ -265,6 +276,19 @@
else
{
fisheye.setOrientation(_orientation);
+ }
+ }
+ if (_conservativeTrigger != null)
+ {
+ if (isValueReference(_conservativeTrigger))
+ {
+ fisheye.setValueBinding("conservativeTrigger", app
+ .createValueBinding(_conservativeTrigger));
+ }
+ else
+ {
+ fisheye.setConservativeTrigger(Boolean
+ .valueOf(_conservativeTrigger));
}
}
}
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/tld/entities/html_fisheyelist_attributes.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/sandbox/core/src/main/tld/entities/html_fisheyelist_attributes.xml?rev=392372&r1=392371&r2=392372&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/tld/entities/html_fisheyelist_attributes.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/tld/entities/html_fisheyelist_attributes.xml Fri Apr 7 12:50:37 2006
@@ -52,3 +52,10 @@
<rtexprvalue>false</rtexprvalue>
<type>java.lang.String</type>
</attribute>
+ <attribute>
+ <name>conservativeTrigger</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>java.lang.Boolean</type>
+ </attribute>
+
\ No newline at end of file