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 aw...@apache.org on 2006/09/22 22:18:36 UTC
svn commit: r449112 [1/3] - in /incubator/adffaces/trunk/trinidad:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadin...
Author: awiner
Date: Fri Sep 22 15:18:32 2006
New Revision: 449112
URL: http://svn.apache.org/viewvc?view=rev&rev=449112
Log:
First big step towards public rendering APIs. Created pure abstract base classes for Skin, FormData, PartialPageContext, and LocaleContext, some with significantly reduced APIs, and generally made these APIs and RenderingContext and Icon free from other dependencies. Next step is moving all of these out of trinidadinternal and into trinidad, which I think requires a bit of discussion
Added:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/FormData.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/PartialPageContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java
- copied, changed from r448652, incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java
- copied, changed from r448652, incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContextImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/IconInputStreamProvider.java
Removed:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/AccessibilityMode.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/CacheUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ColorizedIconImageRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/FlippedIconImageRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/encode/AbstractXMLEncoder.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseSkin.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameBorderLayoutRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputHiddenRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputLabelAndMessageRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputLabelRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelBorderLayoutRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelFormLayoutRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelHeaderRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PartialPageUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectRangeChoiceBarRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ShowDetailRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyCheckboxRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRadioRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectOneRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/DateFormatInfoScriptlet.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/Scriptlet.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/CellUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/UIXCookie.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/LocaleContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/nls/MutableLocaleContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinExtension.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinNotAvailable.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleProvider.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/Icon.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/GraphicsUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIXRenderingContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/CompositeRenderingContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TreeRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/AccentedLafIconProvider.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/FormValueRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HiddenLabelUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/HtmlRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleButtonUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/FormattedTextParser.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/nls/LocaleUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/CoreRenderKitTest.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/Agent.java Fri Sep 22 15:18:32 2006
@@ -31,8 +31,8 @@
* (and not guaranteed to be supported in future releases).
* <p>
*/
-public interface Agent {
-
+public interface Agent
+{
/**
* Constant for Unknown device type
*/
@@ -69,9 +69,15 @@
public static final String PLATFORM_LINUX = "linux";
/**
- * Constant for MAC platform
+ * Constant for MacOS platform
+ */
+ public static final String PLATFORM_MACOS = "mac";
+
+ /**
+ * Constant for Mac platform
+ * @deprecated
*/
- public static final String PLATFORM_MAC = "mac";
+ public static final String PLATFORM_MAC = PLATFORM_MACOS;
/**
* Constant for plam platform
@@ -177,5 +183,7 @@
* <br><i>accessKeys</i>- returns a Boolean value signifying whether or not the Agent
* supports accessKeys.
*/
+ // See CapabilityMap for why this takes Object as a key instead
+ // of String, at least for now
public Map<Object, Object> getCapabilities();
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java Fri Sep 22 15:18:32 2006
@@ -215,11 +215,29 @@
*/
public abstract String getSkinFamily();
+ public enum Accessibility
+ {
+ DEFAULT("default"),
+ INACCESSIBLE("inaccessible"),
+ SCREEN_READER("screnReader");
+
+ Accessibility(String name)
+ {
+ _name = name;
+ }
+
+ public String toString()
+ {
+ return _name;
+ }
+
+ private final String _name;
+ };
+
/**
* Returns the name of the current accessibility mode.
- * @todo Use AccessibilityMode object?
*/
- public abstract String getAccessibilityMode();
+ public abstract Accessibility getAccessibilityMode();
//
// General localization
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java Fri Sep 22 15:18:32 2006
@@ -137,12 +137,12 @@
}
@Override
- public String getAccessibilityMode()
+ public Accessibility getAccessibilityMode()
{
return _accMode;
}
- public void setAccessibilityMode(String accMode)
+ public void setAccessibilityMode(Accessibility accMode)
{
_accMode = accMode;
}
@@ -289,7 +289,7 @@
private TimeZone _timeZone = _FIXED_TIME_ZONE;
private String _skin;
- private String _accMode;
+ private Accessibility _accMode;
private Agent _agent;
private boolean _rtl = false;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/CapabilityMap.java Fri Sep 22 15:18:32 2006
@@ -33,6 +33,14 @@
// FIXME -= Simon Lessard =-
// This is another map that can accept both String and another type as keys.
// Shouldn't we force type safety with a single key type ?
+// -= Adam Winer =-
+// This, supports Strings and CapabilityKey. In theory, using
+// CapabilityKey is faster, which lets our built-in renderers
+// execute faster. A fair question is whether this is a real
+// issue. At the moment, however, it is definitely the case
+// that we are using CapabilityKey inside our code, and yet we
+// haven't made the plunge to require everyone to use
+// CapabilityKey on Agent (or make CapabilityKey public).
public class CapabilityMap extends AbstractMap<Object, Object> implements Cloneable
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/agent/TrinidadAgent.java Fri Sep 22 15:18:32 2006
@@ -443,7 +443,7 @@
public int getAgentOS();
/**
- * Returns a capability of an AdfFacesAgent
+ * Returns a capability of a TrinidadAgent
*/
public Object getCapability(CapabilityKey key);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java Fri Sep 22 15:18:32 2006
@@ -57,7 +57,7 @@
import org.apache.myfaces.trinidadinternal.metadata.RegionMetadata;
-import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
+import org.apache.myfaces.trinidadinternal.renderkit.PartialPageContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.share.config.UIXCookie;
@@ -233,21 +233,21 @@
}
@Override
- public String getAccessibilityMode()
- {
- String s = (String) _bean.getProperty(
+ public Accessibility getAccessibilityMode()
+ {
+ String name = (String) _bean.getProperty(
RequestContextBean.ACCESSIBILITY_MODE_KEY);
- if (s != null)
- return s;
-
- UIXCookie cookie = _getUIXCookie();
- if (cookie != null)
+ if (name == null)
{
- if (cookie.getAccessibilityMode() != null)
- return cookie.getAccessibilityMode().getName();
+ UIXCookie cookie = _getUIXCookie();
+ if (cookie != null)
+ {
+ if (cookie.getAccessibilityMode() != null)
+ name = cookie.getAccessibilityMode().toString();
+ }
}
- return null;
+ return _ACCESSIBILITY_NAMES.get(name);
}
@Override
@@ -564,8 +564,11 @@
if (_agent == null)
{
Agent agent = _agentFactory.createAgent(__getFacesContext());
- // =-=AEW Does this need to be an AdfFacesAgent? That should
- // only be necessary once we get to rendering...
+ // =-=AEW In theory, this does not need to be a TrinidadAgent
+ // That should only be necessary once we get to rendering...
+ // However, we're gonna have to turn it into one when it comes
+ // to rendering time, and our RenderingContext isn't doing this
+ // today
TrinidadAgentImpl fAgent = new TrinidadAgentImpl(__getFacesContext(),agent);
_agent = fAgent;
}
@@ -714,6 +717,18 @@
static public final String FORCED_PARTIAL_KEY =
"org.apache.myfaces.trinidadinternal.ForcedPartialRequest";
+
+ // A mapping from string names (as used in the config file)
+ // to accessibility objects
+ static private final Map<String, Accessibility>
+ _ACCESSIBILITY_NAMES = new HashMap<String, Accessibility>();
+
+ static
+ {
+ _ACCESSIBILITY_NAMES.put("default", Accessibility.DEFAULT);
+ _ACCESSIBILITY_NAMES.put("inaccessible", Accessibility.INACCESSIBLE);
+ _ACCESSIBILITY_NAMES.put("screenReader", Accessibility.SCREEN_READER);
+ }
static private final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(RequestContextImpl.class);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java Fri Sep 22 15:18:32 2006
@@ -46,6 +46,7 @@
_value = getAttribute("value");
}
+ @SuppressWarnings("deprecation")
public void apply(FaceletContext faceletContext,
UIComponent parent) throws IOException, FacesException, FaceletException, ELException
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/SetActionListenerTag.java Fri Sep 22 15:18:32 2006
@@ -44,6 +44,7 @@
_to = getRequiredAttribute("to");
}
+ @SuppressWarnings("deprecation")
public void apply(FaceletContext faceletContext,
UIComponent parent) throws FaceletException, ELException
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadListenersTagRule.java Fri Sep 22 15:18:32 2006
@@ -49,6 +49,7 @@
}
@Override
+ @SuppressWarnings("deprecation")
public void applyMetadata(FaceletContext ctx, Object instance)
{
MethodExpression expr =
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/PainterImageRenderer.java Fri Sep 22 15:18:32 2006
@@ -32,6 +32,7 @@
import java.util.Map;
import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
import org.apache.myfaces.trinidadinternal.image.painter.FontUtils;
import org.apache.myfaces.trinidadinternal.image.painter.Painter;
@@ -265,7 +266,7 @@
_response = responseProperties;
// Initialize the reading direction
- _direction = imageContext.getLocaleContext().getReadingDirection();
+ _direction = LocaleUtils.getReadingDirection(imageContext.getLocaleContext());
Object o = null;
if ((o = requestedProperties.get(DIRECTION_KEY)) != null)
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/CacheUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/CacheUtils.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/CacheUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/cache/CacheUtils.java Fri Sep 22 15:18:32 2006
@@ -54,7 +54,7 @@
)
{
LocaleContext localeContext = context.getLocaleContext();
- int direction = localeContext.getReadingDirection();
+ int direction = LocaleUtils.getReadingDirection(localeContext);
if (properties != null)
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ColorizedIconImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ColorizedIconImageRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ColorizedIconImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/ColorizedIconImageRenderer.java Fri Sep 22 15:18:32 2006
@@ -144,9 +144,7 @@
ImageContext context
)
{
- int direction = context.getLocaleContext().getReadingDirection();
-
- return (direction == LocaleUtils.DIRECTION_RIGHTTOLEFT);
+ return context.getLocaleContext().isRightToLeft();
}
// Returns the target colors for a colorization based on the
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/FlippedIconImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/FlippedIconImageRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/FlippedIconImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/FlippedIconImageRenderer.java Fri Sep 22 15:18:32 2006
@@ -133,9 +133,7 @@
ImageContext context
)
{
- int direction = context.getLocaleContext().getReadingDirection();
-
- return (direction == LocaleUtils.DIRECTION_RIGHTTOLEFT);
+ return context.getLocaleContext().isRightToLeft();
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/encode/AbstractXMLEncoder.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/encode/AbstractXMLEncoder.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/encode/AbstractXMLEncoder.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/encode/AbstractXMLEncoder.java Fri Sep 22 15:18:32 2006
@@ -344,7 +344,7 @@
PrintWriter out
)
{
- int direction = context.getLocaleContext().getReadingDirection();
+ int direction = LocaleUtils.getReadingDirection(context.getLocaleContext());
Integer value = (Integer)properties.get(DIRECTION_KEY);
if (value != null)
Added: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/FormData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/FormData.java?view=auto&rev=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/FormData.java (added)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/FormData.java Fri Sep 22 15:18:32 2006
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2005,2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.trinidadinternal.renderkit;
+
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+
+abstract public class FormData
+{
+ abstract public String getName();
+
+ abstract public void addLabel(
+ String targetId,
+ String label);
+
+ abstract public Integer addGlobalMessageFormat(RenderingContext rc);
+
+ abstract public void addNeededValue(String name);
+
+ abstract public void addRenderedValue(String name);
+}
Added: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/PartialPageContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/PartialPageContext.java?view=auto&rev=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/PartialPageContext.java (added)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/PartialPageContext.java Fri Sep 22 15:18:32 2006
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.trinidadinternal.renderkit;
+
+import java.util.Iterator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
+
+import org.apache.myfaces.trinidad.context.RequestContext;
+
+import org.apache.myfaces.trinidadinternal.context.RequestContextImpl;
+
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+
+/**
+ * Context object which is used to track the targets of a partial
+ * page render during the partial page rendering pass.
+ * Clients never need to explicitly create PartialPageContext
+ * objects.
+ * <p>
+ * During the partial rendering pass, some Renderer implementations
+ * may modify the set of partial targets that are rendered.
+ * (For example, the FormRenderer adds a partial target for its
+ * shared hidden fields if any children of the form are rendered.)
+ * After the partial render pass, getPartialTargets() can be
+ * called to determine the actual set of partial targets that were
+ * rendered.
+ *
+ * @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/renderkit/core/ppr/PartialPageContext.java#0 $) $Date: 10-nov-2005.19:02:58 $
+ * @author The Oracle ADF Faces Team
+ */
+abstract public class PartialPageContext
+{
+ protected PartialPageContext()
+ {
+ }
+
+ abstract public void finish();
+
+ /**
+ * Returns the set of partial targets for this rendering pass.
+ */
+ abstract public Iterator<String> getPartialTargets();
+
+ /**
+ * Tests whether the specified id is the client id of a UIComponent that
+ * should be rendered as part of the partial rendering pass.
+ */
+ abstract public boolean isPartialTarget(String id);
+
+ /**
+ * Tests whether the specified partial target has been rendered.
+ */
+ abstract public boolean isPartialTargetRendered(String id);
+
+ /**
+ * Tests whether any targets were rendered in this pass.
+ */
+ abstract public boolean hasRenderedTargets();
+
+ /**
+ * Adds a new partial target to render.
+ * <p>
+ * This method may be called during the partial rendering pass to
+ * add to the set of partial targets, but only if the pass has
+ * not yet been completed. Clients should first check to see
+ * whether the partial rendering pass has finished by calling
+ * isPartialPassComplete() before calling this method.
+ *
+ * @param id The id of the partial target to render
+ * @see #isPartialPassComplete
+ */
+ abstract public void addPartialTarget(String id);
+
+ /**
+ * Returns true if we are inside of a partial target.
+ */
+ abstract public boolean isInsidePartialTarget();
+
+ /**
+ * Adds a partial target that has already been rendered; this
+ * is needed if the "clientId" of a component does not match
+ * up to the top element (or elements).
+ */
+ abstract public void addRenderedPartialTarget(String id);
+
+ abstract public Iterator<String> getRenderedPartialTargets();
+
+ /**
+ * Tests whether all of the partial targets for this tree have been rendered.
+ */
+ abstract public boolean isPartialPassComplete();
+
+ /**
+ * Notifies the PartialPageContext that the specified partial target is
+ * about to be rendered.
+ * <p>
+ * This method is called automatically by ADF Faces during the partial
+ * rendering pass when a partial target is about to be rendered.
+ * Clients should never need to call this method.
+ *
+ * @param context the current FacesContext
+ * @param id The ID of the partial target that is about to be rendered
+ * @see #popRenderedPartialTarget
+ */
+ abstract public void pushRenderedPartialTarget(
+ String id);
+
+ /**
+ * Notifies the PartialPageContext that the current partial target
+ * has finished rendering.
+ * <p>
+ * This method is called automatically by ADF Faces during the partial
+ * rendering pass when a partial target has finished rendering.
+ * Clients should never need to call this method.
+ *
+ * @param context the current FacesContext
+ */
+ abstract public void popRenderedPartialTarget();
+}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/RenderingContext.java Fri Sep 22 15:18:32 2006
@@ -18,16 +18,15 @@
import java.util.Map;
import java.util.MissingResourceException;
+import org.apache.myfaces.trinidad.context.Agent;
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormData;
-import org.apache.myfaces.trinidadinternal.share.config.AccessibilityMode;
+
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.StyleContext;
/**
* @todo REMOVE DEPENDENCY ON AcessibilityMode
@@ -42,11 +41,6 @@
return _CURRENT_CONTEXT.get();
}
- static public final Object INACCESSIBLE_MODE =
- AccessibilityMode.INACCESSIBLE_MODE;
- static public final Object SCREEN_READER_MODE =
- AccessibilityMode.SCREEN_READER_MODE;
-
public RenderingContext()
{
attach();
@@ -57,12 +51,8 @@
*/
abstract public Map<Object, Object> getProperties();
- abstract public TrinidadAgent getAgent();
- /**
- * @todo REMOVE LocaleContext
- */
+ abstract public Agent getAgent();
abstract public LocaleContext getLocaleContext();
- abstract public StyleContext getStyleContext();
abstract public FormData getFormData();
abstract public void setFormData(FormData data);
abstract public void clearFormData();
@@ -105,7 +95,7 @@
abstract public Map<String, String> getSkinResourceKeyMap();
abstract public boolean isRightToLeft();
abstract public String getOutputMode();
- abstract public Object getAccessibilityMode();
+ abstract public RequestContext.Accessibility getAccessibilityMode();
/**
* @TODO This is a hack API to enable caching of the client ID.
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java Fri Sep 22 15:18:32 2006
@@ -69,7 +69,7 @@
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.RenderKitBase;
import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
-import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
+import org.apache.myfaces.trinidadinternal.renderkit.PartialPageContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PartialPageUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRendererUtils.java Fri Sep 22 15:18:32 2006
@@ -19,6 +19,8 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.trinidad.context.Agent;
+
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.agent.CapabilityKey;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
@@ -75,8 +77,8 @@
CapabilityKey cap
)
{
- TrinidadAgent agent = context.getAgent();
- Object capPartial = agent.getCapability(cap);
+ Agent agent = context.getAgent();
+ Object capPartial = agent.getCapabilities().get(cap);
if (!Boolean.TRUE.equals(capPartial))
return false;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java Fri Sep 22 15:18:32 2006
@@ -35,10 +35,8 @@
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgentImpl;
import org.apache.myfaces.trinidadinternal.agent.AgentUtil;
+import org.apache.myfaces.trinidadinternal.renderkit.FormData;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormData;
-
-import org.apache.myfaces.trinidadinternal.share.config.AccessibilityMode;
import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
import org.apache.myfaces.trinidadinternal.skin.Skin;
@@ -49,7 +47,7 @@
import org.apache.myfaces.trinidadinternal.style.StyleContext;
import org.apache.myfaces.trinidadinternal.style.util.StyleUtils;
-import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
+import org.apache.myfaces.trinidadinternal.renderkit.PartialPageContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PartialPageUtils;
import org.apache.myfaces.trinidadinternal.share.nls.MutableDecimalFormatContext;
import org.apache.myfaces.trinidadinternal.share.nls.MutableLocaleContext;
@@ -69,8 +67,8 @@
_initializeSkin(afContext);
_initializePPR(context, afContext);
- _accessibilityMode = AccessibilityMode.getAccessibilityMode(
- afContext.getAccessibilityMode());
+ // Get and cache (since it can be EL-bound)
+ _accessibilityMode = afContext.getAccessibilityMode();
}
@@ -131,7 +129,15 @@
}
@Override
- public TrinidadAgent getAgent()
+ public Agent getAgent()
+ {
+ return _agent;
+ }
+
+ /**
+ * Typesafe accessor for the TrinidadAgent APIs.
+ */
+ public TrinidadAgent getTrinidadAgent()
{
return _agent;
}
@@ -155,7 +161,7 @@
@Override
- public Object getAccessibilityMode()
+ public RequestContext.Accessibility getAccessibilityMode()
{
return _accessibilityMode;
}
@@ -192,7 +198,6 @@
/**
* Get an interface that can be used for style lookups and generation.
*/
- @Override
public StyleContext getStyleContext()
{
if (_styleContext == null)
@@ -508,7 +513,7 @@
private Map<String, String> _styleMap;
private Map<String, String> _skinResourceKeyMap;
private String _outputMode;
- private Object _accessibilityMode;
+ private RequestContext.Accessibility _accessibilityMode;
private PartialPageContext _pprContext;
private LocaleContext _localeContext;
private StyleContext _styleContext;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java Fri Sep 22 15:18:32 2006
@@ -21,6 +21,7 @@
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.HtmlRenderer;
import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
import org.apache.myfaces.trinidadinternal.skin.Skin;
@@ -73,7 +74,7 @@
*/
public TrinidadAgent getAgent()
{
- return _arc.getAgent();
+ return ((CoreRenderingContext) _arc).getTrinidadAgent();
}
public boolean checkStylesModified()
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java Fri Sep 22 15:18:32 2006
@@ -30,8 +30,8 @@
import org.apache.myfaces.trinidad.component.UIXProcess;
import org.apache.myfaces.trinidad.component.core.nav.CoreTrain;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+import org.apache.myfaces.trinidadinternal.renderkit.FormData;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormData;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ProcessUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java Fri Sep 22 15:18:32 2006
@@ -35,8 +35,8 @@
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.model.RowKeySet;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.FormData;
import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormData;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ResourceKeyUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java Fri Sep 22 15:18:32 2006
@@ -31,6 +31,7 @@
import org.apache.myfaces.trinidad.component.core.output.CoreSpacer;
import org.apache.myfaces.trinidad.component.html.HtmlRowLayout;
import org.apache.myfaces.trinidad.component.html.HtmlTableLayout;
+import org.apache.myfaces.trinidad.context.Agent;
import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
@@ -71,8 +72,7 @@
doc.getChildren().add(form);
form.setId("a");
- boolean isDesktop = (arc.getAgent().getAgentType()==
- TrinidadAgent.TYPE_DESKTOP );
+ boolean isDesktop = (arc.getAgent().getType().equals(Agent.TYPE_DESKTOP));
//
// Create the calendar row
@@ -106,7 +106,7 @@
JspUtils.createGoButton(arc, _CANCEL_LABEL_KEY);
buttonRow.getChildren().add(cancelButton);
- Object cap = arc.getAgent().getCapability(
+ Object cap = arc.getAgent().getCapabilities().get(
TrinidadAgent.CAP_MULTIPLE_WINDOWS);
boolean multWindowsSupported = Boolean.TRUE.equals( cap );
if (multWindowsSupported )
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java Fri Sep 22 15:18:32 2006
@@ -89,8 +89,7 @@
UIComponent innerLeft = getFacet(component, innerLeftName);
UIComponent innerRight = getFacet(component, innerRightName);
- int dir = arc.getLocaleContext().getReadingDirection();
- boolean r2l = (dir == LocaleUtils.DIRECTION_RIGHTTOLEFT);
+ boolean r2l = arc.getLocaleContext().isRightToLeft();
if (left == null)
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PPRResponseWriter.java Fri Sep 22 15:18:32 2006
@@ -26,6 +26,7 @@
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+import org.apache.myfaces.trinidadinternal.renderkit.PartialPageContext;
import org.apache.myfaces.trinidadinternal.io.ResponseWriterDecorator;
public class PPRResponseWriter extends ResponseWriterDecorator
Copied: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java (from r448652, incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java?view=diff&rev=449112&p1=incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java&r1=448652&p2=incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java Fri Sep 22 15:18:32 2006
@@ -25,6 +25,7 @@
import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidadinternal.context.RequestContextImpl;
+import org.apache.myfaces.trinidadinternal.renderkit.PartialPageContext;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -45,9 +46,9 @@
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/renderkit/core/ppr/PartialPageContext.java#0 $) $Date: 10-nov-2005.19:02:58 $
* @author The Oracle ADF Faces Team
*/
-public class PartialPageContext
+public class PartialPageContextImpl extends PartialPageContext
{
- PartialPageContext()
+ PartialPageContextImpl()
{
_targets = new HashMap<String, Boolean>();
_renderedTargets = new HashSet<String>();
@@ -60,7 +61,7 @@
* Creates a PartialPageContext to use to render the partial targets with
* the specified ids.
*/
- public PartialPageContext(
+ public PartialPageContextImpl(
RequestContext afContext)
{
this();
@@ -246,5 +247,5 @@
// FIXME: java.util.Stack... enough said... ArrayList or LinkedList please
private Stack<String> _currentTargetStack;
- private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(PartialPageContext.class);
+ private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(PartialPageContextImpl.class);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseSkin.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseSkin.java Fri Sep 22 15:18:32 2006
@@ -15,14 +15,14 @@
*/
package org.apache.myfaces.trinidadinternal.renderkit.core.skin;
-import org.apache.myfaces.trinidadinternal.skin.Skin;
+import org.apache.myfaces.trinidadinternal.skin.SkinImpl;
/**
* Base Skin implementation
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/renderkit/core/skin/BaseSkin.java#0 $) $Date: 10-nov-2005.19:02:50 $
* @author The Oracle ADF Faces Team
*/
-public class BaseSkin extends Skin
+public class BaseSkin extends SkinImpl
{
public BaseSkin()
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MacOSSwitcherIcon.java Fri Sep 22 15:18:32 2006
@@ -22,7 +22,7 @@
import java.util.Map;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
+import org.apache.myfaces.trinidad.context.Agent;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
@@ -102,7 +102,8 @@
// Returns the Icon to use
private Icon _getIcon(RenderingContext arc)
{
- return (arc.getAgent().getAgentOS() == TrinidadAgent.OS_MACOS) ?
+ return (arc.getAgent().getPlatformName().equals(
+ Agent.PLATFORM_MAC)) ?
_macOSIcon :
_icon;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/AutoSubmitUtils.java Fri Sep 22 15:18:32 2006
@@ -25,6 +25,7 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import org.apache.myfaces.trinidadinternal.renderkit.FormData;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.XhtmlScriptletFactory;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ChooseDateRenderer.java Fri Sep 22 15:18:32 2006
@@ -28,6 +28,7 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.core.input.CoreChooseDate;
+import org.apache.myfaces.trinidad.context.Agent;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
@@ -108,8 +109,7 @@
if (isInline && !isInlineSupported(arc))
return;
- boolean isDesktop = (arc.getAgent().getAgentType() ==
- TrinidadAgent.TYPE_DESKTOP);
+ boolean isDesktop = isDesktop(arc);
ResponseWriter writer = context.getResponseWriter();
writer.startElement("table", component);
renderId(context, component);
@@ -1462,7 +1462,7 @@
// Inline mode is only supported if partial page rendering is
// supported and we are not running in screen reader mode.
return (PartialPageUtils.supportsPartialRendering(arc) &&
- (arc.getAgent().getAgentType() == TrinidadAgent.TYPE_DESKTOP) &&
+ isDesktop(arc) &&
!isScreenReaderMode(arc));
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ColumnGroupRenderer.java Fri Sep 22 15:18:32 2006
@@ -30,6 +30,7 @@
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.model.SortCriterion;
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
+import org.apache.myfaces.trinidadinternal.renderkit.FormData;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.CellUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.ColumnData;
@@ -365,7 +366,7 @@
// can be created on the fly as necessary); see the JS
// referenced in this.getSortingOnclick
Object domLevel =
- arc.getAgent().getCapability(TrinidadAgent.CAP_DOM);
+ arc.getAgent().getCapabilities().get(TrinidadAgent.CAP_DOM);
if(
domLevel == null ||
domLevel == TrinidadAgent.DOM_CAP_NONE ||
@@ -440,7 +441,7 @@
// that the only reason desktop renders it in both places
// was for Netscape. If I'm right, then really this decision should
// be driven off an "event bubbling" agent property.
- if (arc.getAgent().getAgentType() != TrinidadAgent.TYPE_PDA)
+ if (!isPDA(arc))
rw.writeAttribute("onclick", sortOnclick, null);
// TODO: we should pass in null for "event bubbling" systems
@@ -575,7 +576,7 @@
boolean renderAnchor = supportsNavigation(arc);
if (renderAnchor)
{
- if (arc.getAgent().getAgentType() == TrinidadAgent.TYPE_PDA)
+ if (isPDA(arc))
writer.writeText(XhtmlConstants.NBSP_STRING, null);
writer.startElement("a", null);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java Fri Sep 22 15:18:32 2006
@@ -29,6 +29,7 @@
import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.event.ReturnEvent;
+import org.apache.myfaces.trinidadinternal.renderkit.FormData;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
public class CommandLinkRenderer extends GoLinkRenderer
Copied: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java (from r448652, incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java?view=diff&rev=449112&p1=incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java&r1=448652&p2=incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CoreFormData.java Fri Sep 22 15:18:32 2006
@@ -37,18 +37,20 @@
import org.apache.myfaces.trinidad.util.MessageFactory;
import org.apache.myfaces.trinidad.validator.ClientValidator;
+import org.apache.myfaces.trinidadinternal.renderkit.FormData;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat;
import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
/**
- *@todo - this needs to be moved to the renderkit package
+ * Implementation of FormData from the CoreRenderKit (or,
+ * more specifically, from the Trinidad FormRenderer)
*/
-public class FormData
+public class CoreFormData extends FormData
{
- public FormData(String name)
+ public CoreFormData(String name)
{
_formName = name;
}
@@ -63,31 +65,16 @@
_inputTextCount++;
}
- public String getDefaultCommandId()
- {
- return _defaultCommandId;
- }
-
-
- public String getFormName()
- {
- return _formName;
- }
-
public boolean hasImmediateComponent()
{
return _hasImmediateComponent;
}
- public void setDefaultCommandId(String defaultCommandId)
- {
- _defaultCommandId = defaultCommandId;
- }
-
public String getName()
{
return _formName;
}
+
public void addLabel(
String targetId,
String label
@@ -275,8 +262,10 @@
}
/**
- * @todo - adding required, converter, validators should be done separately
+ * TODO - adding required, converter, validators should be done separately
* and this method should be killed.
+ * TODO - when this API has been fixed up, move the new
+ * versions to FormData
*/
public void addOnSubmitConverterValidators(
UIComponent component,
@@ -297,7 +286,7 @@
if (immediate)
_hasImmediateComponent = true;
- FormData.ConvertValidate convertValidateInfo = null;
+ CoreFormData.ConvertValidate convertValidateInfo = null;
// required identifies that required='true' has been set and that a validation
// error should be displayed when no value is entered in the input field
@@ -373,7 +362,7 @@
*/
private void _addFormConverterInfo(
String converter,
- FormData.ConvertValidate convertValidate
+ CoreFormData.ConvertValidate convertValidate
)
{
if (converter != null && convertValidate != null)
@@ -397,7 +386,7 @@
*/
private void _addFormValidatorInfo(
String validator,
- FormData.ConvertValidate convertValidate
+ CoreFormData.ConvertValidate convertValidate
)
{
if (validator != null && convertValidate != null)
@@ -420,7 +409,7 @@
RenderingContext rc,
UIComponent component,
ClientConverter submitConverter,
- FormData.ConvertValidate convertValidate,
+ CoreFormData.ConvertValidate convertValidate,
String clientId
) throws IOException
{
@@ -500,7 +489,7 @@
RenderingContext rc,
UIComponent component,
ClientValidator submitValidator,
- FormData.ConvertValidate convertValidate,
+ CoreFormData.ConvertValidate convertValidate,
String clientId
) throws IOException
{
@@ -731,7 +720,6 @@
}
private int _inputTextCount = 0;
- private String _defaultCommandId = null;
private boolean _hasImmediateComponent = false;
// map of unique validation string to index in map
@@ -783,5 +771,5 @@
static private final String _GLOBAL_FORMAT_KEY = "af_messages.GLOBAL_MESSAGE_FORMAT";
- static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(FormData.class);
+ static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(CoreFormData.class);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java Fri Sep 22 15:18:32 2006
@@ -32,6 +32,7 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.component.UIXEditableValue;
+import org.apache.myfaces.trinidadinternal.renderkit.FormData;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
abstract public class EditableValueRenderer extends ValueRenderer
@@ -196,7 +197,7 @@
FormData fData = arc.getFormData();
boolean immediate = isImmediate(bean);
- fData.addOnSubmitConverterValidators(component,
+ ((CoreFormData) fData).addOnSubmitConverterValidators(component,
converter,
validators,
getClientId(context, component),
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java Fri Sep 22 15:18:32 2006
@@ -39,9 +39,10 @@
import org.apache.myfaces.trinidad.context.Agent;
+import org.apache.myfaces.trinidadinternal.renderkit.FormData;
+import org.apache.myfaces.trinidadinternal.renderkit.PartialPageContext;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.CoreResponseStateManager;
-import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
import org.apache.myfaces.trinidadinternal.renderkit.uix.SubformRenderer;
// TODO: Remove this class
@@ -107,15 +108,9 @@
String formName = getClientId(context, comp);
- FormData fData = new FormData(formName);
+ CoreFormData fData = new CoreFormData(formName);
arc.setFormData(fData);
- String defaultCommand = getDefaultCommand(bean);
- if (defaultCommand != null)
- {
- fData.setDefaultCommandId(defaultCommand);
- }
-
if (formName != null)
{
// =-=AEW This should get removed in favor of solely using FormData;
@@ -211,7 +206,7 @@
boolean isPIE = Agent.PLATFORM_PPC.equalsIgnoreCase(
arc.getAgent().getPlatformName());
- String formName = arc.getFormData().getFormName();
+ String formName = arc.getFormData().getName();
PartialPageContext pprContext = arc.getPartialPageContext();
boolean isXMLDOM = supportsXMLDOM(arc);
@@ -362,7 +357,7 @@
//
// Write the array of reset calls
//
- FormData fData = arc.getFormData();
+ CoreFormData fData = (CoreFormData) arc.getFormData();
List<String> resetCallList = fData.getResetCalls(false);
int resetCallCount = (resetCallList != null)
@@ -371,7 +366,7 @@
if (resetCallCount != 0)
{
- String jsID = XhtmlUtils.getJSIdentifier(arc.getFormData().getFormName());
+ String jsID = XhtmlUtils.getJSIdentifier(fData.getName());
ResponseWriter writer = context.getResponseWriter();
writer.startElement("script", null);
@@ -429,10 +424,10 @@
// Output validation-related JavaScript
//
ResponseWriter writer = context.getResponseWriter();
- FormData fData = arc.getFormData();
+ CoreFormData fData = (CoreFormData) arc.getFormData();
// Fix up the form name for use as a Javascript identifier
- String jsID = XhtmlUtils.getJSIdentifier(arc.getFormData().getFormName());
+ String jsID = XhtmlUtils.getJSIdentifier(fData.getName());
writer.startElement("script", null);
renderScriptDeferAttribute(context, arc);
@@ -522,7 +517,7 @@
writer.writeText(jsID, null);
// get the form validators
- List<FormData.ConvertValidate> validatorInfoList =
+ List<CoreFormData.ConvertValidate> validatorInfoList =
fData.getFormValidatorsInfo(false);
if (validatorInfoList == null)
@@ -549,7 +544,7 @@
writer.writeText("],", null);
}
- FormData.ConvertValidate convertValidate = validatorInfoList.get(j);
+ CoreFormData.ConvertValidate convertValidate = validatorInfoList.get(j);
writer.writeText("\"", null);
@@ -795,7 +790,8 @@
String call
)
{
- FormData fData = RenderingContext.getCurrentInstance().getFormData();
+ CoreFormData fData = (CoreFormData)
+ RenderingContext.getCurrentInstance().getFormData();
fData.addResetCall(call);
}
@@ -809,7 +805,8 @@
String requiredMessageKey
) throws IOException
{
- FormData fData = RenderingContext.getCurrentInstance().getFormData();
+ CoreFormData fData = (CoreFormData)
+ RenderingContext.getCurrentInstance().getFormData();
fData.addOnSubmitConverterValidators(component,
converter,
@@ -840,25 +837,17 @@
}
- public static String getDefaultCommandId(
- )
- {
- FormData fData = RenderingContext.getCurrentInstance().getFormData();
- return fData.getDefaultCommandId();
- }
-
-
public static int getInputTextCount(
)
{
- FormData fData = RenderingContext.getCurrentInstance().getFormData();
+ CoreFormData fData = (CoreFormData) RenderingContext.getCurrentInstance().getFormData();
return fData.getInputTextCount();
}
public static void incrementInputTextCount(
)
{
- FormData fData = RenderingContext.getCurrentInstance().getFormData();
+ CoreFormData fData = (CoreFormData) RenderingContext.getCurrentInstance().getFormData();
fData.incrementInputTextCount();
}
@@ -1003,7 +992,7 @@
) throws IOException
{
ResponseWriter writer = context.getResponseWriter();
- FormData fData = arc.getFormData();
+ CoreFormData fData = (CoreFormData) arc.getFormData();
if (fData.useCompoundNames())
{
@@ -1070,7 +1059,7 @@
renderScriptTypeAttribute(context, arc);
writer.writeText("var _reset", null);
- writer.writeText(XhtmlUtils.getJSIdentifier(fData.getFormName()),
+ writer.writeText(XhtmlUtils.getJSIdentifier(fData.getName()),
null);
writer.writeText("Names=[\"", null);
writer.writeText(neededValues.get(0).toString(), null);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameBorderLayoutRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameBorderLayoutRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameBorderLayoutRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FrameBorderLayoutRenderer.java Fri Sep 22 15:18:32 2006
@@ -136,9 +136,7 @@
UIComponent innerLeft = getFacet(component, innerLeftName);
UIComponent innerRight = getFacet(component, innerRightName);
- int dir = arc.getLocaleContext().getReadingDirection();
- boolean r2l = (dir == LocaleUtils.DIRECTION_RIGHTTOLEFT);
-
+ boolean r2l = arc.getLocaleContext().isRightToLeft();
if (left == null)
{
leftName = r2l ? HtmlFrameBorderLayout.END_FACET : HtmlFrameBorderLayout.START_FACET;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/GoLinkRenderer.java Fri Sep 22 15:18:32 2006
@@ -83,7 +83,7 @@
renderEncodedActionURI(context, "href", destination);
if (!Boolean.FALSE.equals(
- arc.getAgent().getCapability(TrinidadAgent.CAP_TARGET)))
+ arc.getAgent().getCapabilities().get(TrinidadAgent.CAP_TARGET)))
{
rw.writeAttribute("target", getTargetFrame(bean), null);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java Fri Sep 22 15:18:32 2006
@@ -23,6 +23,7 @@
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
public class HiddenLabelUtils
{
@@ -35,7 +36,9 @@
if (XhtmlRenderer.isInaccessibleMode(arc))
return false;
- TrinidadAgent agent = arc.getAgent();
+ // For this switch - and for getting the major version - tunnel
+ // to CoreRenderingContext
+ TrinidadAgent agent = ((CoreRenderingContext) arc).getTrinidadAgent();
switch (agent.getAgentApplication())
{
case TrinidadAgent.APPLICATION_IEXPLORER:
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java?view=diff&rev=449112&r1=449111&r2=449112
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/InputFileRenderer.java Fri Sep 22 15:18:32 2006
@@ -22,8 +22,8 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.component.core.input.CoreInputFile;
+import org.apache.myfaces.trinidad.context.Agent;
-import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
public class InputFileRenderer extends InputLabelAndMessageRenderer
@@ -43,7 +43,7 @@
{
// =-=AEW inputFile is currently disabled for PDAs. But this should
// run off of an agent property.
- if (arc.getAgent().getAgentType() != TrinidadAgent.TYPE_PDA)
+ if (!isPDA(arc))
{
super.encodeAll(context, arc, component, bean);
}