You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/07/27 06:45:19 UTC
svn commit: r425978 [3/9] - in
/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal:
renderkit/core/skin/ renderkit/html/layout/ renderkit/htmlBasic/ skin/ ui/
ui/action/...
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/BeanAdapterUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/BeanAdapterUtils.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/BeanAdapterUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/BeanAdapterUtils.java Wed Jul 26 23:44:58 2006
@@ -22,7 +22,7 @@
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.DataObject;
import org.apache.myfaces.trinidadinternal.ui.data.DataObjectList;
import org.apache.myfaces.trinidadinternal.ui.data.MutableDataObject;
@@ -108,7 +108,7 @@
* RenderingContext's error log.
*/
static public DataObject getAdapter(
- RenderingContext context,
+ UIXRenderingContext context,
Object instance)
{
try
@@ -133,7 +133,7 @@
* Creates a DataObjectList adapter class around an object.
*/
static public DataObjectList getAdapterList(
- RenderingContext context, Object listInstance)
+ UIXRenderingContext context, Object listInstance)
{
if (listInstance == null)
return null;
@@ -182,13 +182,13 @@
_map = map;
}
- public Object selectValue(RenderingContext context, Object select)
+ public Object selectValue(UIXRenderingContext context, Object select)
{
return _map.get(select);
}
public void updateValue(
- RenderingContext context,
+ UIXRenderingContext context,
Object select,
Object value)
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/IntrospectionAdapter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/IntrospectionAdapter.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/IntrospectionAdapter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bean/IntrospectionAdapter.java Wed Jul 26 23:44:58 2006
@@ -35,7 +35,7 @@
import org.apache.myfaces.trinidadinternal.share.expl.Coercions;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.MutableDataObject;
/**
@@ -97,7 +97,7 @@
_instance = instance;
}
- public Object selectValue(RenderingContext context, Object select)
+ public Object selectValue(UIXRenderingContext context, Object select)
{
Object instance = _instance;
if ((instance == null) || (select == null))
@@ -110,7 +110,7 @@
return _classInfo.selectValue(context, select, instance);
}
- public void updateValue(RenderingContext context, Object select, Object value) {
+ public void updateValue(UIXRenderingContext context, Object select, Object value) {
Object instance = _instance;
if ((instance != null) && (select != null))
@@ -282,7 +282,7 @@
}
public Object selectValue(
- RenderingContext context,
+ UIXRenderingContext context,
Object select,
Object instance)
{
@@ -307,7 +307,7 @@
}
public void updateValue(
- RenderingContext context,
+ UIXRenderingContext context,
Object select,
Object value,
Object instance)
@@ -352,7 +352,7 @@
//
static private interface PropertyReader
{
- public Object readProperty(RenderingContext context, Object instance)
+ public Object readProperty(UIXRenderingContext context, Object instance)
throws IllegalAccessException;
}
@@ -362,7 +362,7 @@
static private interface PropertyWriter
{
public void writeProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object instance,
Object value) throws IllegalAccessException;
}
@@ -378,7 +378,7 @@
_method = method;
}
- public Object readProperty(RenderingContext context, Object instance)
+ public Object readProperty(UIXRenderingContext context, Object instance)
throws IllegalAccessException
{
try
@@ -409,7 +409,7 @@
}
public void writeProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object instance,
Object value) throws IllegalAccessException
{
@@ -442,14 +442,14 @@
_field = field;
}
- public Object readProperty(RenderingContext context, Object instance)
+ public Object readProperty(UIXRenderingContext context, Object instance)
throws IllegalAccessException
{
return _field.get(instance);
}
public void writeProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object instance,
Object value) throws IllegalAccessException
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AccessKeyBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AccessKeyBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AccessKeyBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AccessKeyBoundValue.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
import org.apache.myfaces.trinidadinternal.util.nls.StringUtils;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
/**
@@ -50,7 +50,7 @@
_returnAccessKey = returnAccessKey;
}
- public Object getValue(RenderingContext context)
+ public Object getValue(UIXRenderingContext context)
{
Object embeddedText = _textWithAccessKey.getValue(context);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AndBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AndBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AndBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/AndBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.data.bind;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
/**
@@ -60,7 +60,7 @@
}
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
if (_values == null || _values.length == 0)
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ComparisonBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ComparisonBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ComparisonBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ComparisonBoundValue.java Wed Jul 26 23:44:58 2006
@@ -20,7 +20,7 @@
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
/**
@@ -130,7 +130,7 @@
* Calculates the current state of the model.
*/
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
Object leftSide = _leftSideValue.getValue(context);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConcatBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConcatBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConcatBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConcatBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.data.bind;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
/**
@@ -49,7 +49,7 @@
* @param context the rendering context
*/
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
BoundValue[] values = _values;
@@ -93,7 +93,7 @@
// Optimized version if there's only one element
static private String _getValueSizeOne(
- RenderingContext context,
+ UIXRenderingContext context,
BoundValue[] values)
{
return _toString(values[0].getValue(context));
@@ -102,7 +102,7 @@
// Optimized version if there's two elements
static private String _getValueSizeTwo(
- RenderingContext context,
+ UIXRenderingContext context,
BoundValue[] values)
{
String first = _toString(values[0].getValue(context));
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ContextPropertyBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ContextPropertyBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ContextPropertyBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ContextPropertyBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.data.bind;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
/**
@@ -31,8 +31,8 @@
* Create a BoundValue that returns the result of
* calling RenderingContext.getProperty()
* <p>
- * @see org.apache.myfaces.trinidadinternal.ui.RenderingContext#getProperty
- * @see org.apache.myfaces.trinidadinternal.ui.RenderingContext#setProperty
+ * @see org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext#getProperty
+ * @see org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext#setProperty
*/
public ContextPropertyBoundValue(
String namespace,
@@ -51,7 +51,7 @@
* @param context the rendering context
*/
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
if (context == null)
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConvertBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConvertBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConvertBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ConvertBoundValue.java Wed Jul 26 23:44:58 2006
@@ -22,7 +22,7 @@
import org.apache.myfaces.trinidadinternal.share.expl.Coercions;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
/**
@@ -69,7 +69,7 @@
_class = javaType;
}
- public Object getValue(RenderingContext context)
+ public Object getValue(UIXRenderingContext context)
{
Object value = _wrapped.getValue(context);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/DefaultingBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/DefaultingBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/DefaultingBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/DefaultingBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.data.bind;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
@@ -65,7 +65,7 @@
}
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
Object value = getWrappedValue(context);
@@ -81,7 +81,7 @@
}
protected Object getWrappedValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
return _wrapped.getValue(context);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/FixedBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/FixedBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/FixedBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/FixedBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.data.bind;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
/**
@@ -68,7 +68,7 @@
* @param context the rendering context
*/
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
return _value;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/IfBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/IfBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/IfBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/IfBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.data.bind;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
/**
@@ -86,7 +86,7 @@
* Calculates the current state of the model.
*/
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
return ((Boolean.TRUE.equals(_testValue.getValue(context)))
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/IsAgentApplicationBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/IsAgentApplicationBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/IsAgentApplicationBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/IsAgentApplicationBoundValue.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
/**
@@ -45,7 +45,7 @@
* matches what is returned from context.getAgent().getAgentApplication()
*/
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
return Boolean.valueOf(_app == context.getAgent().getAgentApplication());
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/NotBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/NotBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/NotBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/NotBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.data.bind;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
@@ -46,7 +46,7 @@
}
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
if (Boolean.TRUE.equals(_value.getValue(context)))
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/OrBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/OrBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/OrBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/OrBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.data.bind;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
@@ -61,7 +61,7 @@
}
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
if (_values == null || _values.length == 0)
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/StringExistsBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/StringExistsBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/StringExistsBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/StringExistsBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.data.bind;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
@@ -45,7 +45,7 @@
}
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
Object value = _wrapped.getValue(context);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ToStringBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ToStringBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ToStringBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/data/bind/ToStringBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.data.bind;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
@@ -68,7 +68,7 @@
}
public Object getValue(
- RenderingContext context
+ UIXRenderingContext context
)
{
Object value = _wrapped.getValue(context);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIFunctions.java Wed Jul 26 23:44:58 2006
@@ -23,7 +23,7 @@
import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.skin.Skin;
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
@@ -90,7 +90,7 @@
public static String hyphenate(UIImplicitObject uix,
String text, String breakChars)
{
- RenderingContext rc = uix.getRenderingContext();
+ UIXRenderingContext rc = uix.getRenderingContext();
int agentApp = rc.getAgent().getAgentApplication();
@@ -169,7 +169,7 @@
if (name != null)
{
// Get the Icon from the Skin
- RenderingContext context = uix.getRenderingContext();
+ UIXRenderingContext context = uix.getRenderingContext();
AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
FacesContext fContext = context.getFacesContext();
Skin skin = context.getSkin();
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIImplicitObject.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIImplicitObject.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIImplicitObject.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIImplicitObject.java Wed Jul 26 23:44:58 2006
@@ -25,7 +25,7 @@
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
import org.apache.myfaces.trinidadinternal.ui.data.DataObject;
import org.apache.myfaces.trinidadinternal.ui.data.DataObjectList;
@@ -55,7 +55,7 @@
/**
* Gets the current RenderingContext.
*/
- public final RenderingContext getRenderingContext()
+ public final UIXRenderingContext getRenderingContext()
{
return _varResolver.getRenderingContext();
}
@@ -65,7 +65,7 @@
*/
public final Object getCurrent()
{
- RenderingContext context = getRenderingContext();
+ UIXRenderingContext context = getRenderingContext();
DataObject currentData = context.getCurrentDataObject();
return adapt(currentData);
}
@@ -146,7 +146,7 @@
public Object get(Object key)
{
- RenderingContext context = getRenderingContext();
+ UIXRenderingContext context = getRenderingContext();
return adapt(context.getDataObject("" /*namespace*/,
key.toString()));
}
@@ -161,9 +161,9 @@
public Object get(Object key)
{
- RenderingContext compositeContext = getRenderingContext();
+ UIXRenderingContext compositeContext = getRenderingContext();
- RenderingContext context = compositeContext.getParentContext();
+ UIXRenderingContext context = compositeContext.getParentContext();
if (context == null)
{
_LOG.warning
@@ -232,12 +232,12 @@
_dob = dob;
}
- public Object selectValue(RenderingContext rc, Object key)
+ public Object selectValue(UIXRenderingContext rc, Object key)
{
return _dob.selectValue(rc, key);
}
- public void updateValue(RenderingContext rc, Object key, Object value)
+ public void updateValue(UIXRenderingContext rc, Object key, Object value)
{
if (_dob instanceof MutableDataObject)
((MutableDataObject) _dob).updateValue(rc, key, value);
@@ -247,7 +247,7 @@
public Object get(Object key)
{
- RenderingContext context = getRenderingContext();
+ UIXRenderingContext context = getRenderingContext();
Object value = selectValue(context, key);
//ystem.out.println("key:"+key+" value:"+value);
value = adapt(value);
@@ -256,7 +256,7 @@
public Object put(Object key, Object value)
{
- RenderingContext context = getRenderingContext();
+ UIXRenderingContext context = getRenderingContext();
Object old = selectValue(context, key);
updateValue(context, key, value);
return old;
@@ -325,7 +325,7 @@
_dol = dol;
}
- public Object selectValue(RenderingContext rc, Object key)
+ public Object selectValue(UIXRenderingContext rc, Object key)
{
return _dob.selectValue(rc, key);
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIVariableResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIVariableResolver.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIVariableResolver.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/expl/UIVariableResolver.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
import org.apache.myfaces.trinidadinternal.share.expl.ExplException;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
/**
* VariableResolver that supports UIX objects. This VariableResolver
@@ -64,7 +64,7 @@
/**
* gets the current RenderingContext
*/
- protected final RenderingContext getRenderingContext()
+ protected final UIXRenderingContext getRenderingContext()
{
return _renderingContext;
}
@@ -77,13 +77,13 @@
return _uiObjects.adapt(value);
}
- final void __setRenderingContext(RenderingContext rc)
+ final void __setRenderingContext(UIXRenderingContext rc)
{
_renderingContext = rc;
}
- private RenderingContext _renderingContext = null;
+ private UIXRenderingContext _renderingContext = null;
private final UIImplicitObject _uiObjects;
/**
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLElementRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLElementRenderer.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLElementRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLElementRenderer.java Wed Jul 26 23:44:58 2006
@@ -22,7 +22,7 @@
import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
import org.apache.myfaces.trinidadinternal.ui.ElementRenderer;
import org.apache.myfaces.trinidadinternal.ui.Renderer;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -49,7 +49,7 @@
* @param node the current node
*/
protected String getElementName(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
)
{
@@ -60,7 +60,7 @@
* Renders all attributes of the current node.
*/
protected void renderAttributes(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
) throws IOException
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLWebBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLWebBean.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLWebBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/html/HTMLWebBean.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
import org.apache.myfaces.trinidadinternal.ui.BaseMutableUINode;
import org.apache.myfaces.trinidadinternal.ui.Renderer;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -84,7 +84,7 @@
* HTMLElementRenderer.
*/
public Renderer getRenderer(
- RenderingContext context,
+ UIXRenderingContext context,
UINode dataNode
)
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeel.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeel.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeel.java Wed Jul 26 23:44:58 2006
@@ -29,7 +29,7 @@
* to vary based on the target Agent or a user preference.
*
* @see LookAndFeelManager
- * @see org.apache.myfaces.trinidadinternal.ui.RenderingContext#getLookAndFeel
+ * @see org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext#getLookAndFeel
*
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/laf/LookAndFeel.java#0 $) $Date: 10-nov-2005.18:50:30 $
* @author The Oracle ADF Faces Team
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelManager.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
import java.util.ArrayList;
import org.apache.myfaces.trinidadinternal.share.config.Configuration;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIExtension;
import org.apache.myfaces.trinidadinternal.ui.laf.base.desktop.BaseDesktopUtils;
import org.apache.myfaces.trinidadinternal.ui.laf.simple.desktop.SimpleDesktopUtils;
@@ -78,7 +78,7 @@
* Gets the LookAndFeel for the specified RenderingContext.
*/
public LookAndFeel getLookAndFeel(
- RenderingContext context
+ UIXRenderingContext context
)
{
synchronized (_scorersAndLafs)
@@ -270,7 +270,7 @@
// Computes the total score
static private int _score(
- RenderingContext context,
+ UIXRenderingContext context,
String lafName,
LookAndFeelScorer scorer
)
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelScorer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelScorer.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelScorer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/LookAndFeelScorer.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.laf;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
/**
* The LookAndFeelScorer is responsible for producing a score that is
@@ -74,7 +74,7 @@
* Score.DONT_CARE_MATCH for the name score.
*/
public abstract Score scoreLookAndFeel(
- RenderingContext context,
+ UIXRenderingContext context,
String lafName
);
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameAndAgentScorer.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
/**
* Scores a LAF based on the Laf name and the agent information.
@@ -54,7 +54,7 @@
* based on the required name and Agent information.
*/
public Score scoreLookAndFeel(
- RenderingContext context,
+ UIXRenderingContext context,
String lafName
)
{
@@ -88,7 +88,7 @@
* @deprecated Subclassers should override scoreLookAndFeel() instead.
*/
public int score(
- RenderingContext context,
+ UIXRenderingContext context,
String lafName
)
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameOnlyScorer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameOnlyScorer.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameOnlyScorer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/NameOnlyScorer.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
/**
* NameScoreProxyr delegates to another LookAndFeelScorer instance
@@ -58,7 +58,7 @@
* the look and feel family name.
*/
public Score scoreLookAndFeel(
- RenderingContext context,
+ UIXRenderingContext context,
String lafName
)
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java Wed Jul 26 23:44:58 2006
@@ -25,7 +25,7 @@
import org.apache.myfaces.trinidadinternal.share.config.Configuration;
import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
import org.apache.myfaces.trinidadinternal.ui.ElementRenderer;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.data.DataObject;
@@ -48,7 +48,7 @@
implements UIConstants, BaseLafConstants
{
protected Object getShortDesc(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
)
{
@@ -57,7 +57,7 @@
protected Object getID(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
)
{
@@ -66,7 +66,7 @@
protected boolean isDisabled(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
)
{
@@ -78,7 +78,7 @@
protected void renderURIAttribute(
- RenderingContext context,
+ UIXRenderingContext context,
String name,
Object value
) throws IOException
@@ -90,7 +90,7 @@
}
protected void renderURIID(
- RenderingContext context,
+ UIXRenderingContext context,
Object idObject
) throws IOException
{
@@ -104,7 +104,7 @@
* Renders the id of the UINode
*/
protected void renderID(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
) throws IOException
{
@@ -119,7 +119,7 @@
* Renders the id of the UINode
*/
protected final void renderID(
- RenderingContext context,
+ UIXRenderingContext context,
Object idObject,
boolean isSubID
) throws IOException
@@ -135,7 +135,7 @@
* the name.
*/
protected Object getNodeName(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
)
{
@@ -147,7 +147,7 @@
* Returns the name of the node, transformed for the given context
*/
protected Object getTransformedName(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
)
{
@@ -164,7 +164,7 @@
}
protected UINode getNamedChild(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
String name
)
@@ -179,7 +179,7 @@
protected boolean hasNamedChild(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
String name
)
@@ -188,7 +188,7 @@
}
protected boolean hasRenderedNamedChild(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
String name
)
@@ -206,7 +206,7 @@
* Gets a property stored on the context, using the BLAF namespace.
*/
protected static Object getRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key
)
{
@@ -218,7 +218,7 @@
* Gets a property stored on the context, using the Marlin namespace.
*/
protected static Object getRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key,
Object defaultValue
)
@@ -227,7 +227,7 @@
}
protected static int getRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key,
int defaultValue
)
@@ -249,7 +249,7 @@
* Stores a property on the context, using the BLAF namespace.
*/
protected static void setRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key,
Object value
)
@@ -265,7 +265,7 @@
* Returns null if this lookup was unsuccessful.
*/
public static UIComponent getUIComponent(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
)
{
@@ -275,7 +275,7 @@
return component;
// Else look up its ancestors.
- RenderingContext rContext = context.getParentContext();
+ UIXRenderingContext rContext = context.getParentContext();
while(rContext != null)
{
component = rContext.getAncestorNode(0).getUIComponent();
@@ -294,7 +294,7 @@
* @see #popRenderingProperty
*/
protected static void pushAttributeAsRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attrKey)
{
@@ -308,7 +308,7 @@
* @see #popRenderingProperty
*/
protected static void pushRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key,
Object value)
{
@@ -322,7 +322,7 @@
* @see #popRenderingProperty
*/
protected static void pushRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key,
Object localKey,
Object value)
@@ -337,7 +337,7 @@
* @see #pushRenderingProperty
*/
protected static void popRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key)
{
BaseLafUtils.popRenderingProperty(context, key);
@@ -350,7 +350,7 @@
* @see #pushRenderingProperty
*/
protected static void popRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key,
Object localKey)
{
@@ -375,7 +375,7 @@
* Render the text stored as a text attribute.
*/
protected final void renderText(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
) throws IOException
{
@@ -394,7 +394,7 @@
* if no value exists for the attribute on this node.
*/
protected static Object getAttributeValue(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attributeKey,
Object defaultValue
@@ -411,7 +411,7 @@
}
protected static boolean getBooleanAttributeValue(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attributeKey,
Boolean defaultValue
@@ -425,7 +425,7 @@
protected static boolean getBooleanAttributeValue(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attributeKey,
boolean defaultValue
@@ -441,7 +441,7 @@
protected static int getIntAttributeValue(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attributeKey,
int defaultValue
@@ -460,7 +460,7 @@
}
protected static DataObject getDataObjectAttributeValue(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attributeKey)
{
@@ -470,7 +470,7 @@
protected static DataObjectList getDataObjectListAttributeValue(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attributeKey)
{
@@ -494,7 +494,7 @@
}
protected static boolean isRightToLeft(
- RenderingContext context
+ UIXRenderingContext context
)
{
return context.getLocaleContext().getReadingDirection() ==
@@ -507,7 +507,7 @@
* Logs a severe message if there is a MissingResourceException.
*/
public static String getTranslatedString(
- RenderingContext context,
+ UIXRenderingContext context,
String key
)
{
@@ -519,7 +519,7 @@
* Logs a severe message if there is a MissingResourceException.
*/
public static Object getTranslatedValue(
- RenderingContext context,
+ UIXRenderingContext context,
String key
)
{
@@ -531,7 +531,7 @@
* the FastMessageFormat on the RenderingContext.
*/
protected String formatString(
- RenderingContext context,
+ UIXRenderingContext context,
String pattern,
String[] parameters
)
@@ -543,7 +543,7 @@
* Returns true if this node is selected.
*/
protected static boolean isSelected(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
)
{
@@ -585,7 +585,7 @@
* containing form is used
*/
protected String getFormName(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
)
{
@@ -593,7 +593,7 @@
}
public static String getParentFormName(
- RenderingContext context
+ UIXRenderingContext context
)
{
return BaseLafUtils.getParentFormName(context);
@@ -611,7 +611,7 @@
}
- public static String getBaseImageURI(RenderingContext context)
+ public static String getBaseImageURI(UIXRenderingContext context)
{
// See if we've cached off the URI
String baseImageURI = (String)context.getProperty(MARLIN_NAMESPACE,
@@ -637,7 +637,7 @@
}
public static String getIconURI(
- RenderingContext context,
+ UIXRenderingContext context,
IconKey iconKey
)
{
@@ -666,7 +666,7 @@
// Returns the absolute URI based on the Configuration
// IMAGES_DIRECTORY if the specified uri is relative.
public static String getAbsoluteImageURI(
- RenderingContext context,
+ UIXRenderingContext context,
String uri
)
{
@@ -693,11 +693,11 @@
* @param url the URL to encode. this must be a String object
* @return the encoded form of the URL, by calling the encodeURL method
* in the URLEncoder
- * @see RenderingContext#getURLEncoder()
+ * @see UIXRenderingContext#getURLEncoder()
* @see org.apache.myfaces.trinidadinternal.share.url.URLEncoder#encodeURL(String)
*/
protected static String encodeURL(
- RenderingContext context,
+ UIXRenderingContext context,
Object url
)
{
@@ -734,7 +734,7 @@
}
protected void renderEncodedURIAttribute(
- RenderingContext context,
+ UIXRenderingContext context,
String name,
Object value) throws IOException
{
@@ -750,7 +750,7 @@
* Returns the Agent capability specified by the key
*/
protected static Object getAgentCapability(
- RenderingContext context,
+ UIXRenderingContext context,
CapabilityKey key
)
{
@@ -762,7 +762,7 @@
* Returns true iff the specified agent capability is true
*/
protected static boolean getBooleanAgentCapability(
- RenderingContext context,
+ UIXRenderingContext context,
CapabilityKey key
)
{
@@ -773,7 +773,7 @@
* Returns true if the agent supports a full dom
*/
public static boolean supportsFullDOM(
- RenderingContext context
+ UIXRenderingContext context
)
{
return (AdfFacesAgent.DOM_CAP_LEVEL_2 ==
@@ -784,7 +784,7 @@
* Returns true if the agent supports the id attribute
*/
public static boolean supportsID(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_ID);
@@ -794,7 +794,7 @@
* Returns true if the agent supports the xmldom
*/
public static boolean supportsXMLDOM(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_XMLDOM);
@@ -805,7 +805,7 @@
* Returns true if the agent supports access keys
*/
public static boolean supportsAccessKeys(
- RenderingContext context
+ UIXRenderingContext context
)
{
if (isScreenReaderMode(context))
@@ -820,7 +820,7 @@
* See section 5.4.1 of xhtml modularization.
*/
public static boolean supportsTextPresentation(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_TEXT_PRESENTATION);
@@ -832,7 +832,7 @@
* See section 5.5.2 of xhtml modularization.
*/
public static boolean supportsAdvancedForms(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_ADVANCED_FORMS);
@@ -845,7 +845,7 @@
* See section 5.6.2 of xhtml modularization.
*/
public static boolean supportsAdvancedTables(
- RenderingContext context
+ UIXRenderingContext context
)
{
return (AdfFacesAgent.TABLES_CAP_ADVANCED ==
@@ -859,7 +859,7 @@
* See section 5.11 of xhtml modularization.
*/
public static boolean supportsFrames(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_FRAMES);
@@ -873,7 +873,7 @@
* See section 5.12 of xhtml modularization.
*/
public static boolean supportsTarget(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_TARGET);
@@ -886,7 +886,7 @@
* See section 5.13 of xhtml modularization.
*/
public static boolean supportsIframes(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_IFRAMES);
@@ -902,7 +902,7 @@
* See section 5.14 of xhtml modularization.
*/
public static boolean supportsIntrinsicEvents(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_INTRINSIC_EVENTS);
@@ -915,7 +915,7 @@
* See section 5.16 of xhtml modularization
*/
public static boolean supportsScripting(
- RenderingContext context
+ UIXRenderingContext context
)
{
@@ -931,7 +931,7 @@
* Returns true if the agent supports opening multiple windows
*/
public static boolean supportsMultipleWindows(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_MULTIPLE_WINDOWS);
@@ -947,7 +947,7 @@
* See section 5.18 of xhtml modularization
*/
public static boolean supportsStyleAttributes(
- RenderingContext context
+ UIXRenderingContext context
)
{
return (getAgentCapability(context, AdfFacesAgent.CAP_STYLE_ATTRIBUTES) !=
@@ -959,7 +959,7 @@
* Returns true if the CSS class attribute is supported.
*/
public static boolean supportsClassAttribute(
- RenderingContext context
+ UIXRenderingContext context
)
{
return (getAgentCapability(context, AdfFacesAgent.CAP_STYLE_ATTRIBUTES) ==
@@ -972,7 +972,7 @@
* take a space separated list of style selectors
*/
public static boolean supportsMultipleCssSelectors(
- RenderingContext context
+ UIXRenderingContext context
)
{
return (getAgentCapability(context, AdfFacesAgent.CAP_CSS_SELECTORS) ==
@@ -984,7 +984,7 @@
* Returns true if navigation is supported.
*/
public static boolean supportsNavigation(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_NAVIGATION);
@@ -995,7 +995,7 @@
* Returns true if editing is supported.
*/
public static boolean supportsEditing(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_EDITING);
@@ -1007,7 +1007,7 @@
* See section 5.21 of xhtml modularization
*/
public static boolean supportsNameIdentification(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_NAME_IDENTIFICATION);
@@ -1017,7 +1017,7 @@
* Returns true if the agent supports rendering disabled form elements
*/
public static boolean supportsDisabledFormElements(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context,
@@ -1028,7 +1028,7 @@
* Returns true if the agent supports rendering autocomplete form elements
*/
public static boolean supportsAutoCompleteFormElements(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context,
@@ -1039,7 +1039,7 @@
* Returns true if the agent supports rendering readonly form elements
*/
public static boolean supportsReadOnlyFormElements(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context,
@@ -1050,7 +1050,7 @@
* Returns true if the browser supports rendering of fieldset element.
*/
public static boolean supportsFieldSetElement(
- RenderingContext context
+ UIXRenderingContext context
)
{
return getBooleanAgentCapability(context, AdfFacesAgent.CAP_FIELDSET);
@@ -1059,7 +1059,7 @@
/**
* @return true if we are in inaccessible mode
*/
- public static boolean isInaccessibleMode(RenderingContext context)
+ public static boolean isInaccessibleMode(UIXRenderingContext context)
{
return AccessibilityMode.isInaccessibleMode(context.getConfiguration());
}
@@ -1067,7 +1067,7 @@
/**
* @return true if we are in screen reader mode
*/
- public static boolean isScreenReaderMode(RenderingContext context)
+ public static boolean isScreenReaderMode(UIXRenderingContext context)
{
return AccessibilityMode.isScreenReaderMode(context.getConfiguration());
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java Wed Jul 26 23:44:58 2006
@@ -43,7 +43,7 @@
import org.apache.myfaces.trinidadinternal.style.StyleMap;
import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.composite.PoppedAttributeBoundValue;
@@ -99,7 +99,7 @@
* Returns the attribute as a String
*/
public static String getStringAttributeValue(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey key
)
@@ -114,7 +114,7 @@
* Returns the name of the current parent form
*/
public static String getParentFormName(
- RenderingContext context
+ UIXRenderingContext context
)
{
return (String)context.getProperty(MARLIN_NAMESPACE, FORM_NAME_PROPERTY);
@@ -127,7 +127,7 @@
* is not set, then the name of the containing form is used
*/
public static String getSubmitFormName(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
)
{
@@ -159,7 +159,7 @@
public static boolean isRightToLeft(
- RenderingContext context
+ UIXRenderingContext context
)
{
return context.getLocaleContext().getReadingDirection() ==
@@ -170,7 +170,7 @@
public static Object getTransformedID(
- RenderingContext context,
+ UIXRenderingContext context,
Object idObject,
boolean isSubID
)
@@ -195,7 +195,7 @@
* @param name the local name of the ancestor being sought
*/
public static UINode getRenderedAncestorByName(
- RenderingContext context,
+ UIXRenderingContext context,
UINode child,
String namespaceURI,
String name
@@ -239,7 +239,7 @@
* Gets a property stored on the context, using the BLAF namespace.
*/
public static Object getRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key
)
{
@@ -250,7 +250,7 @@
* Gets a property stored on the context, using the Marlin namespace.
*/
public static Object getRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key,
Object defaultValue
)
@@ -264,7 +264,7 @@
* Stores a property on the context, using the BLAF namespace.
*/
public static void setRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key,
Object value
)
@@ -280,7 +280,7 @@
* @see #popRenderingProperty
*/
public static void pushAttributeAsRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attrKey)
{
@@ -298,7 +298,7 @@
* @see #popRenderingProperty
*/
public static void pushAttributeAsStringRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attrKey)
{
@@ -315,7 +315,7 @@
* @see #popRenderingProperty
*/
public static void pushRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key,
Object value)
{
@@ -329,7 +329,7 @@
* @see #popRenderingProperty
*/
public static void pushRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key,
Object localKey,
Object value)
@@ -352,7 +352,7 @@
* @see #pushRenderingProperty
*/
public static void popRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key)
{
popRenderingProperty(context, key, key);
@@ -365,7 +365,7 @@
* @see #pushRenderingProperty
*/
public static void popRenderingProperty(
- RenderingContext context,
+ UIXRenderingContext context,
Object key,
Object localKey)
{
@@ -382,7 +382,7 @@
* the result
*/
public static Object getLocalAttribute(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attrKey
)
@@ -407,7 +407,7 @@
* the result
*/
public static String getLocalTextAttribute(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attrKey
)
@@ -444,7 +444,7 @@
* the result
*/
public static boolean getLocalBooleanAttribute(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey attrKey,
boolean defaultValue
@@ -475,7 +475,7 @@
* the result
*/
public static UINode getLocalNamedChild(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
String childName
)
@@ -517,7 +517,7 @@
* Generates an ID that will be unique in the current rendering
* context.
*/
- public static String generateUniqueID(RenderingContext context)
+ public static String generateUniqueID(UIXRenderingContext context)
{
// We use MutableInt instead of an Integer because
// we're out of range for IntegerUtils; this way, we're at
@@ -554,7 +554,7 @@
return new String(buffer);
}
- private static int _getUniqueIDStartingCount(RenderingContext context)
+ private static int _getUniqueIDStartingCount(UIXRenderingContext context)
{
if (UIConstants.FACET_PORTLET.equals(
context.getRendererManager().getFacet()) ||
@@ -567,7 +567,7 @@
static public char getCharacterAttr(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
AttributeKey key)
{
@@ -608,12 +608,12 @@
* used instead.
*/
public static String getConfiguredURL(
- RenderingContext context,
+ UIXRenderingContext context,
Object directoryKey)
{
Configuration config = context.getConfiguration();
String contextURI = (String)context.getProperty(MARLIN_NAMESPACE,
- RenderingContext.CONTEXT_URI_PROPERTY);
+ UIXRenderingContext.CONTEXT_URI_PROPERTY);
String baseURL = config.getURI(directoryKey,
contextURI);
@@ -632,7 +632,7 @@
* from ADF Faces jar, and dynamic resources from temp cache directory.
*/
private static String _generateDesignTimeURL(
- RenderingContext context,
+ UIXRenderingContext context,
String baseURL
)
{
@@ -890,7 +890,7 @@
/**
* Gets the character encoding of the output.
*/
- public static String getOutputEncoding(RenderingContext context)
+ public static String getOutputEncoding(UIXRenderingContext context)
{
return context.getFacesContext().getResponseWriter().getCharacterEncoding();
}
@@ -900,7 +900,7 @@
* the FastMessageFormat on the RenderingContext.
*/
public static String getFormattedString(
- RenderingContext context,
+ UIXRenderingContext context,
String pattern,
String[] parameters
)
@@ -929,7 +929,7 @@
* getBackgroundColor().
*/
public static void pushStyleAttrs(
- RenderingContext context,
+ UIXRenderingContext context,
String styleClass,
Style inlineStyle
)
@@ -940,7 +940,7 @@
/**
* Pops the style attributes stack.
*/
- public static void popStyleAttrs(RenderingContext context)
+ public static void popStyleAttrs(UIXRenderingContext context)
{
_getStyleStack(context).pop();
}
@@ -948,13 +948,13 @@
/**
* Returns the current background color.
*/
- public static Color getBackgroundColor(RenderingContext context)
+ public static Color getBackgroundColor(UIXRenderingContext context)
{
return _getStyleStack(context).getBackgroundColor(context);
}
// Convenience method to pull the StyleStack off of the RenderingContext
- private static StyleStack _getStyleStack(RenderingContext context)
+ private static StyleStack _getStyleStack(UIXRenderingContext context)
{
StyleStack stack = (StyleStack)getRenderingProperty(context,
_STYLE_STACK_KEY);
@@ -1019,7 +1019,7 @@
}
// Returns the current background color
- public Color getBackgroundColor(RenderingContext context)
+ public Color getBackgroundColor(UIXRenderingContext context)
{
// Short-circuit if the top entry already has a background
// color set.
@@ -1063,7 +1063,7 @@
// returned. Otherwise, the entry is not changed and null
// is returned.
private static Color _resolveBackground(
- RenderingContext context,
+ UIXRenderingContext context,
Entry entry
)
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ChildRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ChildRenderer.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ChildRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ChildRenderer.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
import org.apache.myfaces.trinidadinternal.ui.BaseRenderer;
import org.apache.myfaces.trinidadinternal.ui.Renderer;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -38,7 +38,7 @@
* Override to not render any surrounding element tag
*/
protected String getElementName(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
)
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ColorizedIconProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ColorizedIconProvider.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ColorizedIconProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ColorizedIconProvider.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
/**
* Abstracts out the retrieval of colorized icons given icon keys
@@ -33,7 +33,7 @@
* by the iconKey
*/
public ImageProviderResponse getColorizedIcon(
- RenderingContext context,
+ UIXRenderingContext context,
IconKey iconKey);
@@ -43,7 +43,7 @@
* Returns the URI to the icon indentified by the icon key
*/
public String getColorizedIconURI(
- RenderingContext context,
+ UIXRenderingContext context,
IconKey iconKey
);
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ColorizedLafIconProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ColorizedLafIconProvider.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ColorizedLafIconProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/ColorizedLafIconProvider.java Wed Jul 26 23:44:58 2006
@@ -17,7 +17,7 @@
import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
/**
* Abstracts out the retrieval of ImageProviderResponses for
@@ -35,7 +35,7 @@
* by the iconKey
*/
public abstract ImageProviderResponse getColorizedIcon(
- RenderingContext context,
+ UIXRenderingContext context,
IconKey iconKey);
@@ -45,7 +45,7 @@
* Returns the URI to the icon indentified by the icon key
*/
public String getColorizedIconURI(
- RenderingContext context,
+ UIXRenderingContext context,
IconKey iconKey
)
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/IconURIBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/IconURIBoundValue.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/IconURIBoundValue.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/IconURIBoundValue.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.laf.base;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
/**
@@ -38,7 +38,7 @@
* @return a string that is a concatenation of the cabo base image URI
* and the icon filename.
*/
- public Object getValue(RenderingContext context)
+ public Object getValue(UIXRenderingContext context)
{
return BaseLafRenderer.getBaseImageURI(context) + _icon;
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/InstallLafIconProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/InstallLafIconProvider.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/InstallLafIconProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/InstallLafIconProvider.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.laf.base;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
/**
* Abstracts out the retrieval of icons
@@ -130,7 +130,7 @@
* Returns the URI to the icon indentified by the icon key
*/
public String getIconURI(
- RenderingContext context,
+ UIXRenderingContext context,
IconKey iconKey
)
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/LafIconProvider.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/LafIconProvider.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/LafIconProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/LafIconProvider.java Wed Jul 26 23:44:58 2006
@@ -15,7 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.laf.base;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.share.config.Configuration;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
@@ -33,7 +33,7 @@
* Returns the URI to the icon indentified by the icon key
*/
public abstract String getIconURI(
- RenderingContext context,
+ UIXRenderingContext context,
IconKey iconKey
);
@@ -41,7 +41,7 @@
* Returns the URI to the image cache
*/
public static String getCacheImageURI(
- RenderingContext context
+ UIXRenderingContext context
)
{
// See if we've cached off the URI
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/NodeRoleUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/NodeRoleUtils.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/NodeRoleUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/NodeRoleUtils.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
import java.io.IOException;
import org.apache.myfaces.trinidadinternal.ui.NodeRole;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.path.Path;
@@ -36,7 +36,7 @@
* If no children are structural, returns null.
*/
static public NodeRole getStructuralRole(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node)
{
NodeRole role = node.getNodeRole(context);
@@ -64,14 +64,14 @@
* that is, skip over any nodes that just change state,
* like DataScopeBean or SwitcherBean.
*/
- static public UINode getStructuralAncestor(RenderingContext context)
+ static public UINode getStructuralAncestor(UIXRenderingContext context)
{
return _getStructuralAncestor(context, 1);
}
static private UINode _getStructuralAncestor(
- RenderingContext context,
+ UIXRenderingContext context,
int depth)
{
UINode ancestor;
@@ -101,7 +101,7 @@
static private class FindRole implements TreeWalker
{
public Object walkNode(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
Object previousValue,
Path path)
@@ -117,7 +117,7 @@
}
public boolean walkChildren(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node,
Object value,
Path path)
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/NullRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/NullRenderer.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/NullRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/NullRenderer.java Wed Jul 26 23:44:58 2006
@@ -18,7 +18,7 @@
import java.io.IOException;
import org.apache.myfaces.trinidadinternal.ui.Renderer;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -36,7 +36,7 @@
* Render nothing.
*/
public void render(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node
) throws IOException
{
@@ -44,14 +44,14 @@
}
public void prerender(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node) throws IOException
{
// do nothing
}
public void postrender(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node) throws IOException
{
// do nothing
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/PreAndPostRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/PreAndPostRenderer.java?rev=425978&r1=425977&r2=425978&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/PreAndPostRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/PreAndPostRenderer.java Wed Jul 26 23:44:58 2006
@@ -16,7 +16,7 @@
package org.apache.myfaces.trinidadinternal.ui.laf.base;
import java.io.IOException;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
/**
@@ -30,10 +30,10 @@
public interface PreAndPostRenderer
{
public void prerender(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node) throws IOException;
public void postrender(
- RenderingContext context,
+ UIXRenderingContext context,
UINode node) throws IOException;
}