incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r425966 [2/2] - in /incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/agent/ main/java/org/apache/myfaces/trinidadinternal/application/ main/java/org/apach...
Date Thu, 27 Jul 2006 05:48:02 GMT
Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputDateRenderer.java
Wed Jul 26 22:47:59 2006
@@ -36,7 +36,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectInputDate;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.event.ReturnEvent;
 import org.apache.myfaces.trinidad.validator.DateTimeRangeValidator;
 
@@ -104,7 +104,7 @@
       }
 
 
-      AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+      RequestContext afContext = RequestContext.getCurrentInstance();
       DateTimeRangeValidator dtrv = _findDateTimeRangeValidator(bean);
 
       if (date == null)
@@ -244,7 +244,7 @@
         {
             TimeZone tz = null;
 
-            AdfFacesContext adfFacesContext = AdfFacesContext.getCurrentInstance();
+            RequestContext adfFacesContext = RequestContext.getCurrentInstance();
             tz = adfFacesContext.getTimeZone();
             if(tz == null)
             {
@@ -533,7 +533,7 @@
 
   /**
    * Adjust the specified date, which is in server timeZone to the timeZone
-   * found in AdfFacesContext and return the new date long value.
+   * found in RequestContext and return the new date long value.
    */
   private static long _adjustTimeZone(Date date)
   {
@@ -547,15 +547,15 @@
                    calendar.get(Calendar.DST_OFFSET);
     // get the timeZone specified in adf-faces-config, if any or the
     // client timeZone and find out the difference in timeZone
-    TimeZone timeZone = AdfFacesContext.getCurrentInstance().getTimeZone();
+    TimeZone timeZone = RequestContext.getCurrentInstance().getTimeZone();
     if(timeZone == null)
     {
         timeZone = TimeZone.getDefault();
     }
 
     // then, adjust for the "local" time zone (either the client's, as
-    // specified in AdfFacesContext, or the server's if it wasn't specified
-    // in AdfFacesContext)
+    // specified in RequestContext, or the server's if it wasn't specified
+    // in RequestContext)
     tzOffset -= timeZone.getOffset(dateValueInMs);
 
     // make sure that adjusting to correct timeZone doesn't take the

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectInputTextRenderer.java
Wed Jul 26 22:47:59 2006
@@ -29,7 +29,7 @@
 
 import org.apache.myfaces.trinidad.component.core.input.CoreSelectInputText;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidad.event.ReturnEvent;
 
@@ -69,7 +69,7 @@
   {
     super.decode(context, component);
 
-    AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+    RequestContext afContext = RequestContext.getCurrentInstance();
     // See if a ReturnEvent is waiting for us.  We don't deliver
     // the ReturnEvent - we just use its value
     ReturnEvent returnEvent = 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TableRenderer.java
Wed Jul 26 22:47:59 2006
@@ -37,7 +37,7 @@
 import org.apache.myfaces.trinidad.component.UIXTable;
 import org.apache.myfaces.trinidad.component.core.data.CoreColumn;
 import org.apache.myfaces.trinidad.component.core.data.CoreTable;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.event.RowDisclosureEvent;
 import org.apache.myfaces.trinidad.event.RangeChangeEvent;
 import org.apache.myfaces.trinidad.event.SortEvent;
@@ -108,7 +108,7 @@
       _decodeSort(table, parameters);
     }
 
-    AdfFacesContext.getCurrentInstance().addPartialTarget(table);
+    RequestContext.getCurrentInstance().addPartialTarget(table);
   }
 
   protected final void decodeSelection(FacesContext context, UIComponent treeTable)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CoreShowOneChoiceRenderer.java
Wed Jul 26 22:47:59 2006
@@ -24,7 +24,7 @@
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.trinidad.component.UIXShowDetail;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidadinternal.renderkit.AdfRenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
@@ -59,7 +59,7 @@
     if ((formName != null) && (! jsRendered) )
     {
       String getSelectedScript = null;
-      if (AdfFacesContext.getCurrentInstance().isDebugOutput())
+      if (RequestContext.getCurrentInstance().isDebugOutput())
       {
         getSelectedScript =
           "function _socGetSelection(elem)" +

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/CommandRenderer.java
Wed Jul 26 22:47:59 2006
@@ -21,7 +21,7 @@
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.event.ReturnEvent;
 
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PartialPageUtils;
@@ -37,7 +37,7 @@
 {
   public void decode(FacesContext context, UIComponent component)
   {
-    AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+    RequestContext afContext = RequestContext.getCurrentInstance();
     ReturnEvent returnEvent =
       afContext.getDialogService().getReturnEvent(component);
     if (returnEvent != null)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/MessageBoxRenderer.java
Wed Jul 26 22:47:59 2006
@@ -20,7 +20,7 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;
 
@@ -32,7 +32,7 @@
   {
     // Force MessageBox to be re-rendered via PPR, since the set
     // of messages may have changed.
-    AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+    RequestContext afContext = RequestContext.getCurrentInstance();
     if (afContext != null)
       afContext.addPartialTarget(component);
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/PageRenderer.java
Wed Jul 26 22:47:59 2006
@@ -22,7 +22,7 @@
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.trinidad.component.UIXPage;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.table.TreeUtils;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
@@ -54,7 +54,7 @@
     if ( treeId.equals(source))
     {          
       TreeUtils.decodeExpandEvents(parameters, page, Collections.EMPTY_LIST);
-      AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+      RequestContext afContext = RequestContext.getCurrentInstance();
       if (afContext != null)
         afContext.addPartialTarget(component);
     }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/config/ContextBasedConfiguration.java
Wed Jul 26 22:47:59 2006
@@ -16,11 +16,11 @@
 package org.apache.myfaces.trinidadinternal.share.config;
 
 import javax.faces.context.FacesContext;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidadinternal.image.cache.FileSystemImageCache;
 
 /**
- * Configuration class that works off of a AdfFacesContext.
+ * Configuration class that works off of a RequestContext.
  *
  * @author The Oracle ADF Faces Team
  * @todo Support context-relative and server-relative URLs
@@ -31,7 +31,7 @@
   static public final String CONFIGURATION_NAME = "_CBC";
 
   public ContextBasedConfiguration(FacesContext fContext,
-                                   AdfFacesContext context)
+                                   RequestContext context)
   {
     super(CONFIGURATION_NAME);
     putProperty(SKIN_FAMILY,

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListener.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListener.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListener.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/ReturnActionListener.java
Wed Jul 26 22:47:59 2006
@@ -22,7 +22,7 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.bean.FacesBeanImpl;
 import org.apache.myfaces.trinidad.bean.PropertyKey;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 /**
  * This action listener returns a value from a dialog or process.
@@ -46,7 +46,7 @@
   public void processAction(ActionEvent event)
   {
     Object value = getValue();
-    AdfFacesContext adf = AdfFacesContext.getCurrentInstance();
+    RequestContext adf = RequestContext.getCurrentInstance();
     adf.returnFromDialog(value, null);
   }
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/FacesRenderingContext.java
Wed Jul 26 22:47:59 2006
@@ -22,7 +22,7 @@
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
 
@@ -112,7 +112,7 @@
 
     init(fContext);
 
-    AdfFacesContext context = AdfFacesContext.getCurrentInstance();
+    RequestContext context = RequestContext.getCurrentInstance();
     String outputMode = context.getOutputMode();
     if (outputMode != null)
       setFacet(outputMode);
@@ -188,7 +188,7 @@
 
 
   private void _initializeConfiguration(FacesContext fContext,
-                                        AdfFacesContext context)
+                                        RequestContext context)
   {
     setConfiguration(new ContextBasedConfiguration(fContext, context));
   }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/UINodeRendererBase.java
Wed Jul 26 22:47:59 2006
@@ -21,7 +21,7 @@
 import javax.faces.context.FacesContext;
 import javax.faces.render.Renderer;
 
-import org.apache.myfaces.trinidadinternal.webapp.AdfFacesFilterImpl;
+import org.apache.myfaces.trinidadinternal.webapp.TrinidadFilterImpl;
 import org.apache.myfaces.trinidadinternal.ui.RenderingContext;
 
 /**
@@ -136,7 +136,7 @@
     // The best fix would really be somehow skipping the Apply Request
     // Values phase altogether, while still queueing the ReturnEvent
     // properly.
-    return AdfFacesFilterImpl.isExecutingDialogReturn(context);
+    return TrinidadFilterImpl.isExecutingDialogReturn(context);
   }
 
   static void __restoreRenderingContext(

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/ConfigParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/ConfigParser.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/ConfigParser.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/ConfigParser.java
Wed Jul 26 22:47:59 2006
@@ -36,7 +36,7 @@
 
 import javax.faces.el.ValueBinding;
 
-import org.apache.myfaces.trinidadinternal.context.AdfFacesContextBean;
+import org.apache.myfaces.trinidadinternal.context.RequestContextBean;
 import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
 
 
@@ -49,10 +49,10 @@
   /**
    *
    */
-  static public AdfFacesContextBean parseConfigFile(
+  static public RequestContextBean parseConfigFile(
     ServletContext context)
   {
-    AdfFacesContextBean bean = new AdfFacesContextBean();
+    RequestContextBean bean = new RequestContextBean();
 
     InputStream in = context.getResourceAsStream(_CONFIG_FILE);
     if (in != null)
@@ -128,7 +128,7 @@
 
     if (_LOG.isInfo())
     {
-      Object debug = bean.getProperty(AdfFacesContextBean.DEBUG_OUTPUT_KEY);
+      Object debug = bean.getProperty(RequestContextBean.DEBUG_OUTPUT_KEY);
       if (Boolean.TRUE.equals(debug))
         _LOG.info("ADF Faces is running in debug mode. "+
                   "Do not use in a production environment. See:"+_CONFIG_FILE);
@@ -138,7 +138,7 @@
 
   static private class Handler extends DefaultHandler
   {
-    public Handler(AdfFacesContextBean bean,ServletContext context)
+    public Handler(RequestContextBean bean,ServletContext context)
     {
       _context = context;
       _bean = bean;
@@ -192,27 +192,27 @@
           {
             Object value;
 
-            if ((key == AdfFacesContextBean.NUMBER_GROUPING_SEPARATOR_KEY) ||
-                (key == AdfFacesContextBean.DECIMAL_SEPARATOR_KEY))
+            if ((key == RequestContextBean.NUMBER_GROUPING_SEPARATOR_KEY) ||
+                (key == RequestContextBean.DECIMAL_SEPARATOR_KEY))
             {
               value = new Character(_currentText.charAt(0));
             }
-            else if (key == AdfFacesContextBean.PAGE_FLOW_SCOPE_LIFETIME_KEY)
+            else if (key == RequestContextBean.PAGE_FLOW_SCOPE_LIFETIME_KEY)
             {
               value = _getIntegerValue(_currentText, qName);
             }
-            else if (key == AdfFacesContextBean.RIGHT_TO_LEFT_KEY ||
-                     key == AdfFacesContextBean.DEBUG_OUTPUT_KEY ||
-                     key == AdfFacesContextBean.CLIENT_VALIDATION_DISABLED_KEY)
+            else if (key == RequestContextBean.RIGHT_TO_LEFT_KEY ||
+                     key == RequestContextBean.DEBUG_OUTPUT_KEY ||
+                     key == RequestContextBean.CLIENT_VALIDATION_DISABLED_KEY)
             {
               value = ("true".equalsIgnoreCase(_currentText)
                        ? Boolean.TRUE : Boolean.FALSE);
             }
-            else if (key == AdfFacesContextBean.TIME_ZONE_KEY)
+            else if (key == RequestContextBean.TIME_ZONE_KEY)
             {
               value = TimeZone.getTimeZone(_currentText);
             }
-            else if (key == AdfFacesContextBean.TWO_DIGIT_YEAR_START)
+            else if (key == RequestContextBean.TWO_DIGIT_YEAR_START)
             {
               value = _getIntegerValue(_currentText, qName);
             }
@@ -220,7 +220,7 @@
             {
               value = _currentText;
             }
-            if (key == AdfFacesContextBean.REMOTE_DEVICE_REPOSITORY_URI){
+            if (key == RequestContextBean.REMOTE_DEVICE_REPOSITORY_URI){
                 _context.setAttribute("remote-device-repository-uri",value);
             }
             _bean.setProperty(key, value);
@@ -250,7 +250,7 @@
   }
 
 
-    private AdfFacesContextBean _bean;
+    private RequestContextBean _bean;
     private String              _currentText;
     private ServletContext _context;
   }

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
(from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/AdfFacesFilterImpl.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/AdfFacesFilterImpl.java&r1=425955&r2=425966&rev=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/AdfFacesFilterImpl.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/webapp/TrinidadFilterImpl.java
Wed Jul 26 22:47:59 2006
@@ -37,14 +37,14 @@
 import javax.servlet.http.HttpServletResponseWrapper;
 
 import org.apache.myfaces.trinidad.logging.ADFLogger;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
-import org.apache.myfaces.trinidad.context.AdfFacesContextFactory;
+import org.apache.myfaces.trinidad.context.RequestContext;
+import org.apache.myfaces.trinidad.context.RequestContextFactory;
 import org.apache.myfaces.trinidad.model.UploadedFile;
 import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
 
-import org.apache.myfaces.trinidadinternal.context.AdfFacesContextFactoryImpl;
-import org.apache.myfaces.trinidadinternal.context.AdfFacesContextImpl;
-import org.apache.myfaces.trinidadinternal.context.AdfFacesPhaseListener;
+import org.apache.myfaces.trinidadinternal.context.RequestContextFactoryImpl;
+import org.apache.myfaces.trinidadinternal.context.RequestContextImpl;
+import org.apache.myfaces.trinidadinternal.context.TrinidadPhaseListener;
 import org.apache.myfaces.trinidadinternal.share.util.MultipartFormHandler;
 import org.apache.myfaces.trinidadinternal.share.util.MultipartFormItem;
 import org.apache.myfaces.trinidadinternal.skin.SkinFactory;
@@ -59,7 +59,7 @@
  * @todo Allow configuration of the maximum allowed number of bytes in
  *   an entire request
  */
-public class AdfFacesFilterImpl implements Filter
+public class TrinidadFilterImpl implements Filter
 {
   static public void verifyFilterIsInstalled(FacesContext context)
   {
@@ -119,8 +119,8 @@
   public void init(
     FilterConfig filterConfig) throws ServletException
   {
-    if (AdfFacesContextFactory.getFactory() == null)
-      AdfFacesContextFactory.setFactory(new AdfFacesContextFactoryImpl());
+    if (RequestContextFactory.getFactory() == null)
+      RequestContextFactory.setFactory(new RequestContextFactoryImpl());
 
     _servletContext = filterConfig.getServletContext();
 
@@ -131,7 +131,7 @@
     // register the base skins
     SkinUtils.registerBaseSkins();
     
-    _filters = ClassLoaderUtils.getServices(AdfFacesFilterImpl.class.getName());
+    _filters = ClassLoaderUtils.getServices(TrinidadFilterImpl.class.getName());
     for(Filter f:_filters)
     {
       f.init(filterConfig);
@@ -167,42 +167,42 @@
     request.setAttribute(_FILTER_EXECUTED_KEY, Boolean.TRUE);
 
 
-    // If someone didn't release the AdfFacesContext on an earlier request,
+    // If someone didn't release the RequestContext on an earlier request,
     // then it'd still be around, and trying to create a new one
     // would trigger an exception.  We don't want to take down
     // this thread for all eternity, so clean up after poorly-behaved code.
-    AdfFacesContext context = AdfFacesContext.getCurrentInstance();
+    RequestContext context = RequestContext.getCurrentInstance();
     if (context != null)
     {
       if (_LOG.isWarning())
-        _LOG.warning("AdfFacesContext had not been properly released on earlier " +
+        _LOG.warning("RequestContext had not been properly released on earlier " +
                      "request.");
       context.release();
     }
 
-    AdfFacesContextFactory factory = AdfFacesContextFactory.getFactory();
+    RequestContextFactory factory = RequestContextFactory.getFactory();
     assert(factory != null);
 
-    // See if we've got a cached AdfFacesContext instance;  if so,
+    // See if we've got a cached RequestContext instance;  if so,
     // reattach it
-    Object cachedAdfFacesContext = 
-      request.getAttribute(AdfFacesPhaseListener.CACHED_ADF_FACES_CONTEXT);
+    Object cachedRequestContext = 
+      request.getAttribute(TrinidadPhaseListener.CACHED_ADF_FACES_CONTEXT);
 
     // Catch both the null scenario and the 
-    // AdfFacesContext-from-a-different-classloader scenario
-    if (cachedAdfFacesContext instanceof AdfFacesContext)
+    // RequestContext-from-a-different-classloader scenario
+    if (cachedRequestContext instanceof RequestContext)
     {
-      context = (AdfFacesContext) cachedAdfFacesContext;
+      context = (RequestContext) cachedRequestContext;
       context.attach();
     }
     else
     {
       context = factory.createContext(_servletContext, request);
-      request.setAttribute(AdfFacesPhaseListener.CACHED_ADF_FACES_CONTEXT,
+      request.setAttribute(TrinidadPhaseListener.CACHED_ADF_FACES_CONTEXT,
                            context);
     }
 
-    assert(AdfFacesContext.getCurrentInstance() == context);
+    assert(RequestContext.getCurrentInstance() == context);
 
     try
     {
@@ -268,7 +268,7 @@
       if (context != null)
       {
         context.release();
-        assert(AdfFacesContext.getCurrentInstance() == null);
+        assert(RequestContext.getCurrentInstance() == null);
       }
     }
   }
@@ -293,10 +293,10 @@
     // faces lifecycle.  ViewHandlerImpl will be responsible for ensuring
     // that we re-execute the lifecycle on the correct page.
     Map launchParameters = (Map)
-      request.getAttribute(AdfFacesContextImpl.LAUNCH_PARAMETERS);
+      request.getAttribute(RequestContextImpl.LAUNCH_PARAMETERS);
     if (launchParameters != null)
     {
-      request.removeAttribute(AdfFacesContextImpl.LAUNCH_PARAMETERS);
+      request.removeAttribute(RequestContextImpl.LAUNCH_PARAMETERS);
       request.setAttribute(_IS_RETURNING_KEY, Boolean.TRUE);
       request = new ReplaceParametersRequestWrapper(
                (HttpServletRequest) request, launchParameters);
@@ -311,7 +311,7 @@
     FilterChain     chain) throws IOException, ServletException
   {
     // Set up a PseudoFacesContext with the actual request and response
-    // so that AdfFacesContext can be more functional in the interval
+    // so that RequestContext can be more functional in the interval
     // between now and when the FacesServlet starts.
     PseudoFacesContext pfc = new PseudoFacesContext(request, response);
     _PSEUDO_FACES_CONTEXT.set(pfc);
@@ -326,7 +326,7 @@
   }
 
   private void _doUploadFile(
-    AdfFacesContext   context,
+    RequestContext   context,
     ServletRequest    request,
     UploadedFiles     files,
     MultipartFormItem item) throws IOException
@@ -480,5 +480,5 @@
     protected Object initialValue() { return (null); }
   };
 
-  private static final ADFLogger _LOG = ADFLogger.createADFLogger(AdfFacesFilterImpl.class);
+  private static final ADFLogger _LOG = ADFLogger.createADFLogger(TrinidadFilterImpl.class);
 }

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/RequestContextTest.java
(from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextTest.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/RequestContextTest.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/RequestContextTest.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextTest.java&r1=425955&r2=425966&rev=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/AdfFacesContextTest.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/context/RequestContextTest.java
Wed Jul 26 22:47:59 2006
@@ -17,11 +17,11 @@
 
 import junit.framework.TestCase;
 
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
-public class AdfFacesContextTest extends TestCase
+public class RequestContextTest extends TestCase
 {
-  public AdfFacesContextTest(
+  public RequestContextTest(
     String testName)
   {
     super(testName);
@@ -29,7 +29,7 @@
 
   public void testPageResolver()
   {
-    AdfFacesContext context = _createContext();
+    RequestContext context = _createContext();
     try
     {
       assertTrue(context.getPageResolver() instanceof TestPageResolver);
@@ -42,7 +42,7 @@
 
   public void testPageFlowScopeProvider()
   {
-    AdfFacesContext context = _createContext();
+    RequestContext context = _createContext();
     try
     {
       assertTrue(context.getPageFlowScopeProvider()
@@ -54,10 +54,10 @@
     }
   }
 
-  private AdfFacesContext _createContext()
+  private RequestContext _createContext()
   {
     // =-=AEW Would be better to create it with a mock context so we
     // can test parsing
-    return (new AdfFacesContextFactoryImpl()).createContext(null, null);
+    return (new RequestContextFactoryImpl()).createContext(null, null);
   }
 }

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer.java
Wed Jul 26 22:47:59 2006
@@ -26,7 +26,7 @@
 
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.core.output.CoreOutputText;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
 
@@ -35,7 +35,7 @@
   public void encodeBegin(FacesContext context,
                           UIComponent comp) throws IOException
   {
-    AdfFacesContext.getCurrentInstance();
+    RequestContext.getCurrentInstance();
     CoreOutputText cot = (CoreOutputText) comp;
     if (cot.isEscape())
     {
@@ -62,7 +62,7 @@
   public void encodeEnd(FacesContext context,
                         UIComponent comp) throws IOException
   {
-    AdfFacesContext.getCurrentInstance();  
+    RequestContext.getCurrentInstance();  
     CoreOutputText cot = (CoreOutputText) comp;
     ResponseWriter rw = context.getResponseWriter();
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/FastRenderer2.java
Wed Jul 26 22:47:59 2006
@@ -28,7 +28,7 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.UIXComponent;
 import org.apache.myfaces.trinidad.component.core.output.CoreOutputText;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 
 import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
 
@@ -60,7 +60,7 @@
   public void encodeBegin(FacesContext context,
                           UIComponent comp) throws IOException
   {
-    AdfFacesContext.getCurrentInstance();
+    RequestContext.getCurrentInstance();
     FacesBean bean = ((UIXComponent) comp).getFacesBean();
     if (getEscape(bean))
     {
@@ -87,7 +87,7 @@
   public void encodeEnd(FacesContext context,
                         UIComponent comp) throws IOException
   {
-    AdfFacesContext.getCurrentInstance();
+    RequestContext.getCurrentInstance();
     ResponseWriter rw = context.getResponseWriter();
     FacesBean bean = ((UIXComponent) comp).getFacesBean();
     Object value = getConvertedValue(context, comp, bean);

Copied: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
(from r425955, incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MAdfFacesContext.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MAdfFacesContext.java&r1=425955&r2=425966&rev=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MAdfFacesContext.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MRequestContext.java
Wed Jul 26 22:47:59 2006
@@ -23,7 +23,7 @@
 
 import org.apache.myfaces.trinidad.change.ChangeManager;
 import org.apache.myfaces.trinidad.config.RegionManager;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
 import org.apache.myfaces.trinidad.context.Agent;
 import org.apache.myfaces.trinidad.context.PageResolver;
 import org.apache.myfaces.trinidad.context.PageFlowScopeProvider;
@@ -34,14 +34,14 @@
 import org.apache.myfaces.trinidadinternal.context.PageFlowScopeProviderImpl;
 import org.apache.myfaces.trinidadinternal.context.PageResolverDefaultImpl;
 
-public class MAdfFacesContext extends AdfFacesContext
+public class MRequestContext extends RequestContext
 {
-  public MAdfFacesContext()
+  public MRequestContext()
   {
     attach();
   }
 
-  // Support setting the agent so we can create one AdfFacesContext
+  // Support setting the agent so we can create one RequestContext
   // and mutate it
 
   public void setAgent(Agent agent)

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitPerfTestCase.java
Wed Jul 26 22:47:59 2006
@@ -128,7 +128,7 @@
 
     _facesContext.setResponseWriter(writer);
 
-    _adfFacesContext = new MAdfFacesContext();
+    _adfFacesContext = new MRequestContext();
     _adfFacesContext.setSkinFamily("minimal");
     _adfFacesContext.setAgent(RenderKitBootstrap.getGeckoAgent());
   }
@@ -193,7 +193,7 @@
 
   private java.io.Writer     _fileWriter;
   private MFacesContext _facesContext;
-  private MAdfFacesContext _adfFacesContext;
+  private MRequestContext _adfFacesContext;
 
   static private RenderKitBootstrap _bootstrap;
 

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java?rev=425966&r1=425965&r2=425966&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad-save/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/RenderKitTestCase.java
Wed Jul 26 22:47:59 2006
@@ -114,7 +114,7 @@
     protected void setUp() throws IOException  
     {
       _facesContext = new MFacesContext(true);
-      _adfFacesContext = new MAdfFacesContext();
+      _adfFacesContext = new MRequestContext();
       _adfFacesContext.setSkinFamily(_skin);
       _adfFacesContext.setAgent(_agent);
       _adfFacesContext.setRightToLeft(_rightToLeft);
@@ -207,7 +207,7 @@
 
     private TestResult    _result;
     private MFacesContext _facesContext;
-    private MAdfFacesContext _adfFacesContext;
+    private MRequestContext _adfFacesContext;
     private String           _skin;
     private Agent            _agent;
     private String           _accMode;



Mime
View raw message