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 03:39:51 UTC
svn commit: r425942 [14/15] - in
/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/agent/
main/java/org/apache/myfaces/trinidadinternal/agent/parse/
main/java/org/apache/m...
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StackLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StackLayoutRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StackLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StackLayoutRenderer.java Wed Jul 26 20:39:26 2006
@@ -19,6 +19,7 @@
import javax.faces.context.ResponseWriter;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java Wed Jul 26 20:39:26 2006
@@ -21,6 +21,7 @@
import org.apache.myfaces.trinidad.component.UIXValue;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SubmitButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SubmitButtonRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SubmitButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SubmitButtonRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,9 +17,10 @@
import java.io.IOException;
+import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
import org.apache.myfaces.trinidadinternal.ui.UINode;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+
import org.apache.myfaces.trinidadinternal.ui.action.ClientAction;
import org.apache.myfaces.trinidadinternal.ui.action.ClientActionUtils;
import org.apache.myfaces.trinidadinternal.ui.collection.Parameter;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TableLayoutRenderer.java Wed Jul 26 20:39:26 2006
@@ -19,6 +19,7 @@
import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TextInputRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TextInputRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TextInputRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/TextInputRenderer.java Wed Jul 26 20:39:26 2006
@@ -26,6 +26,7 @@
import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.action.ClientAction;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/UniqueCompositeId.java Wed Jul 26 20:39:26 2006
@@ -18,6 +18,7 @@
import java.util.Hashtable;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java Wed Jul 26 20:39:26 2006
@@ -17,7 +17,6 @@
import org.apache.myfaces.trinidadinternal.ui.NodeRole;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
-
import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafConstants;
/**
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,23 +16,19 @@
package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
import java.io.IOException;
-
import java.util.Iterator;
import javax.faces.component.UIComponent;
import javax.faces.context.ResponseWriter;
-
import javax.faces.convert.Converter;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
+import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
import org.apache.myfaces.trinidadinternal.image.ImageConstants;
import org.apache.myfaces.trinidadinternal.image.ImageContext;
import org.apache.myfaces.trinidadinternal.image.ImageProvider;
import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
import org.apache.myfaces.trinidadinternal.style.Style;
@@ -48,8 +44,8 @@
import org.apache.myfaces.trinidadinternal.ui.laf.base.LafIconProvider;
import org.apache.myfaces.trinidadinternal.ui.laf.base.NodeRoleUtils;
import org.apache.myfaces.trinidadinternal.ui.partial.PartialPageRendererUtils;
-
import org.apache.myfaces.trinidadinternal.util.FormattedTextParser;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
import java.io.IOException;
-
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
@@ -30,21 +29,18 @@
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.AutoSubmitUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PartialPageUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet;
-
-import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
-import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
import org.apache.myfaces.trinidadinternal.share.config.Configuration;
import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
+import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
import org.apache.myfaces.trinidadinternal.style.ParsedPropertyKey;
import org.apache.myfaces.trinidadinternal.style.Style;
import org.apache.myfaces.trinidadinternal.style.StyleContext;
@@ -53,12 +49,12 @@
import org.apache.myfaces.trinidadinternal.style.util.StyleUtils;
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.NodeUtils;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
import org.apache.myfaces.trinidadinternal.ui.UINode;
-import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
import org.apache.myfaces.trinidadinternal.ui.laf.base.MutableProperty;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
@@ -76,7 +72,7 @@
* Copies an attribute from a source node to a destination UINode
*/
public static void copyAttr(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode sourceNode,
AttributeKey attrKey,
MutableUINode destNode
@@ -103,7 +99,7 @@
* initializer, creating any needed form values.
*/
public static String encodeJSEventObject(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
String formName,
Iterator keyValues,
int keyValueSize
@@ -187,7 +183,7 @@
* initializer, creating any needed form values.
*/
public static String encodeJSEventObject(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
String formName,
Object[] keyValues
)
@@ -213,7 +209,7 @@
* Resolves the class name to the appropriate Style object
*/
public static Style getClassStyle(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Object className
)
{
@@ -236,7 +232,7 @@
* then get a property from the Style
*/
public static String getClassStyleProperty(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Object className,
String propertyName
)
@@ -296,7 +292,7 @@
* Returns the short version of the specified style class.
*/
public static Object getShortStyleClass(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Object styleClass
)
{
@@ -380,7 +376,7 @@
* Closes any tags started by startRenderingStyleElements
*/
public static void endRenderingStyleElements(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
) throws IOException
{
Stack[] styleInfo = _getStyleInfo(context);
@@ -426,7 +422,7 @@
* as elements
*/
public static void startRenderingStyleElements(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Style inlineStyle,
Style classStyle
) throws IOException
@@ -660,7 +656,7 @@
public static String createCompoundName(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
String formName,
Object keyValues
)
@@ -670,7 +666,7 @@
}
public static String createCompoundName(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
String formName,
Object keyValues,
Object keyExchanges
@@ -779,7 +775,7 @@
}
public static void addOnSubmitRequiredValidator(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
String requiredMessageKey,
Object nodeName
@@ -836,12 +832,12 @@
* if needed).
*/
public static void addLib(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Object libKey
) throws IOException
{
XhtmlUtils.addLib(context.getFacesContext(),
- AdfRenderingContext.getCurrentInstance(),
+ RenderingContext.getCurrentInstance(),
libKey);
}
@@ -850,11 +846,11 @@
* Write out a script element importing a library.
*/
public static void writeLibImport(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Object libURL) throws IOException
{
XhtmlUtils.writeLibImport(context.getFacesContext(),
- AdfRenderingContext.getCurrentInstance(),
+ RenderingContext.getCurrentInstance(),
libURL);
}
@@ -862,7 +858,7 @@
* Returns the partial targets associated with the specified node
*/
public static String[] getPartialTargets(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -874,7 +870,7 @@
* including the specified ID.
*/
public static String[] getPartialTargets(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
Object id
)
@@ -922,7 +918,7 @@
* Returns true if the agent supports transparent images.
*/
public static boolean supportsTransparentImages(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
AdfFacesAgent agent = context.getAgent();
@@ -958,7 +954,7 @@
* Renders the specified Icon with the provided attributes.
*/
public static void renderIcon(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Icon icon,
Object shortDesc,
Object align
@@ -971,14 +967,14 @@
* Renders the specified Icon with the provided attributes.
*/
public static void renderIcon(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Icon icon,
Object shortDesc,
Object align,
boolean embedded
) throws IOException
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
FacesContext fContext = context.getFacesContext();
OutputUtils.renderIcon(fContext, arc, icon, shortDesc, align, embedded);
}
@@ -987,7 +983,7 @@
* Returns the valign vAlign value for aligning image icons
* vertically with text on the same line.
*/
- public static Object getMiddleIconAlignment(RenderingContext context)
+ public static Object getMiddleIconAlignment(org.apache.myfaces.trinidadinternal.ui.RenderingContext context)
{
// =-= AEW I haven't been able to find an image alignment
// that works well for all browsers. "absmiddle" looks
@@ -1025,7 +1021,7 @@
* currently scoped form.
*/
public static Object getFormEncodedValue(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Object transName,
Object value)
{
@@ -1053,7 +1049,7 @@
/**
* Return true if readOnly attribute exists and set to true
*/
- public static boolean isReadOnly(RenderingContext context, UINode node)
+ public static boolean isReadOnly(org.apache.myfaces.trinidadinternal.ui.RenderingContext context, UINode node)
{
Object readOnly = node.getAttributeValue(context, READ_ONLY_ATTR);
return Boolean.TRUE.equals(readOnly);
@@ -1186,7 +1182,7 @@
* which provides access to the current RenderingContext.
*/
static void __pushCurrentRenderingContext(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
assert (context != null);
@@ -1218,7 +1214,7 @@
* by popping the current RenderingContext off of the stack.
*/
static void __popCurrentRenderingContext(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
Stack stack = (Stack)context.getProperty(MARLIN_NAMESPACE,
@@ -1235,7 +1231,7 @@
* by the last call to __pushCurrentRenderingContext().
*/
static RenderingContext __getCurrentRenderingContext(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
Stack stack = (Stack)context.getProperty(MARLIN_NAMESPACE,
@@ -1365,7 +1361,7 @@
* necessary.
*/
private static Stack[] _getStyleInfo(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
XhtmlLafUtils.StyleInfo styleInfo = (StyleInfo)
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ButtonRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ButtonRenderer.java Wed Jul 26 20:39:26 2006
@@ -22,6 +22,7 @@
import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ContentContainerRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,26 +17,19 @@
package org.apache.myfaces.trinidadinternal.ui.laf.simple.desktop;
import java.io.IOException;
-
import java.util.Map;
+
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-
-import org.apache.myfaces.trinidad.util.ArrayMap;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
import org.apache.myfaces.trinidad.component.core.layout.CorePanelBox;
-
+import org.apache.myfaces.trinidad.util.ArrayMap;
import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.UINode;
-
-import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
+import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
+import org.apache.myfaces.trinidadinternal.ui.UINode;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
* ContentContainer Renderer for the desktop implementation of the
@@ -53,7 +46,7 @@
* renderContent().
*/
protected void renderContent(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -85,7 +78,7 @@
* value.
*/
protected Object getBackground(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -98,7 +91,7 @@
// Get the IconData to use for rendering this contentContainer
private IconData _getIconData(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -201,7 +194,7 @@
// Renders the header row
private void _renderHeaderRow(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
IconData icons,
Object text,
@@ -212,7 +205,7 @@
assert (text != null);
FacesContext fContext = context.getFacesContext();
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
ResponseWriter writer = fContext.getResponseWriter();
@@ -280,7 +273,7 @@
// Writes out the height attribute for header table cells which
// contain the header start/end icons.
private void _writeHeaderIconCellHeight(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Icon icon
) throws IOException
{
@@ -290,7 +283,7 @@
// Use the Icon's height if it is known. If the height isn't,
// known, we need to specify some height for IE - otherwise the
// image does not show up!
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
Object height = icon.getImageHeight(arc);
if (height == null)
@@ -301,14 +294,14 @@
}
private void _renderContents(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
IconData icons,
Object text,
int columnCount
) throws IOException
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
FacesContext fContext = context.getFacesContext();
// Render the top row if we have the necessary icons
if (_hasTopRow(icons, text))
@@ -324,9 +317,9 @@
// Render the table row with the contents
private void _renderContentsRow(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
FacesContext fContext,
- AdfRenderingContext arc,
+ RenderingContext arc,
UINode node,
IconData icons,
int columnCount
@@ -376,7 +369,7 @@
// Renders the bottom row
private void _renderBottomRow(
FacesContext fContext,
- AdfRenderingContext arc,
+ RenderingContext arc,
IconData icons,
int columnCount
) throws IOException
@@ -428,7 +421,7 @@
// Renders the top row
private void _renderTopRow(
FacesContext fContext,
- AdfRenderingContext arc,
+ RenderingContext arc,
IconData icons,
int columnCount
) throws IOException
@@ -558,7 +551,7 @@
// Tests whether the browser requires a height to be specified
// in order for a stretched image to show up
private static boolean _requiresStretchedImageHeight(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
// IE does not display stretched images unless the containing table
@@ -569,7 +562,7 @@
// Gets the Map for stetched icons, and sets alt attribute to "".
private static Map _getStretchedIconAttrs(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
AdfFacesAgent agent = context.getAgent();
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalButtonBarRenderer.java Wed Jul 26 20:39:26 2006
@@ -21,13 +21,11 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.UINode;
-
import org.apache.myfaces.trinidadinternal.skin.Skin;
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
+import org.apache.myfaces.trinidadinternal.ui.UINode;
/**
* GlobalButtonBarRenderer for the desktop implementation of the
@@ -53,7 +51,7 @@
* renders the separator Icon.
*/
protected void renderBetweenNodes(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -68,7 +66,7 @@
// Render the icon
FacesContext fContext = context.getFacesContext();
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
OutputUtils.renderIcon(fContext, arc, icon, "", null);
writer.endElement(TABLE_DATA_ELEMENT);
@@ -78,7 +76,7 @@
// Returns the separator Icon to render between global buttons
private static Icon _getSeparatorIcon(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
// First, check to see if the Icon has been stored
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalHeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalHeaderRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalHeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/GlobalHeaderRenderer.java Wed Jul 26 20:39:26 2006
@@ -25,6 +25,7 @@
import org.apache.myfaces.trinidadinternal.skin.Skin;
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.LinkUtils;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java Wed Jul 26 20:39:26 2006
@@ -21,14 +21,12 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.skin.Skin;
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
+import org.apache.myfaces.trinidadinternal.ui.UINode;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
* MessageBox Renderer for the desktop implementation of the
@@ -63,7 +61,7 @@
* Override of BaseRenderer.renderAttributes().
*/
protected void renderAttributes(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)throws IOException
{
@@ -76,7 +74,7 @@
* Override of BaseRenderer.prerender()
*/
protected void prerender(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
throws IOException
@@ -88,7 +86,7 @@
int columnCount = _getColumnCount(icons);
FacesContext fContext = context.getFacesContext();
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
// Render the top row if we have one
if (_hasTopRow(icons))
_renderTopRow(fContext, arc, icons, columnCount);
@@ -101,7 +99,7 @@
* Override of BaseRenderer.postrender()
*/
protected void postrender(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
throws IOException
@@ -111,7 +109,7 @@
int columnCount = _getColumnCount(icons);
FacesContext fContext = context.getFacesContext();
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
// Close up the contents row
_endContentsRow(fContext, arc, icons);
@@ -125,9 +123,9 @@
// Start the table row with the contents
private void _startContentsRow(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
FacesContext fContext,
- AdfRenderingContext arc,
+ RenderingContext arc,
IconData icons,
int columnCount
) throws IOException
@@ -155,7 +153,7 @@
// End the table row with the contents
private void _endContentsRow(
FacesContext fContext,
- AdfRenderingContext arc,
+ RenderingContext arc,
IconData icons
) throws IOException
{
@@ -183,7 +181,7 @@
// Renders the bottom row
private void _renderBottomRow(
FacesContext fContext,
- AdfRenderingContext arc,
+ RenderingContext arc,
IconData icons,
int columnCount
) throws IOException
@@ -233,7 +231,7 @@
// Renders the top row
private void _renderTopRow(
FacesContext fContext,
- AdfRenderingContext arc,
+ RenderingContext arc,
IconData icons,
int columnCount
) throws IOException
@@ -357,7 +355,7 @@
// Get the IconData to use for rendering this sideBar
private IconData _getIconData(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
// Check to see whether we have already created
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuBarRenderer.java Wed Jul 26 20:39:26 2006
@@ -19,6 +19,7 @@
import org.apache.myfaces.trinidad.component.UIXHierarchy;
import org.apache.myfaces.trinidad.component.UIXPage;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.PageRendererUtils;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/PageMenuButtonsRenderer.java Wed Jul 26 20:39:26 2006
@@ -19,6 +19,7 @@
import org.apache.myfaces.trinidad.component.UIXPage;
import org.apache.myfaces.trinidad.component.core.nav.CoreCommandNavigationItem;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.PageRendererUtils;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/ResetButtonRenderer.java Wed Jul 26 20:39:26 2006
@@ -22,6 +22,7 @@
import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java Wed Jul 26 20:39:26 2006
@@ -21,14 +21,12 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.UINode;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
import org.apache.myfaces.trinidadinternal.skin.Skin;
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
-
+import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
/**
* SideBar Renderer for the desktop implementation of the
@@ -65,7 +63,7 @@
* Override of BaseRenderer.renderAttributes().
*/
protected void renderAttributes(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)throws IOException
{
@@ -83,7 +81,7 @@
* Override of BaseRenderer.prerender()
*/
protected void prerender(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
throws IOException
@@ -98,7 +96,7 @@
int columnCount = _getColumnCount(icons);
FacesContext fContext = context.getFacesContext();
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
// Render the top row if we have one
if (_hasTopRow(icons))
@@ -112,7 +110,7 @@
* Override of BaseRenderer.postrender()
*/
protected final void postrender(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
throws IOException
@@ -122,7 +120,7 @@
int columnCount = _getColumnCount(icons);
FacesContext fContext = context.getFacesContext();
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
// Close up the contents row
_endContentsRow(fContext, arc, icons);
@@ -140,7 +138,7 @@
// Start the table row with the contents
private void _startContentsRow(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
IconData icons,
int columnCount
@@ -173,7 +171,7 @@
// End the table row with the contents
private void _endContentsRow(
FacesContext fContext,
- AdfRenderingContext arc,
+ RenderingContext arc,
IconData icons
) throws IOException
{
@@ -201,7 +199,7 @@
// Renders the bottom row
private void _renderBottomRow(
FacesContext fContext,
- AdfRenderingContext arc,
+ RenderingContext arc,
IconData icons,
int columnCount
) throws IOException
@@ -251,7 +249,7 @@
// Renders the top row
private void _renderTopRow(
FacesContext fContext,
- AdfRenderingContext arc,
+ RenderingContext arc,
IconData icons,
int columnCount
) throws IOException
@@ -293,7 +291,7 @@
// Renders the filter named child
private void _renderFilterChild(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -393,7 +391,7 @@
// Get the IconData to use for rendering this sideBar
private IconData _getIconData(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
// Check to see whether we have already created
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java Wed Jul 26 20:39:26 2006
@@ -17,24 +17,19 @@
package org.apache.myfaces.trinidadinternal.ui.laf.simple.desktop;
import java.awt.Color;
-
import java.io.IOException;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.trinidad.logging.ADFLogger;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.share.io.InputStreamProvider;
-
-import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
-import org.apache.myfaces.trinidadinternal.style.util.FontProxy;
+import org.apache.myfaces.trinidad.logging.ADFLogger;
import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
import org.apache.myfaces.trinidadinternal.image.cache.CompositeButtonKey;
-
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.share.io.InputStreamProvider;
+import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
import org.apache.myfaces.trinidadinternal.skin.Skin;
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
+import org.apache.myfaces.trinidadinternal.style.util.FontProxy;
import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
/**
@@ -57,7 +52,7 @@
// Otherwise the button is rendered using the base.desktop
// button implementation (browser buttons).
static public boolean doRenderImageButton(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
// First, check the _IMAGE_BUTTON_KEY (or _IMAGE_BUTTON_RTL_KEY if rtl)
@@ -138,7 +133,7 @@
// Creates the ImageProviderRequest for the composite button lookup
static public ImageProviderRequest createButtonRequest(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Object name,
Object text,
Color foreground,
@@ -150,7 +145,7 @@
char accessKey
)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
FacesContext fContext = context.getFacesContext();
return new SimpleButtonUtils.Key(
fContext,
@@ -190,8 +185,8 @@
{
public Key(
FacesContext fContext,
- AdfRenderingContext arc,
- RenderingContext context,
+ RenderingContext arc,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
String skinId,
String name,
String text,
@@ -292,14 +287,14 @@
return null;
}
- private RenderingContext _context;
- private AdfRenderingContext _arc;
+ private org.apache.myfaces.trinidadinternal.ui.RenderingContext _context;
+ private RenderingContext _arc;
private FacesContext _fContext;
}
- private static boolean _isRightToLeft(RenderingContext context)
+ private static boolean _isRightToLeft(org.apache.myfaces.trinidadinternal.ui.RenderingContext context)
{
LocaleContext lContext = context.getLocaleContext();
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java Wed Jul 26 20:39:26 2006
@@ -18,13 +18,11 @@
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
-
import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeel;
import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeelExtension;
import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeelManager;
import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeelScorer;
import org.apache.myfaces.trinidadinternal.ui.laf.NameOnlyScorer;
-
import org.apache.myfaces.trinidadinternal.ui.laf.base.desktop.BaseDesktopConstants;
import org.apache.myfaces.trinidadinternal.ui.laf.base.desktop.BaseDesktopUtils;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SubmitButtonRenderer.java Wed Jul 26 20:39:26 2006
@@ -22,6 +22,7 @@
import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/TabBarRenderer.java Wed Jul 26 20:39:26 2006
@@ -18,6 +18,7 @@
import java.io.IOException;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.skin.Skin;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java Wed Jul 26 20:39:26 2006
@@ -19,7 +19,6 @@
import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeelManager;
import org.apache.myfaces.trinidadinternal.ui.laf.NameAndAgentScorer;
import org.apache.myfaces.trinidadinternal.ui.laf.base.pda.PdaHtmlLafUtils;
-
import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ClassRendererParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ClassRendererParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ClassRendererParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ClassRendererParser.java Wed Jul 26 20:39:26 2006
@@ -16,17 +16,13 @@
package org.apache.myfaces.trinidadinternal.ui.laf.xml.parse;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
-
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
+import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
import org.apache.myfaces.trinidadinternal.share.xml.LeafNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
/**
* NodeParser for class-based Renderers.
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconNodeParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconNodeParser.java Wed Jul 26 20:39:26 2006
@@ -16,18 +16,14 @@
package org.apache.myfaces.trinidadinternal.ui.laf.xml.parse;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
-
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
/**
* NodeParser for <icon> elements
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconParserFactory.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconParserFactory.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconParserFactory.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconParserFactory.java Wed Jul 26 20:39:26 2006
@@ -19,7 +19,6 @@
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
import org.apache.myfaces.trinidadinternal.share.xml.ParserFactory;
-
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
/**
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconsNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconsNodeParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconsNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/IconsNodeParser.java Wed Jul 26 20:39:26 2006
@@ -18,16 +18,12 @@
import java.util.ArrayList;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-
-
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
/**
* NodeParser for <icons> elements
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java Wed Jul 26 20:39:26 2006
@@ -16,25 +16,18 @@
package org.apache.myfaces.trinidadinternal.ui.laf.xml.parse;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
-import org.apache.myfaces.trinidadinternal.style.Style;
-
-import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
import org.apache.myfaces.trinidadinternal.skin.icon.ContextImageIcon;
+import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
import org.apache.myfaces.trinidadinternal.skin.icon.URIImageIcon;
-
+import org.apache.myfaces.trinidadinternal.style.Style;
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
/**
* NodeParser for ImageIcons.
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/InstanceIconParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/InstanceIconParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/InstanceIconParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/InstanceIconParser.java Wed Jul 26 20:39:26 2006
@@ -16,20 +16,16 @@
package org.apache.myfaces.trinidadinternal.ui.laf.xml.parse;
-import org.xml.sax.Attributes;
-
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
-
+import java.lang.reflect.Method;
import org.apache.myfaces.trinidad.logging.ADFLogger;
import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
-
import org.apache.myfaces.trinidadinternal.share.xml.LeafNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.xml.sax.Attributes;
/**
* NodeParser for instance icons.
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/NullIconParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/NullIconParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/NullIconParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/NullIconParser.java Wed Jul 26 20:39:26 2006
@@ -16,10 +16,9 @@
package org.apache.myfaces.trinidadinternal.ui.laf.xml.parse;
-import org.xml.sax.Attributes;
-
import org.apache.myfaces.trinidadinternal.share.xml.LeafNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
+import org.xml.sax.Attributes;
/**
* NodeParser for instance icons.
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererNodeParser.java Wed Jul 26 20:39:26 2006
@@ -16,21 +16,16 @@
package org.apache.myfaces.trinidadinternal.ui.laf.xml.parse;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.NamespaceURI;
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
-
import org.apache.myfaces.trinidadinternal.ui.Renderer;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
-
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
/**
* NodeParser for <renderer> elements
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererParserFactory.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererParserFactory.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererParserFactory.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RendererParserFactory.java Wed Jul 26 20:39:26 2006
@@ -19,7 +19,6 @@
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
import org.apache.myfaces.trinidadinternal.share.xml.ParserFactory;
-
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
/**
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNodeParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/RenderersNodeParser.java Wed Jul 26 20:39:26 2006
@@ -18,17 +18,13 @@
import java.util.ArrayList;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-
-
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
import org.apache.myfaces.trinidadinternal.share.xml.XMLUtils;
-
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
/**
* NodeParser for <renderers> elements
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinExtensionParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinExtensionParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinExtensionParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinExtensionParser.java Wed Jul 26 20:39:26 2006
@@ -20,19 +20,16 @@
import java.util.ArrayList;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidadinternal.share.xml.StringParser;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
+import org.apache.myfaces.trinidadinternal.share.xml.StringParser;
import org.apache.myfaces.trinidadinternal.skin.Skin;
import org.apache.myfaces.trinidadinternal.skin.SkinExtension;
-
import org.apache.myfaces.trinidadinternal.skin.SkinUtils;
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
/**
* NodeParser for SkinExtensions
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertiesNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertiesNodeParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertiesNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertiesNodeParser.java Wed Jul 26 20:39:26 2006
@@ -18,16 +18,12 @@
import java.util.ArrayList;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-
-
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
/**
* NodeParser for <properties> elements
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinPropertyNodeParser.java Wed Jul 26 20:39:26 2006
@@ -18,13 +18,11 @@
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
+import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
import org.apache.myfaces.trinidadinternal.share.xml.StringParser;
+import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
-
-import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
-import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
/**
* NodeParser for <property> elements in a skin file.
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinsNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinsNodeParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinsNodeParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/SkinsNodeParser.java Wed Jul 26 20:39:26 2006
@@ -18,18 +18,15 @@
import java.util.ArrayList;
-import org.apache.myfaces.trinidadinternal.skin.SkinExtension;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
+import org.apache.myfaces.trinidadinternal.skin.SkinExtension;
import org.apache.myfaces.trinidadinternal.skin.SkinFactory;
import org.apache.myfaces.trinidadinternal.skin.SkinUtils;
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
/**
* NodeParser for <skins> elements
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/TextIconParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/TextIconParser.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/TextIconParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/TextIconParser.java Wed Jul 26 20:39:26 2006
@@ -16,19 +16,14 @@
package org.apache.myfaces.trinidadinternal.ui.laf.xml.parse;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-
-import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
+import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
-import org.apache.myfaces.trinidadinternal.style.Style;
-
import org.apache.myfaces.trinidadinternal.skin.icon.TextIcon;
-
+import org.apache.myfaces.trinidadinternal.style.Style;
import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
/**
* NodeParser for TextIcons.
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/partial/PartialPageRendererUtils.java Wed Jul 26 20:39:26 2006
@@ -16,8 +16,9 @@
package org.apache.myfaces.trinidadinternal.ui.partial;
import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
-
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+
+
/**
* Utility methods for Renderers which support partial page rendering.
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/Path.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/Path.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/Path.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/Path.java Wed Jul 26 20:39:26 2006
@@ -15,6 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.path;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java Wed Jul 26 20:39:26 2006
@@ -17,6 +17,7 @@
import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/state/Selection.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/state/Selection.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/state/Selection.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/state/Selection.java Wed Jul 26 20:39:26 2006
@@ -17,6 +17,8 @@
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+
+
/**
* The Selection interface encapsulates access to one or more selected indicies
* and selected values. This is used for setting the selection on a UIX
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java Wed Jul 26 20:39:26 2006
@@ -23,7 +23,6 @@
import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
/**
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/EditableFacesBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/EditableFacesBean.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/EditableFacesBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/EditableFacesBean.java Wed Jul 26 20:39:26 2006
@@ -17,7 +17,6 @@
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.UIXEditableValue;
-
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
import org.apache.myfaces.trinidadinternal.ui.collection.AttributeMap;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java?rev=425942&r1=425941&r2=425942&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java Wed Jul 26 20:39:26 2006
@@ -16,27 +16,23 @@
package org.apache.myfaces.trinidadinternal.uinode;
import java.io.IOException;
-
import java.util.Map;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-
-import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
-
import org.apache.myfaces.trinidadinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
import org.apache.myfaces.trinidadinternal.share.config.ContextBasedConfiguration;
import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
import org.apache.myfaces.trinidadinternal.share.xml.XMLUtils;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.RootRenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.UIConstants;
import org.apache.myfaces.trinidadinternal.skin.Skin;
import org.apache.myfaces.trinidadinternal.style.StyleContext;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.RootRenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.UIConstants;
/**
* RenderingContext implementation that supports JSF.
@@ -52,7 +48,7 @@
* @todo Why are passing a UIComponent? In some places,
* we're passing null for the component!
*/
- static public RenderingContext getRenderingContext(
+ static public org.apache.myfaces.trinidadinternal.ui.RenderingContext getRenderingContext(
FacesContext fContext,
UIComponent component) throws IOException
{
@@ -65,7 +61,7 @@
* @todo Why are passing a UIComponent? In some places,
* we're passing null for the component!
*/
- static public RenderingContext getRenderingContext(
+ static public org.apache.myfaces.trinidadinternal.ui.RenderingContext getRenderingContext(
FacesContext fContext,
UIComponent component,
boolean createIfNull) throws IOException
@@ -97,7 +93,7 @@
static public PartialPageContext getPartialPageContext(FacesContext fContext)
{
return (PartialPageContext)
- AdfRenderingContext.getCurrentInstance().getPartialPageContext();
+ RenderingContext.getCurrentInstance().getPartialPageContext();
}
/**
@@ -108,11 +104,11 @@
{
super();
- _adfRenderingContext = AdfRenderingContext.getCurrentInstance();
+ _adfRenderingContext = RenderingContext.getCurrentInstance();
init(fContext);
- AdfFacesContext context = AdfFacesContext.getCurrentInstance();
+ RequestContext context = RequestContext.getCurrentInstance();
String outputMode = context.getOutputMode();
if (outputMode != null)
setFacet(outputMode);
@@ -188,7 +184,7 @@
private void _initializeConfiguration(FacesContext fContext,
- AdfFacesContext context)
+ RequestContext context)
{
setConfiguration(new ContextBasedConfiguration(fContext, context));
}
@@ -220,7 +216,7 @@
}
}
- private AdfRenderingContext _adfRenderingContext;
+ private RenderingContext _adfRenderingContext;
private static final ADFLogger _LOG =
ADFLogger.createADFLogger(FacesRenderingContext.class);