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 [13/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/CellFormatRenderer.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/CellFormatRenderer.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/CellFormatRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CellFormatRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,6 +17,7 @@
import java.io.IOException;
+
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/ChoiceRenderer.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/ChoiceRenderer.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/ChoiceRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ChoiceRenderer.java Wed Jul 26 20:39:26 2006
@@ -30,6 +30,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/CommandItemRenderer.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/CommandItemRenderer.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/CommandItemRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandItemRenderer.java Wed Jul 26 20:39:26 2006
@@ -22,6 +22,7 @@
import org.apache.myfaces.trinidad.component.UIXCommand;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandNavigationItemRenderer.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/CommandNavigationItemRenderer.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/CommandNavigationItemRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CommandNavigationItemRenderer.java Wed Jul 26 20:39:26 2006
@@ -15,6 +15,7 @@
*/
package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
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/CoreIconRequest.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/CoreIconRequest.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/CoreIconRequest.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/CoreIconRequest.java Wed Jul 26 20:39:26 2006
@@ -16,18 +16,13 @@
package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
import java.awt.Color;
-
import java.io.IOException;
-
import java.util.Map;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidadinternal.image.ImageConstants;
import org.apache.myfaces.trinidadinternal.image.ImageContext;
-
import org.apache.myfaces.trinidadinternal.image.cache.CoreColorizedIconKey;
-
import org.apache.myfaces.trinidadinternal.share.io.InputStreamProvider;
import org.apache.myfaces.trinidadinternal.share.io.NameResolver;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FlippedIconRequest.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/FlippedIconRequest.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/FlippedIconRequest.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FlippedIconRequest.java Wed Jul 26 20:39:26 2006
@@ -15,27 +15,24 @@
*/
package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
-import java.util.Map;
-
import java.io.IOException;
+import java.util.Map;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
-
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
import org.apache.myfaces.trinidadinternal.image.ImageConstants;
import org.apache.myfaces.trinidadinternal.image.ImageContext;
import org.apache.myfaces.trinidadinternal.image.cache.FlippedIconKey;
-
import org.apache.myfaces.trinidadinternal.share.io.InputStreamProvider;
-import org.apache.myfaces.trinidadinternal.share.io.ServletNameResolver;
import org.apache.myfaces.trinidadinternal.share.io.NameResolver;
-
+import org.apache.myfaces.trinidadinternal.share.io.ServletNameResolver;
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+
+
/**
* The ImageProviderRequest class that we use for requesting
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FlowLayoutRenderer.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/FlowLayoutRenderer.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/FlowLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FlowLayoutRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,6 +17,7 @@
import java.io.IOException;
+
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/FormElementRenderer.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/FormElementRenderer.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/FormElementRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormElementRenderer.java Wed Jul 26 20:39:26 2006
@@ -24,6 +24,7 @@
import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean;
import org.apache.myfaces.trinidadinternal.ui.html.HTMLWebBean;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormInputRenderer.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/FormInputRenderer.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/FormInputRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormInputRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,6 +17,7 @@
import java.io.IOException;
+
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/FormSelectRenderer.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/FormSelectRenderer.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/FormSelectRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormSelectRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,8 +17,9 @@
import java.io.IOException;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+
import org.apache.myfaces.trinidadinternal.ui.Renderer;
+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/FormValueRenderer.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/FormValueRenderer.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/FormValueRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormValueRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,20 +17,13 @@
import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidad.logging.ADFLogger;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormData;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
-import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
import org.apache.myfaces.trinidadinternal.ui.NodeRole;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.RoledRenderer;
import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -43,14 +36,14 @@
implements RoledRenderer
{
public NodeRole getNodeRole(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node)
{
return _FORM_VALUE_ROLE;
}
protected void renderAttributes(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -93,7 +86,7 @@
* @param name the name of the hidden value.
*/
public static void addNeededValue(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
String formName,
String name
)
@@ -112,7 +105,7 @@
* @param name4 the name of a hidden value. maybe null.
*/
public static void addNeededValue(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
String formName,
String name1,
String name2,
@@ -120,7 +113,7 @@
String name4
)
{
- FormData fd = AdfRenderingContext.getCurrentInstance().getFormData();
+ FormData fd = RenderingContext.getCurrentInstance().getFormData();
fd.addNeededValue(name1);
if (name2!=null)
{
@@ -155,13 +148,13 @@
return;
}
- FormData fd = AdfRenderingContext.getCurrentInstance().getFormData();
+ FormData fd = RenderingContext.getCurrentInstance().getFormData();
fd.addRenderedValue(name.toString());
}
}
static void __renderHiddenValue(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
String formName,
Object name,
Object value
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FrameBorderLayoutRenderer.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/FrameBorderLayoutRenderer.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/FrameBorderLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FrameBorderLayoutRenderer.java Wed Jul 26 20:39:26 2006
@@ -25,8 +25,9 @@
import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+
import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
+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/FrameRenderer.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/FrameRenderer.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/FrameRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FrameRenderer.java Wed Jul 26 20:39:26 2006
@@ -21,6 +21,7 @@
import org.apache.myfaces.trinidad.logging.ADFLogger;
+
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/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/base/xhtml/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/base/xhtml/GlobalButtonBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/GlobalButtonBarRenderer.java Wed Jul 26 20:39:26 2006
@@ -21,6 +21,7 @@
import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
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.ui.beans.MarlinBean;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HeaderRenderer.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/HeaderRenderer.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/HeaderRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HeaderRenderer.java Wed Jul 26 20:39:26 2006
@@ -19,6 +19,7 @@
+
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/HiddenLabelUtils.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/HiddenLabelUtils.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/HiddenLabelUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java Wed Jul 26 20:39:26 2006
@@ -24,6 +24,7 @@
import org.apache.myfaces.trinidadinternal.share.config.Configuration;
import org.apache.myfaces.trinidadinternal.share.config.AccessibilityMode;
+
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/HtmlRenderer.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/HtmlRenderer.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/HtmlRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HtmlRenderer.java Wed Jul 26 20:39:26 2006
@@ -26,6 +26,7 @@
import org.apache.myfaces.trinidadinternal.ui.ElementRenderer;
import org.apache.myfaces.trinidadinternal.ui.NodeRole;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.RoledRenderer;
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/IconArrayLafIconProvider.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/IconArrayLafIconProvider.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/IconArrayLafIconProvider.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconArrayLafIconProvider.java Wed Jul 26 20:39:26 2006
@@ -16,6 +16,8 @@
package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
import java.awt.Color;
+
+import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.laf.base.Icon;
import org.apache.myfaces.trinidadinternal.ui.laf.base.IconKey;
@@ -23,7 +25,7 @@
import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
import org.apache.myfaces.trinidadinternal.share.io.NameResolver;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+
/**
* Abstracts out the retrieval of ImageProviderResponses for
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconKeyRenderer.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/IconKeyRenderer.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/IconKeyRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconKeyRenderer.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/IconRenderer.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/IconRenderer.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/IconRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/IconRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,21 +17,19 @@
package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
import java.io.IOException;
-
import java.util.Map;
+
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.share.xml.NamespaceURI;
+import org.apache.myfaces.trinidad.util.ArrayMap;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.share.xml.NamespaceURI;
+import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
import org.apache.myfaces.trinidadinternal.ui.Renderer;
-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.skin.icon.Icon;
-import org.apache.myfaces.trinidad.util.ArrayMap;
-
/**
* Renderer for the icon component.
*
@@ -44,7 +42,7 @@
* Render the icon
*/
public void render(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -89,7 +87,7 @@
// The span is written out here because the writer needs to see the UIComponent.
ResponseWriter writer = context.getResponseWriter();
writer.startElement("span", node.getUIComponent());
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
FacesContext fContext = context.getFacesContext();
icon.renderIcon(fContext, arc, _getNodeAttributeMap(context, node));
writer.endElement("span");
@@ -106,7 +104,7 @@
* the node.
*/
private Map _getNodeAttributeMap(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node)
{
Map attrs = null;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.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/ImageRenderer.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/ImageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImageRenderer.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/ImportScriptRenderer.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/ImportScriptRenderer.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/ImportScriptRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ImportScriptRenderer.java Wed Jul 26 20:39:26 2006
@@ -19,6 +19,7 @@
import org.apache.myfaces.trinidadinternal.ui.BaseRenderer;
import org.apache.myfaces.trinidadinternal.ui.NodeRole;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.RoledRenderer;
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/LinkDataObject.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/LinkDataObject.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/LinkDataObject.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java Wed Jul 26 20:39:26 2006
@@ -18,7 +18,7 @@
import java.io.IOException;
import org.apache.myfaces.trinidad.component.UIXHierarchy;
-import org.apache.myfaces.trinidad.component.core.nav.CoreCommandNavigationItem;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
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/LinkRenderer.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/LinkRenderer.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/LinkRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java Wed Jul 26 20:39:26 2006
@@ -20,10 +20,9 @@
import javax.faces.component.UIComponent;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.action.ClientAction;
import org.apache.myfaces.trinidadinternal.ui.action.ClientActionUtils;
@@ -37,7 +36,7 @@
public class LinkRenderer extends XhtmlLafRenderer
{
- public void render(RenderingContext context,
+ public void render(org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node) throws IOException
{
@@ -52,7 +51,7 @@
}
private String _addParams(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
ClientAction action,
String dest
@@ -71,7 +70,7 @@
}
protected void renderAttributes(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -120,12 +119,12 @@
* @todo gcrawford - for now readonly maps to disabled
*/
protected boolean isDisabled(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
- boolean isDisabled = ((CoreAdfRenderingContext) arc).isLinkDisabled();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
+ boolean isDisabled = ((CoreRenderingContext) arc).isLinkDisabled();
boolean disabledAttr = XhtmlLafUtils.getLocalBooleanAttribute(context,
node,
DISABLED_ATTR,
@@ -147,13 +146,18 @@
* of their disabled attributes.
* @see #isDisabled(RenderingContext,UINode)
*/
- public static void setDisabled(RenderingContext context, boolean isDisabled)
+ public static void setDisabled(org.apache.myfaces.trinidadinternal.ui.RenderingContext context, boolean isDisabled)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
- ((CoreAdfRenderingContext) arc).setLinkDisabled(isDisabled);
+ RenderingContext arc = RenderingContext.getCurrentInstance();
+ ((CoreRenderingContext) arc).setLinkDisabled(isDisabled);
}
- public static void setSaveModelDisabled(RenderingContext context, boolean isDisabled)
+ /**
+ * @deprecated no body
+ * @param context
+ * @param isDisabled
+ */
+ public static void setSaveModelDisabled(org.apache.myfaces.trinidadinternal.ui.RenderingContext context, boolean isDisabled)
{
/* =-=AEW Save model not available in ADF Faces
if (BodyRenderer.__isSaveModelActive(context))
@@ -165,7 +169,7 @@
}
- protected boolean isSaveModelDisabled(RenderingContext context)
+ protected boolean isSaveModelDisabled(org.apache.myfaces.trinidadinternal.ui.RenderingContext context)
{
return getRenderingProperty(context, _SAVE_MODEL_DISABLED_KEY) != null;
}
@@ -174,7 +178,7 @@
* Renders the destination of the link
*/
protected void renderDestination(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
String destination
) throws IOException
@@ -207,7 +211,7 @@
* Renders event handlers for the node.
*/
protected void renderEventHandlers(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -222,7 +226,7 @@
}
protected void renderID(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -249,7 +253,7 @@
* link subclasses
*/
protected boolean makeNameAndIDSame(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
return true;
@@ -260,7 +264,7 @@
* Override to return the id and then anme, in that order
*/
protected Object getID(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -279,7 +283,7 @@
* Returns the destination to use for the ImageRenderer.
*/
protected String getDestination(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -311,7 +315,7 @@
}
protected final String getDestinationAttr(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -324,7 +328,7 @@
* Returns the destination to use for the ImageRenderer.
*/
protected Object getText(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -332,7 +336,7 @@
}
protected Object getTargetFrame(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -344,7 +348,7 @@
* Returns the StyleClass to use to render this node.
*/
protected Object getStyleClass(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -376,7 +380,7 @@
* @param node the current UINode
*/
protected void prerender(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -429,7 +433,7 @@
* @param node the current UINode
*/
protected void postrender(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -450,7 +454,7 @@
protected void renderContent(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -491,7 +495,7 @@
protected String getElementName(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -509,7 +513,7 @@
}
protected Object getOnClick(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -578,7 +582,7 @@
// Checks for partial targets provided by an ancestor link container
// and returns a script which updates the partial targets.
protected String getPartialChangeScript(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -612,7 +616,7 @@
// Returns any partial targets provided by ancestor link containers.
protected static String getAncestorPartialTargets(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
// First check to see if we've got a local copy
@@ -635,7 +639,7 @@
* Returns true if we should use an anchor to represent this link.
*/
private boolean _isAnchor(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -661,7 +665,7 @@
* destination, or node name. We render nothing.
*/
protected boolean isEmpty(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -683,7 +687,7 @@
return ((text == null) && (childCount <= 0) && (id == null));
}
- private void _buildDataObject(RenderingContext context,
+ private void _buildDataObject(org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode link) throws IOException
{
Object id = getID(context, link);
@@ -720,7 +724,7 @@
* @throws IOException
*/
private void _renderAccessibleStatus(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
) throws IOException
{
// Do not attempt to render this label if the underlying
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkUtils.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/LinkUtils.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/LinkUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkUtils.java Wed Jul 26 20:39:26 2006
@@ -17,11 +17,8 @@
package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext;
-
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
-
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
/**
@@ -65,7 +62,7 @@
* @return true if selected else false
*/
public static boolean isSelected(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
return Boolean.TRUE.equals(
@@ -82,7 +79,7 @@
* @see #isSelected(RenderingContext)
*/
public static void setSelected(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
boolean selected
)
{
@@ -101,30 +98,30 @@
* Important: Each call to startDefaultStyleClassDisabled()
* must be followed by a matching call to endDefaultStyleClassDisabled().
*/
- public static void startDefaultStyleClassDisabled(RenderingContext context)
+ public static void startDefaultStyleClassDisabled(org.apache.myfaces.trinidadinternal.ui.RenderingContext context)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
- ((CoreAdfRenderingContext) arc).setDefaultLinkStyleDisabled(true);
+ RenderingContext arc = RenderingContext.getCurrentInstance();
+ ((CoreRenderingContext) arc).setDefaultLinkStyleDisabled(true);
}
/**
* Called by link containers that have called
* startDefaultStyleClassDisabled().
*/
- public static void endDefaultStyleClassDisabled(RenderingContext context)
+ public static void endDefaultStyleClassDisabled(org.apache.myfaces.trinidadinternal.ui.RenderingContext context)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
- ((CoreAdfRenderingContext) arc).setDefaultLinkStyleDisabled(false);
+ RenderingContext arc = RenderingContext.getCurrentInstance();
+ ((CoreRenderingContext) arc).setDefaultLinkStyleDisabled(false);
}
/**
* Called by base.desktop.LinkRenderer to detect whether default
* style class rendering is currently disabled.
*/
- public static boolean isDefaultStyleClassDisabled(RenderingContext context)
+ public static boolean isDefaultStyleClassDisabled(org.apache.myfaces.trinidadinternal.ui.RenderingContext context)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
- return ((CoreAdfRenderingContext) arc).isDefaultLinkStyleDisabled();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
+ return ((CoreRenderingContext) arc).isDefaultLinkStyleDisabled();
}
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ListRenderer.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/ListRenderer.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/ListRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ListRenderer.java Wed Jul 26 20:39:26 2006
@@ -29,6 +29,7 @@
import org.apache.myfaces.trinidadinternal.renderkit.uix.SelectItemSupport;
+
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/MediaRenderer.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/MediaRenderer.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/MediaRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/MediaRenderer.java Wed Jul 26 20:39:26 2006
@@ -28,6 +28,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/NavigationBarRenderer.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/NavigationBarRenderer.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/NavigationBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java Wed Jul 26 20:39:26 2006
@@ -20,29 +20,26 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.skin.Skin;
-
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
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.url.FormEncoder;
import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
-import org.apache.myfaces.trinidadinternal.ui.UIConstants;
+import org.apache.myfaces.trinidadinternal.skin.Skin;
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.TextNode;
+import org.apache.myfaces.trinidadinternal.ui.UIConstants;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean;
import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
import org.apache.myfaces.trinidadinternal.ui.data.DataObject;
import org.apache.myfaces.trinidadinternal.ui.data.DataObjectList;
import org.apache.myfaces.trinidadinternal.ui.data.bind.AccessKeyBoundValue;
-import org.apache.myfaces.trinidadinternal.ui.laf.base.SkinTranslatedBoundValue;
import org.apache.myfaces.trinidadinternal.ui.laf.base.NodeRoleUtils;
-import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
+import org.apache.myfaces.trinidadinternal.ui.laf.base.SkinTranslatedBoundValue;
import org.apache.myfaces.trinidadinternal.ui.partial.PartialPageRendererUtils;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
* Renderer for Navigation Bars showing either single or multiple records.
@@ -54,7 +51,7 @@
{
protected MutableUINode createSingleItemURLButton(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
boolean isBack,
Object buttonText,
Object buttonAccessKey,
@@ -72,7 +69,7 @@
protected MutableUINode createSingleItemSubmitButton(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
boolean isBack,
Object buttonText,
Object buttonAccessKey,
@@ -95,7 +92,7 @@
// decide how to create anonymous children for UINodes that
// can persist across renderings.
protected void prerender(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node) throws IOException
{
URLEncoder encoder = context.getURLEncoder();
@@ -147,7 +144,7 @@
}
protected void postrender(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -156,7 +153,7 @@
protected void renderContent(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -170,7 +167,7 @@
// render a single-step navigator
private void _renderSingleItemNavigator(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode navBar,
String eventKey,
String sourceKey,
@@ -615,7 +612,7 @@
private String _getChoiceOnChangeFormSubmitted(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
String form,
String eventKey,
@@ -673,7 +670,7 @@
// render a multi-item navigator
private void _renderMultiItemNavigator(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode navBar,
int blockSize,
String eventKey,
@@ -1131,7 +1128,7 @@
* Returns the destination, defaulting if none is provided
*/
private static String _getDestinationString(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -1159,7 +1156,7 @@
* Returns the name of the String, defaulting if none is provided
*/
private String _getNameString(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -1181,7 +1178,7 @@
// Note: This public method is called by TrainRenderer.java. The train
// uses the javascript submission code rendered here to do validation
public static void renderHiddenFields(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
String formName,
boolean isMulti,
String eventKey,
@@ -1250,7 +1247,7 @@
// create the anonymous node displayed between the links
private UINode _createRangeNode(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode navBar,
String destination,
String name,
@@ -1416,7 +1413,7 @@
* submit
*/
protected boolean requiresForm(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
return true;
@@ -1427,7 +1424,7 @@
* create each of the choice options and add them onto the choiceBean.
* @return the number of options added
*/
- private int _addNavigationOptions(RenderingContext context,
+ private int _addNavigationOptions(org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode navBar,
MarlinBean choice,
boolean isForm,
@@ -1573,7 +1570,7 @@
}
private UINode _createShowAllOption(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
long maxValue,
boolean atShowAll)
{
@@ -1594,7 +1591,7 @@
// create a choice option when max value is known
private MarlinBean _createNavigationOption(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode navBar,
boolean isForm,
long blockStart,
@@ -1649,7 +1646,7 @@
* Returns true if disabled navigation items should be shown
*/
protected boolean disabledNavigationShown(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
return true;
@@ -1661,7 +1658,7 @@
* multi item submit navbar
*/
private String _getMultiSubmitButtonText(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
boolean isBack,
int size
)
@@ -1700,7 +1697,7 @@
* Creates the submit button bean
*/
public static UINode createSubmitButton(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Object buttonText,
Object buttonAccessKey,
String buttonID,
@@ -1737,7 +1734,7 @@
// create one of the text links for navigation
private UINode _createTextLink(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode navBar,
boolean isBack,
String destination,
@@ -1781,7 +1778,7 @@
}
protected String getIconURI(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
boolean isBack,
boolean isEnabled
)
@@ -1812,7 +1809,7 @@
}
}
Skin skin = context.getSkin();
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
FacesContext fContext = context.getFacesContext();
String iconURI = (String)(skin.getIcon(
@@ -1824,7 +1821,7 @@
// create the arrow image used in multi-item navigation
private UINode _createArrowImage(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
boolean isBack,
String destination,
String onClick
@@ -1886,7 +1883,7 @@
* in a table navigation bar.
*/
protected String getBlockString(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
boolean isBack,
int numRecords
)
@@ -1918,7 +1915,7 @@
// get the string for the current range
private String _getRangeString(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
long start,
int visibleItemCount,
@@ -2033,7 +2030,7 @@
// Note: UINode is not guaranteed to be a navBar node.
// e.g., it could be a train node.
public static String getSingleDestinationURL(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
String eventKey,
String sourceKey,
@@ -2055,7 +2052,7 @@
// Note: UINode is not guaranteed to be a navBar node.
// e.g., it could be a train node.
public static String getSingleDestinationSubmit(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
String form,
String name,
@@ -2079,7 +2076,7 @@
// Note: UINode is not guaranteed to be a navBar node.
// e.g., it could be a train node.
public static String getSingleDestinationSubmit(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
String form,
String eventKey,
@@ -2135,7 +2132,7 @@
}
private String _getMultiDestinationSubmit(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
String form,
String eventKey,
String sourceKey,
@@ -2361,7 +2358,7 @@
// don't render as a table in certain locations like a page button bar
private boolean _renderAsTable(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
)
{
UINode ancestor = NodeRoleUtils.getStructuralAncestor(context);
@@ -2373,7 +2370,7 @@
// Utility method which tests whether the nav bar should validate
// prior to navigating
private static boolean _doValidate(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode navBar
)
{
@@ -2386,7 +2383,7 @@
* Writes the separator between two elements
*/
protected void renderItemSpacer(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
) throws IOException
{
char[] chars = new char[1];
@@ -2399,7 +2396,7 @@
* Writes the separator between two elements
*/
private void _renderSpacerCell(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
) throws IOException
{
ResponseWriter writer = context.getResponseWriter();
@@ -2415,7 +2412,7 @@
* subID.
*/
private void _renderStartTableCell(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
ResponseWriter writer,
boolean renderAsTable,
@@ -2435,7 +2432,7 @@
// Gets the encoded partial targets for the specified node
private static String _getPartialTargets(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
)
{
@@ -2450,7 +2447,7 @@
}
private String _getIDForFocus(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode navBar
)
{
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationPathRenderer.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/NavigationPathRenderer.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/NavigationPathRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationPathRenderer.java Wed Jul 26 20:39:26 2006
@@ -16,26 +16,22 @@
package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-
import java.util.Map;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidad.component.UIXPage;
-
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.CoreAdfRenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
+import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
import org.apache.myfaces.trinidadinternal.ui.Renderer;
-import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
-import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
/**
* Renders the breadcrumbs UI element. (this doesn't seem to be called. Use the core one instead)
@@ -58,7 +54,7 @@
protected void prerender(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -101,7 +97,7 @@
}
protected void postrender(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -129,7 +125,7 @@
}
protected void renderContent(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node
) throws IOException
{
@@ -191,7 +187,7 @@
}
protected void renderStamp(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
UINode stamp,
boolean isLastChild
@@ -228,7 +224,7 @@
stamp.render(context);
if (isLastChild)
- ((CoreAdfRenderingContext) context).setLinkDisabled(false);
+ ((CoreRenderingContext) context).setLinkDisabled(false);
}
finally
{
@@ -282,7 +278,7 @@
}
*/
protected boolean renderLastChild(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node)
{
return false;
@@ -300,7 +296,7 @@
// Renders (almost) everything that goes before the link
//
private void _renderStartOfLink(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
boolean vertical,
boolean isLastChild) throws IOException
{
@@ -323,7 +319,7 @@
// Renders everything that goes after the link
//
private void _renderEndOfLink(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
boolean vertical
) throws IOException
{
@@ -343,7 +339,7 @@
* defaults to horizontal.
* @return true if the orientation is vertical
*/
- private static boolean _getOrientation(RenderingContext context,
+ private static boolean _getOrientation(org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode breadCrumbs)
{
Object orientation = breadCrumbs.getAttributeValue(context,
@@ -377,7 +373,7 @@
_separatorIcon = separatorIcon;
}
- public void render(RenderingContext context, UINode node)
+ public void render(org.apache.myfaces.trinidadinternal.ui.RenderingContext context, UINode node)
throws IOException
{
ResponseWriter writer = context.getResponseWriter();
@@ -396,7 +392,7 @@
// render the separator
if (_separatorIcon != null)
{
- AdfRenderingContext arc = AdfRenderingContext.getCurrentInstance();
+ RenderingContext arc = RenderingContext.getCurrentInstance();
FacesContext fContext = context.getFacesContext();
OutputUtils.renderIcon(fContext, arc, _separatorIcon, "", null);
}
@@ -427,7 +423,7 @@
LinkRenderer.setDisabled(context, true);
}
- private boolean _isLastChild(RenderingContext context)
+ private boolean _isLastChild(org.apache.myfaces.trinidadinternal.ui.RenderingContext context)
{
// See if BreadCrumbs has taken responsibility for determining
// this. This code's here so that our "BetweenRenderer" strategy
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.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/OptionContainerRenderer.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/OptionContainerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionContainerRenderer.java Wed Jul 26 20:39:26 2006
@@ -36,6 +36,7 @@
import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
import org.apache.myfaces.trinidadinternal.ui.Renderer;
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
import org.apache.myfaces.trinidadinternal.ui.path.Path;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionRenderer.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/OptionRenderer.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/OptionRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/OptionRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,6 +17,7 @@
import java.io.IOException;
+
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/PageButtonBarRenderer.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/PageButtonBarRenderer.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/PageButtonBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageButtonBarRenderer.java Wed Jul 26 20:39:26 2006
@@ -20,6 +20,7 @@
import org.apache.myfaces.trinidad.component.UIXHierarchy;
+
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/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/base/xhtml/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/base/xhtml/PageMenuButtonsRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/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;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageNavigationPathRenderer.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/PageNavigationPathRenderer.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/PageNavigationPathRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageNavigationPathRenderer.java Wed Jul 26 20:39:26 2006
@@ -18,6 +18,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;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.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/PageRenderer.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/PageRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.java Wed Jul 26 20:39:26 2006
@@ -25,6 +25,7 @@
import org.apache.myfaces.trinidadinternal.ui.BaseMutableUINode;
import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
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.beans.MarlinBean;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRendererUtils.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/PageRendererUtils.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/PageRendererUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRendererUtils.java Wed Jul 26 20:39:26 2006
@@ -16,7 +16,6 @@
package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
import org.apache.myfaces.trinidad.component.UIXHierarchy;
-
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/ProcessChoiceBarRenderer.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/ProcessChoiceBarRenderer.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/ProcessChoiceBarRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessChoiceBarRenderer.java Wed Jul 26 20:39:26 2006
@@ -29,6 +29,7 @@
import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
+
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean;
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/ui/laf/base/xhtml/ProcessUtils.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/ProcessUtils.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/ProcessUtils.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java Wed Jul 26 20:39:26 2006
@@ -22,14 +22,12 @@
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidad.component.UIXCollection;
-
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet;
import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
-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.beans.MarlinBean;
-import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet;
import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
@@ -47,7 +45,7 @@
* Creates the submit button bean
*/
public static UINode createSubmitButton(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
Object buttonText,
Object buttonAccessKey,
String buttonID,
@@ -100,7 +98,7 @@
* @return
*/
public static String getSubmitScriptCall(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
String form,
String eventKey,
String sourceKey,
@@ -189,7 +187,7 @@
}
public static String getChoiceOnChangeFormSubmitted(
- RenderingContext context,
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context,
UINode node,
String form,
String eventKey,
@@ -315,14 +313,14 @@
}
public static void renderNavSubmitScript(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
) throws IOException
{
XhtmlLafUtils.addLib(context, _NAV_SUBMIT_SCRIPTLET);
}
public static void renderNavChoiceSubmitScript(
- RenderingContext context
+ org.apache.myfaces.trinidadinternal.ui.RenderingContext context
) throws IOException
{
XhtmlLafUtils.addLib(context, _NAV_CHOICE_SUBMIT_SCRIPTLET);
@@ -442,7 +440,7 @@
protected void outputScriptletContent(
FacesContext context,
- AdfRenderingContext arc) throws IOException
+ RenderingContext arc) throws IOException
{
// We output a function "_navSubmit" (UIX submit a goto event)
// which takes the following arguments:
@@ -478,7 +476,7 @@
protected void outputScriptletContent(
FacesContext context,
- AdfRenderingContext arc) throws IOException
+ RenderingContext arc) throws IOException
{
ResponseWriter writer = context.getResponseWriter();
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RepeatIdContextPropertyUINode.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/RepeatIdContextPropertyUINode.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/RepeatIdContextPropertyUINode.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RepeatIdContextPropertyUINode.java Wed Jul 26 20:39:26 2006
@@ -20,6 +20,7 @@
import org.apache.myfaces.trinidadinternal.io.RepeatIdResponseWriter;
+
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/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/base/xhtml/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/base/xhtml/ResetButtonRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ResetButtonRenderer.java Wed Jul 26 20:39:26 2006
@@ -21,8 +21,9 @@
import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidadinternal.ui.UINode;
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/RowLayoutRenderer.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/RowLayoutRenderer.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/RowLayoutRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/RowLayoutRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,6 +17,7 @@
import java.io.IOException;
+
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/ScriptRenderer.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/ScriptRenderer.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/ScriptRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ScriptRenderer.java Wed Jul 26 20:39:26 2006
@@ -20,6 +20,7 @@
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidadinternal.ui.NodeRole;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.RoledRenderer;
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/SelectOptionRenderer.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/SelectOptionRenderer.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/SelectOptionRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SelectOptionRenderer.java Wed Jul 26 20:39:26 2006
@@ -20,6 +20,7 @@
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.ui.laf.base.BaseLafUtils;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SeparatorRenderer.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/SeparatorRenderer.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/SeparatorRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SeparatorRenderer.java Wed Jul 26 20:39:26 2006
@@ -17,6 +17,7 @@
import java.io.IOException;
+
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/ShowItemRenderer.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/ShowItemRenderer.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/ShowItemRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ShowItemRenderer.java Wed Jul 26 20:39:26 2006
@@ -18,6 +18,7 @@
import java.io.IOException;
import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
+
import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SpacerRenderer.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/SpacerRenderer.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/SpacerRenderer.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/SpacerRenderer.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;