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/11/02 20:07:41 UTC
svn commit: r470498 [2/2] - in /incubator/adffaces/trunk/trinidad:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/lo...
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java Thu Nov 2 12:07:33 2006
@@ -349,7 +349,7 @@
_checkTimestamp = Boolean.valueOf(performCheck);
if (_LOG.isInfo() && _checkTimestamp.booleanValue())
{
- _LOG.info("ADF Faces is running with time-stamp checking enabled. "+
+ _LOG.info("Apache Trinidad is running with time-stamp checking enabled. "+
"This should not be used in a production environment. "+
"See the "+_CHECK_TIMESTAMP_PARAM+
" property in WEB-INF/web.xml");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/TrinidadPhaseListener.java Thu Nov 2 12:07:33 2006
@@ -36,7 +36,7 @@
*/
public class TrinidadPhaseListener implements PhaseListener
{
- static public final String CACHED_ADF_FACES_CONTEXT =
+ static public final String CACHED_REQUEST_CONTEXT =
"org.apache.myfaces.trinidadinternal.context.CachedRequestContext";
/**
@@ -140,7 +140,7 @@
if (context == null)
{
- Object cachedRequestContext = requestMap.get(CACHED_ADF_FACES_CONTEXT);
+ Object cachedRequestContext = requestMap.get(CACHED_REQUEST_CONTEXT);
// Catch both the null scenario and the
// RequestContext-from-a-different-classloader scenario
@@ -162,7 +162,7 @@
context = factory.createContext(
fContext.getExternalContext().getContext(),
fContext.getExternalContext().getRequest());
- requestMap.put(CACHED_ADF_FACES_CONTEXT, context);
+ requestMap.put(CACHED_REQUEST_CONTEXT, context);
}
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/el/TrinidadVariableResolver.java Thu Nov 2 12:07:33 2006
@@ -21,7 +21,7 @@
import org.apache.myfaces.trinidad.context.RequestContext;
/**
- * VariableResolver decorator used by ADF Faces.
+ * VariableResolver decorator used by Trinidad.
* <p>
* @author The Oracle ADF Faces Team
*/
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TrinidadComponentHandler.java Thu Nov 2 12:07:33 2006
@@ -30,7 +30,7 @@
import org.apache.myfaces.trinidad.component.UIXComponent;
/**
- * TagLibrary implementation for Oracle ADF core library.
+ * TagLibrary implementation for Apache Trinidad core library.
* @author Adam Winer
* @version
*/
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=470498&r1=470497&r2=470498
==============================================================================
--- 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 Thu Nov 2 12:07:33 2006
@@ -99,7 +99,7 @@
if (!arrayType.isArray())
return null;
- // Ignore non-ADF types
+ // Ignore non-Trinidad types
Class<?> listenerClass = arrayType.getComponentType();
if (!listenerClass.getName().startsWith("org.apache.myfaces.trinidad."))
return null;
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=470498&r1=470497&r2=470498
==============================================================================
--- 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 Thu Nov 2 12:07:33 2006
@@ -308,7 +308,7 @@
if (_LOG.isFine())
{
_LOG.fine("Page navigation to {0} happened during a PPR request " +
- "on {1}; ADF Faces is forcing a redirect.",
+ "on {1}; Apache Trinidad is forcing a redirect.",
new String[]{viewId, originalRoot.getViewId()});
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/DialogRequest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/DialogRequest.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/DialogRequest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/DialogRequest.java Thu Nov 2 12:07:33 2006
@@ -142,7 +142,7 @@
//
static private synchronized String _getDialogWindowName()
{
- return "ADFDialog" + _sCount++;
+ return "TrinidadDialog" + _sCount++;
}
private final String _clientId;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.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=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/ppr/PartialPageContextImpl.java Thu Nov 2 12:07:33 2006
@@ -153,7 +153,7 @@
* 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
+ * This method is called automatically by Trinidad during the partial
* rendering pass when a partial target is about to be rendered.
* Clients should never need to call this method.
*
@@ -184,7 +184,7 @@
* Notifies the PartialPageContext that the current partial target
* has finished rendering.
* <p>
- * This method is called automatically by ADF Faces during the partial
+ * This method is called automatically by Trinidad during the partial
* rendering pass when a partial target has finished rendering.
* Clients should never need to call this method.
*
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java Thu Nov 2 12:07:33 2006
@@ -75,7 +75,7 @@
@Override
public String getRenderKitId()
{
- return XhtmlConstants.ORACLE_ADF_DESKTOP;
+ return XhtmlConstants.APACHE_TRINIDAD_DESKTOP;
}
/**
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalDesktopSkinExtension.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalDesktopSkinExtension.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalDesktopSkinExtension.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalDesktopSkinExtension.java Thu Nov 2 12:07:33 2006
@@ -37,7 +37,7 @@
super(baseSkin,
_MINIMAL_DESKTOP_ID,
_MINIMAL_FAMILY,
- XhtmlConstants.ORACLE_ADF_DESKTOP);
+ XhtmlConstants.APACHE_TRINIDAD_DESKTOP);
// Register our style sheet
setStyleSheetName(_MINIMAL_STYLE_SHEET_NAME);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPdaSkinExtension.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPdaSkinExtension.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPdaSkinExtension.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/MinimalPdaSkinExtension.java Thu Nov 2 12:07:33 2006
@@ -37,7 +37,7 @@
super(baseSkin,
_MINIMAL_PDA_ID,
_MINIMAL_FAMILY,
- XhtmlConstants.ORACLE_ADF_PDA);
+ XhtmlConstants.APACHE_TRINIDAD_PDA);
// Register our style sheet
setStyleSheetName(_MINIMAL_STYLE_SHEET_NAME);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimpleDesktopSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimpleDesktopSkin.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimpleDesktopSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimpleDesktopSkin.java Thu Nov 2 12:07:33 2006
@@ -68,6 +68,6 @@
@Override
public String getRenderKitId()
{
- return XhtmlConstants.ORACLE_ADF_DESKTOP;
+ return XhtmlConstants.APACHE_TRINIDAD_DESKTOP;
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePdaSkin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePdaSkin.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePdaSkin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/SimplePdaSkin.java Thu Nov 2 12:07:33 2006
@@ -63,6 +63,6 @@
@Override
public String getRenderKitId()
{
- return XhtmlConstants.ORACLE_ADF_PDA;
+ return XhtmlConstants.APACHE_TRINIDAD_PDA;
}
}
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=470498&r1=470497&r2=470498
==============================================================================
--- 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 Thu Nov 2 12:07:33 2006
@@ -42,7 +42,7 @@
/**
* @todo Kill the now-strange "compute mode", since we can
* just iterate over the things.
- * @todo Support abbreviation!!! Missing from ADF Faces so far.
+ * @todo Support abbreviation!!! Missing from Trinidad so far.
* @todo Support required? Support messageType?
*/
public class ColumnGroupRenderer extends XhtmlRenderer
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=470498&r1=470497&r2=470498
==============================================================================
--- 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 Thu Nov 2 12:07:33 2006
@@ -71,7 +71,7 @@
}
/**
- * Returns true if ADF Faces wants a hidden label for
+ * Returns true if we want a hidden label for
* a particular ID.
*/
static public boolean wantsHiddenLabel(
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputDocumentRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputDocumentRenderer.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputDocumentRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/OutputDocumentRenderer.java Thu Nov 2 12:07:33 2006
@@ -255,7 +255,7 @@
* Renders the beginning of a paragraph.
*
* @param context the current Faces context
- * @param arc the current ADF rendering context
+ * @param arc the current rendering context
* @param bean the property holder for the rendered document.
*
* @throws IOException if a problem occurs while writing the content to the
@@ -276,7 +276,7 @@
* Renders a separator between 2 paragraphs.
*
* @param context the current Faces context
- * @param arc the current ADF rendering context
+ * @param arc the current rendering context
* @param separator the component to render as a separator
* @param bean the property holder for the rendered document.
*
@@ -308,7 +308,7 @@
* Renders the title of the rendered document.
*
* @param context the current Faces context
- * @param arc the current ADF rendering context
+ * @param arc the current rendering context
* @param comp the document component
* @param bean the property holder for the rendered document.
*
@@ -372,4 +372,4 @@
private PropertyKey _titleClassKey;
-}
\ No newline at end of file
+}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java Thu Nov 2 12:07:33 2006
@@ -234,20 +234,20 @@
{
DateTimeConverter dtc = (DateTimeConverter) converter;
- boolean adfDTC = _isAdfDateTimeConverter(converter);
+ boolean trinidadDTC = _isTrinidadDateTimeConverter(converter);
- if (!adfDTC)
+ if (!trinidadDTC)
{
- // if it is not the ADF DateTimeConverter, set the date style to
+ // if it is not the Trinidad DateTimeConverter, set the date style to
// short
dtc.setDateStyle("short");
}
- // if it is not the ADF DateTimeConverter or (it is AND
+ // if it is not the Trinidad DateTimeConverter or (it is AND
// no time zone is set) then we want to set the
// time zone to the one in the faces context or use
// the default server time zone on the converter
- if(!adfDTC || dtc.getTimeZone() == null)
+ if(!trinidadDTC || dtc.getTimeZone() == null)
{
TimeZone tz = null;
@@ -532,7 +532,7 @@
}
- private static boolean _isAdfDateTimeConverter(Converter converter)
+ private static boolean _isTrinidadDateTimeConverter(Converter converter)
{
return (converter instanceof
org.apache.myfaces.trinidad.convert.DateTimeConverter);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputTextRenderer.java Thu Nov 2 12:07:33 2006
@@ -759,14 +759,10 @@
}
/**
- * @todo Support in ADF Faces?
+ * @todo Support in Trinidad?
*/
protected boolean getNoAutoComplete(FacesBean bean)
{
- /**
- return (Boolean.TRUE.equals(node.getAttributeValue(context,
- NO_AUTO_COMPLETE_ATTR)));
- */
return false;
}
/*
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java Thu Nov 2 12:07:33 2006
@@ -43,9 +43,9 @@
{
/**
* Disables optimizations that are normally performed by the
- * ADF Renderers to reduce content size.
+ * Trinidad Renderers to reduce content size.
* <p>
- * This Boolean property controls whether or not ADF Renderer
+ * This Boolean property controls whether or not Trinidad Renderer
* implementations should attempt to reduce the size of generated
* content, for example, by compressing style class names. These
* optimizations are enabled by default. In general,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlConstants.java Thu Nov 2 12:07:33 2006
@@ -237,9 +237,9 @@
//
// Copied from XhtmlLafConstants
//
- public static final String ORACLE_ADF_DESKTOP =
+ public static final String APACHE_TRINIDAD_DESKTOP =
"org.apache.myfaces.trinidad.desktop";
- public static final String ORACLE_ADF_PDA =
+ public static final String APACHE_TRINIDAD_PDA =
"org.apache.myfaces.trinidad.pda";
/** Unicode character for non-breaking space */
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java Thu Nov 2 12:07:33 2006
@@ -72,7 +72,7 @@
/**
- * Returns true if the agent has enough support for ADF Faces
+ * Returns true if the agent has enough support for Trinidad
* to launch separate windows. We require both multiple window
* support and PPR support.
*/
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java Thu Nov 2 12:07:33 2006
@@ -175,7 +175,7 @@
debugJavascript.equalsIgnoreCase("true"))
{
_debugJavascript = Boolean.TRUE;
- _LOG.info("ADF Faces is running with debug javascript." +
+ _LOG.info("Apache Trinidad is running with debug javascript." +
" Do not use in a production environment."+
" See the "+_DEBUG_JAVASCRIPT+" parameter in"+
" /WEB-INF/web.xml");
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java Thu Nov 2 12:07:33 2006
@@ -440,7 +440,7 @@
* Creates javascript used to submit the page.
*
* @param component the UIComponent object
- * @param rCtx the ADF Faces rendering context object
+ * @param rCtx the Trinidad UIX rendering context object
* @param detailItemId Id of the item that will be disclosed
* @param formName id of the containing form
* @param compId id of the panelAccordion component
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java Thu Nov 2 12:07:33 2006
@@ -379,10 +379,7 @@
label.length());
out.writeText(encoder.encodeParameter(strBefAccessKey), null);
- // =-=rbaranwa "U" is deprecated in HTML 4.0. The suggested way out
- // is to use stylesheet to mark text as underlined. Need to revisit
- // this particular part later.
- //=-=yeelee ADFFACES-153: use default style (underline) for access key
+ //ADFFACES-153: use default style (underline) for access key
out.startElement ("span", null);
XhtmlRenderer.renderStyleClass (FacesContext.getCurrentInstance(),
RenderingContext.getCurrentInstance(),
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/Configuration.java Thu Nov 2 12:07:33 2006
@@ -19,7 +19,7 @@
/**
* The <code>Configuration</code> class and its default
* implementation, <code>ConfigurationImpl</code>, are remnant
- * configuration classes for the UIX portions of ADF Faces, and
+ * configuration classes for the UIX portions of Trinidad, and
* should not be used for new code.
* <p>
* @see org.apache.myfaces.trinidadinternal.share.config.ConfigurationImpl
@@ -30,9 +30,9 @@
{
/**
* Disables optimizations that are normally performed by the
- * ADF Renderers to reduce content size.
+ * Trinidad Renderers to reduce content size.
* <p>
- * This Boolean property controls whether or not ADF Renderer
+ * This Boolean property controls whether or not Trinidad Renderer
* implementations should attempt to reduce the size of generated
* content, for example, by compressing style class names. These
* optimizations are enabled by default. In general,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetNameResolver.java Thu Nov 2 12:07:33 2006
@@ -293,8 +293,8 @@
// Error messages
private static final String _STYLES_DIR_ERROR =
- "Could not locate the ADF styles directory."
- + "Please be sure that the ADF installable resources are installed.";
+ "Could not locate the Trinidad styles directory."
+ + "Please be sure that the Trinidad installable resources are installed.";
private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(StyleSheetNameResolver.class);
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/AttributeTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/AttributeTag.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/AttributeTag.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/AttributeTag.java Thu Nov 2 12:07:33 2006
@@ -41,7 +41,7 @@
* One other minor modification is that the name attribute cannot be EL-bound.
* </p>
*
- * @todo Remove this class when ADF Faces upgrades to depend on JSF v1.2
+ * @todo Remove this class when Trinidad upgrades to depend on JSF v1.2
*/
public class AttributeTag extends TagSupport
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java Thu Nov 2 12:07:33 2006
@@ -591,7 +591,7 @@
/**
* This method returns the modified URL for design time to pick up the resources
- * from ADF Faces jar, and dynamic resources from temp cache directory.
+ * from the Trinidad jar, and dynamic resources from temp cache directory.
*/
@SuppressWarnings("unchecked")
private static String _generateDesignTimeURL(
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessingRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessingRenderer.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessingRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ProcessingRenderer.java Thu Nov 2 12:07:33 2006
@@ -85,7 +85,7 @@
writer.endElement("tr");
// render the processing element's content in the second row
- //=-=pu: Do we support indexed children for this component in ADF Faces ?
+ //=-=pu: Do we support indexed children for this component?
writer.startElement("tr", null);
writer.startElement("td", null);
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java Thu Nov 2 12:07:33 2006
@@ -158,7 +158,7 @@
public static void setSaveModelDisabled(UIXRenderingContext context, boolean isDisabled)
{
- /* =-=AEW Save model not available in ADF Faces
+ /* =-=AEW Save model not available in Trinidad
if (BodyRenderer.__isSaveModelActive(context))
{
setRenderingProperty(context, _SAVE_MODEL_DISABLED_KEY,
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java Thu Nov 2 12:07:33 2006
@@ -472,7 +472,7 @@
// customizable.
public static final String HGRID_LOCATOR_HEADER_STYLE =
"OraHGridLocatorHeader";
- // These styles are for large record sets, which we do not have in ADF Faces
+ // These styles are for large record sets, which we do not support in Trinidad
// yet. When we do, should these be customizable styles? If so, the names
// will have to change to be like af|treeTable::nav-row-ilink
public static final String HGRID_NAV_ROW_ILINK_STYLE_CLASS =
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java?view=diff&rev=470498&r1=470497&r2=470498
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java Thu Nov 2 12:07:33 2006
@@ -52,7 +52,7 @@
import org.apache.myfaces.trinidadinternal.skin.SkinUtils;
/**
- * Actual implementation of the ADF Faces servlet filter.
+ * Actual implementation of the Trinidad servlet filter.
* <p>
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/webapp/AdfFacesFilterImpl.java#0 $) $Date: 10-nov-2005.18:48:59 $
* @author The Oracle ADF Faces Team
@@ -187,7 +187,7 @@
// See if we've got a cached RequestContext instance; if so,
// reattach it
Object cachedRequestContext =
- request.getAttribute(TrinidadPhaseListener.CACHED_ADF_FACES_CONTEXT);
+ request.getAttribute(TrinidadPhaseListener.CACHED_REQUEST_CONTEXT);
// Catch both the null scenario and the
// RequestContext-from-a-different-classloader scenario
@@ -199,7 +199,7 @@
else
{
context = factory.createContext(_servletContext, request);
- request.setAttribute(TrinidadPhaseListener.CACHED_ADF_FACES_CONTEXT,
+ request.setAttribute(TrinidadPhaseListener.CACHED_REQUEST_CONTEXT,
context);
}