Author: matzew
Date: Wed Jul 26 14:35:26 2006
New Revision: 425853
URL: http://svn.apache.org/viewvc?rev=425853&view=rev
Log:
refactoring clazzes ...
Added:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
- copied, changed from r425578,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/AdfFacesContext.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContextFactory.java
- copied, changed from r425578,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/AdfFacesContextFactory.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/RequestFilter.java
- copied, changed from r425578,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/AdfFacesFilter.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java
- copied, changed from r425555,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockAdfFacesContext.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java
- copied, changed from r425555,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/AdfDateTimeConverterTest.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
- copied, changed from r425555,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/AdfNumberConverterTest.java
Removed:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/AdfFacesContext.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/AdfFacesContextFactory.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/AdfFacesFilter.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockAdfFacesContext.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/AdfDateTimeConverterTest.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/AdfNumberConverterTest.java
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/pom.xml
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/DialogService.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/LaunchEvent.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/site/xdoc/tagdoc/af_returnActionListener.xml
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/pom.xml?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/pom.xml
(original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/pom.xml
Wed Jul 26 14:35:26 2006
@@ -244,7 +244,7 @@
<module>trinidad-api</module>
<module>trinidad-build</module>
<module>trinidad-impl</module>
- <module>trinidad-demo</module>
+ <!--module>trinidad-demo</module-->
</modules>
<repositories>
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
Wed Jul 26 14:35:26 2006
@@ -24,7 +24,7 @@
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.event.LaunchEvent;
import org.apache.myfaces.trinidad.event.ReturnEvent;
@@ -69,12 +69,12 @@
public void broadcast(FacesEvent event) throws AbortProcessingException
{
// Perform special processing for ActionEvents: tell
- // the AdfFacesContext to remember this command instance
+ // the RequestContext to remember this command instance
// so that the NavigationHandler can locate us to queue
// a LaunchEvent.
if (event instanceof ActionEvent)
{
- AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+ RequestContext afContext = RequestContext.getCurrentInstance();
afContext.getDialogService().setCurrentLaunchSource(this);
try
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXSelectInputTemplate.java
Wed Jul 26 14:35:26 2006
@@ -24,7 +24,7 @@
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.event.LaunchEvent;
import org.apache.myfaces.trinidad.event.ReturnEvent;
@@ -73,7 +73,7 @@
{
if (event instanceof ActionEvent)
{
- AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+ RequestContext afContext = RequestContext.getCurrentInstance();
afContext.getDialogService().setCurrentLaunchSource(this);
try
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
Wed Jul 26 14:35:26 2006
@@ -44,7 +44,7 @@
import org.apache.myfaces.trinidad.bean.PropertyKey;
import org.apache.myfaces.trinidad.bean.util.ValueMap;
import org.apache.myfaces.trinidad.change.AttributeComponentChange;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.event.AttributeChangeEvent;
import org.apache.myfaces.trinidad.event.AttributeChangeListener;
import org.apache.myfaces.trinidad.logging.ADFLogger;
@@ -544,7 +544,7 @@
UIComponent component = event.getComponent();
if (component != null)
{
- AdfFacesContext adfContext = AdfFacesContext.getCurrentInstance();
+ RequestContext adfContext = RequestContext.getCurrentInstance();
if (adfContext != null)
adfContext.partialUpdateNotify(component);
}
@@ -579,7 +579,7 @@
Object triggers = attrs.get("partialTriggers");
if (triggers instanceof String[])
{
- AdfFacesContext adfContext = AdfFacesContext.getCurrentInstance();
+ RequestContext adfContext = RequestContext.getCurrentInstance();
if (adfContext != null)
adfContext.addPartialTriggerListeners(this, (String[]) triggers);
}
@@ -941,7 +941,7 @@
{
AttributeComponentChange aa =
new AttributeComponentChange(attributeName, attributeValue);
- AdfFacesContext adfContext = AdfFacesContext.getCurrentInstance();
+ RequestContext adfContext = RequestContext.getCurrentInstance();
adfContext.getChangeManager().addComponentChange(getFacesContext(), this,
aa);
}
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/DialogService.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/DialogService.java?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/DialogService.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/DialogService.java
Wed Jul 26 14:35:26 2006
@@ -81,7 +81,7 @@
*
* @param source the component that may have launched a dialog
* @return a ReturnEvent containing the
- * [EMAIL PROTECTED] AdfFacesContext#returnFromDialog return value} from the
+ * [EMAIL PROTECTED] RequestContext#returnFromDialog return value} from the
* dialog.
*/
public abstract ReturnEvent getReturnEvent(UIComponent source);
@@ -113,7 +113,7 @@
* Launches a dialog without pushing a process scope.
* This method should only be used by controller framework
* code; all others should use
- * [EMAIL PROTECTED] AdfFacesContext#launchDialog
AdfFacesContext.launchDialog()}.
+ * [EMAIL PROTECTED] RequestContext#launchDialog
RequestContext.launchDialog()}.
* The process scope must be [EMAIL PROTECTED] #pushPageFlowScope pushed}
* <em>before</em> calling this method.
*/
@@ -129,7 +129,7 @@
* Returns from a dialog without popping a process scope.
* This method should only be used by controller framework
* code; all others should use
- * [EMAIL PROTECTED] AdfFacesContext#returnFromDialog
AdfFacesContext.returnFromDialog()}.
+ * [EMAIL PROTECTED] RequestContext#returnFromDialog
RequestContext.returnFromDialog()}.
* The process scope must be [EMAIL PROTECTED] #popPageFlowScope popped}
* <em>after</em> calling this method.
*
Copied:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
(from r425578,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/AdfFacesContext.java)
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/AdfFacesContext.java&r1=425578&r2=425853&rev=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/AdfFacesContext.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContext.java
Wed Jul 26 14:35:26 2006
@@ -28,9 +28,9 @@
/**
* Context class for all per-request and per-webapp information
- * required by ADF Faces. A <code>AdfFacesContext</code> object can be
+ * required by ADF Faces. A <code>RequestContext</code> object can be
* retrieved with the static [EMAIL PROTECTED] #getCurrentInstance} method.
- * There is one and only one <code>AdfFacesContext</code> object
+ * There is one and only one <code>RequestContext</code> object
* active in any one thread.
* <p>
* This class does not extend <code>FacesContext</code>; this is intentional,
@@ -45,7 +45,7 @@
* @author The Oracle ADF Faces Team
* @mock
*/
-abstract public class AdfFacesContext
+abstract public class RequestContext
{
/**
* Name of the EL implicit variable ("adfFacesContext") that is used to
@@ -67,21 +67,21 @@
/**
- * Retrieves the AdfFacesContext active for the current thread.
+ * Retrieves the RequestContext active for the current thread.
*/
- static public AdfFacesContext getCurrentInstance()
+ static public RequestContext getCurrentInstance()
{
- return (AdfFacesContext) _CURRENT_CONTEXT.get();
+ return (RequestContext) _CURRENT_CONTEXT.get();
}
/**
- * Creates an AdfFacesContext. AdfFacesContext is abstract
+ * Creates an RequestContext. RequestContext is abstract
* and may not be instantiated directly.
- * @see AdfFacesContextFactory
+ * @see RequestContextFactory
*/
- protected AdfFacesContext()
+ protected RequestContext()
{
}
@@ -372,34 +372,34 @@
public abstract Agent getAgent();
/**
- * Releases the AdfFacesContext object. This method must only
- * be called by the code that created the AdfFacesContext.
- * @exception IllegalStateException if no AdfFacesContext is attached
+ * Releases the RequestContext object. This method must only
+ * be called by the code that created the RequestContext.
+ * @exception IllegalStateException if no RequestContext is attached
* to the thread, or the attached context is not this object
*/
public void release()
{
Object o = _CURRENT_CONTEXT.get();
if (o == null)
- throw new IllegalStateException("AdfFacesContext was already released or
" +
+ throw new IllegalStateException("RequestContext was already released or
" +
"had never been attached.");
if (o != this)
throw new IllegalStateException("Trying to release a different " +
- "AdfFacesContext than the current context.");
+ "RequestContext than the current context.");
_CURRENT_CONTEXT.set(null);
}
/**
- * Attaches a AdfFacesContext to the current thread. This method
- * should only be called by a AdfFacesContext object itself.
- * @exception IllegalStateException if an AdfFacesContext is already
+ * Attaches a RequestContext to the current thread. This method
+ * should only be called by a RequestContext object itself.
+ * @exception IllegalStateException if an RequestContext is already
* attached to the thread
*/
public void attach()
{
Object o = _CURRENT_CONTEXT.get();
if (o != null)
- throw new IllegalStateException("Trying to attach AdfFacesContext to a "
+
+ throw new IllegalStateException("Trying to attach RequestContext to a " +
"thread that already had one.");
_CURRENT_CONTEXT.set(this);
}
Copied:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContextFactory.java
(from r425578,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/AdfFacesContextFactory.java)
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContextFactory.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContextFactory.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/AdfFacesContextFactory.java&r1=425578&r2=425853&rev=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/AdfFacesContextFactory.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/RequestContextFactory.java
Wed Jul 26 14:35:26 2006
@@ -18,27 +18,27 @@
import java.util.HashMap;
/**
- * Factory for creating AdfFacesContext objects.
+ * Factory for creating RequestContext objects.
*
* @author The Oracle ADF Faces Team
*/
-abstract public class AdfFacesContextFactory
+abstract public class RequestContextFactory
{
/**
- * Retrieve the current AdfFacesContextFactory.
+ * Retrieve the current RequestContextFactory.
*/
- static public AdfFacesContextFactory getFactory()
+ static public RequestContextFactory getFactory()
{
synchronized (_FACTORIES)
{
- return (AdfFacesContextFactory) _FACTORIES.get(_getClassLoader());
+ return (RequestContextFactory) _FACTORIES.get(_getClassLoader());
}
}
/**
- * Store the current AdfFacesContextFactory.
+ * Store the current RequestContextFactory.
*/
- static public void setFactory(AdfFacesContextFactory factory)
+ static public void setFactory(RequestContextFactory factory)
{
synchronized (_FACTORIES)
{
@@ -54,11 +54,11 @@
}
/**
- * Create a AdfFacesContext.
+ * Create a RequestContext.
* @todo do we need to pass the servlet objects, or can we rely
* on their being available via the FacesContext?
*/
- abstract public AdfFacesContext createContext(Object context,
+ abstract public RequestContext createContext(Object context,
Object request);
static private ClassLoader _getClassLoader()
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
Wed Jul 26 14:35:26 2006
@@ -41,7 +41,7 @@
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.logging.ADFLogger;
import org.apache.myfaces.trinidad.util.ComponentUtils;
import org.apache.myfaces.trinidad.util.MessageFactory;
@@ -1539,14 +1539,14 @@
}
}
- AdfFacesContext adfContext = AdfFacesContext.getCurrentInstance();
+ RequestContext adfContext = RequestContext.getCurrentInstance();
Calendar cal;
if (adfContext == null)
{
cal = null;
if(_LOG.isWarning())
{
- _LOG.warning("Cannot find AdfFacesContext; two-digit-year-start
will be defaulted");
+ _LOG.warning("Cannot find RequestContext; two-digit-year-start
will be defaulted");
}
}
else
@@ -1616,17 +1616,17 @@
if (tZone == null)
{
- AdfFacesContext context = AdfFacesContext.getCurrentInstance();
+ RequestContext context = RequestContext.getCurrentInstance();
if (context == null)
{
- _LOG.warning("Cannot find AdfFacesContext; TimeZone will default.");
+ _LOG.warning("Cannot find RequestContext; TimeZone will default.");
}
else
{
tZone = context.getTimeZone();
}
- // If AdfFacesContext is null or if it returns a null,
+ // If RequestContext is null or if it returns a null,
// then set it to the default time zone which is GMT time zone
if (tZone == null)
{
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
Wed Jul 26 14:35:26 2006
@@ -34,7 +34,7 @@
import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.logging.ADFLogger;
import org.apache.myfaces.trinidad.util.ComponentUtils;
import org.apache.myfaces.trinidad.util.MessageFactory;
@@ -60,7 +60,7 @@
* Else uses the <code>currencyCode</code> set on
<code>adf-faces-config.xml</code>
* file. If it is not set, then it is defaulted based on the locale. The
* value registered in adf-faces-config.xml is obtained using
- * api from [EMAIL PROTECTED]
org.apache.myfaces.trinidad.context.AdfFacesContext}.</p>
+ * api from [EMAIL PROTECTED]
org.apache.myfaces.trinidad.context.RequestContext}.</p>
*
* <p>Since ADF Faces is compatible only with JDK 1.4 and higher versions,
* the <code>currencyCode</code> gets preferance over
<code>currencySymbol</code>
@@ -105,7 +105,7 @@
* converter ID, and therefore will be used when the
* <code><f:convertNumber></code> tag is used.
*
- * @see org.apache.myfaces.trinidad.context.AdfFacesContext
+ * @see org.apache.myfaces.trinidad.context.RequestContext
*
* <p>
* @author The Oracle ADF Faces Team
@@ -215,7 +215,7 @@
}
Locale locale = _getLocale(context);
- AdfFacesContext adfFacesCtx = AdfFacesContext.getCurrentInstance();
+ RequestContext adfFacesCtx = RequestContext.getCurrentInstance();
NumberFormat fmt = _getNumberFormat(pattern, type, locale, adfFacesCtx);
@@ -291,7 +291,7 @@
Locale locale = _getLocale(context);
- AdfFacesContext adfFacesCtx = AdfFacesContext.getCurrentInstance();
+ RequestContext adfFacesCtx = RequestContext.getCurrentInstance();
NumberFormat formatter = _getNumberFormat(pattern, type, locale,
adfFacesCtx);
@@ -674,7 +674,7 @@
Object dfs = _patternFormatSymbolsHolder.get(locale);
// make sure to return a clone so that it can be mutated at the point
- // of use based on the setting in the AdfFacesContext
+ // of use based on the setting in the RequestContext
if (dfs != null)
return (DecimalFormatSymbols) ((DecimalFormatSymbols) dfs).clone();
else
@@ -767,7 +767,7 @@
String pattern,
String type,
Locale locale,
- AdfFacesContext adfFacesCtx
+ RequestContext adfFacesCtx
)
{
NumberFormat nfmt;
@@ -811,7 +811,7 @@
private void _setUpDecimalSymbolFormatProperties(
DecimalFormatSymbols symbols,
- AdfFacesContext adfFacesCtx,
+ RequestContext adfFacesCtx,
Locale locale
)
{
@@ -830,7 +830,7 @@
{
if (_LOG.isWarning())
{
- _LOG.warning("AdfFacesContext is null:" +
+ _LOG.warning("RequestContext is null:" +
" decimal separator," +
" number grouping separator," +
" currency code" +
@@ -868,7 +868,7 @@
}
private void _setCurrencyInformation(
- AdfFacesContext context,
+ RequestContext context,
DecimalFormatSymbols symbols)
{
String currencyCode = _getCurrencyCode(context);
@@ -986,7 +986,7 @@
}
private String _getCurrencyCode(
- AdfFacesContext context
+ RequestContext context
)
{
String currencyCode = getCurrencyCode();
@@ -998,7 +998,7 @@
}
else
{
- _LOG.warning("AdfFacesContext is null, unable to get currency code");
+ _LOG.warning("RequestContext is null, unable to get currency code");
}
}
@@ -1007,7 +1007,7 @@
// applied only while formatting
private void _setCurrencyFormattingProperties(
- AdfFacesContext context,
+ RequestContext context,
NumberFormat numberFormatter
)
{
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/LaunchEvent.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/LaunchEvent.java?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/LaunchEvent.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/LaunchEvent.java
Wed Jul 26 14:35:26 2006
@@ -26,7 +26,7 @@
import javax.faces.event.FacesListener;
import javax.faces.event.PhaseId;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
/**
@@ -64,7 +64,7 @@
*/
public void launchDialog(boolean useWindow)
{
- AdfFacesContext afContext = AdfFacesContext.getCurrentInstance();
+ RequestContext afContext = RequestContext.getCurrentInstance();
afContext.launchDialog(getViewRoot(),
getDialogParameters(),
getComponent(),
Copied:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/RequestFilter.java
(from r425578,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/AdfFacesFilter.java)
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/RequestFilter.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/RequestFilter.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/AdfFacesFilter.java&r1=425578&r2=425853&rev=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/AdfFacesFilter.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/RequestFilter.java
Wed Jul 26 14:35:26 2006
@@ -28,13 +28,13 @@
/**
* Servlet filter that ensures that ADF Faces is properly initialized
- * by establishing a AdfFacesContext object; this filter also processes file
+ * by establishing a RequestContext object; this filter also processes file
* uploads.
* <p>
* @version $Name: $ ($Revision:
adfrt/faces/adf-faces-api/src/main/java/oracle/adf/view/faces/webapp/AdfFacesFilter.java#0
$) $Date: 10-nov-2005.19:08:29 $
* @author The Oracle ADF Faces Team
*/
-public class AdfFacesFilter implements Filter
+public class RequestFilter implements Filter
{
public void init(
FilterConfig filterConfig) throws ServletException
@@ -94,5 +94,5 @@
private Filter _proxied;
- private static final ADFLogger _LOG =
ADFLogger.createADFLogger(AdfFacesFilter.class);
+ private static final ADFLogger _LOG =
ADFLogger.createADFLogger(RequestFilter.class);
}
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentTag.java
Wed Jul 26 14:35:26 2006
@@ -38,7 +38,7 @@
import org.apache.myfaces.trinidad.change.AttributeComponentChange;
import org.apache.myfaces.trinidad.change.ComponentChange;
import org.apache.myfaces.trinidad.component.UIXComponent;
-import org.apache.myfaces.trinidad.context.AdfFacesContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.event.AttributeChangeEvent;
import org.apache.myfaces.trinidad.logging.ADFLogger;
@@ -479,7 +479,7 @@
UIComponent uiComponent,
boolean isCreated)
{
- AdfFacesContext afc = AdfFacesContext.getCurrentInstance();
+ RequestContext afc = RequestContext.getCurrentInstance();
Iterator changeIter =
afc.getChangeManager().getComponentChanges(facesContext,
uiComponent);
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UploadedFileProcessor.java
Wed Jul 26 14:35:26 2006
@@ -22,7 +22,7 @@
/**
* Interface responsible for processing file uploads. An ADF Faces
* application has a single <code>UploadedFileProcessor</code> instance.
- * It is accessible from the [EMAIL PROTECTED]
org.apache.myfaces.trinidad.context.AdfFacesContext},
+ * It is accessible from the [EMAIL PROTECTED]
org.apache.myfaces.trinidad.context.RequestContext},
* but will be invoked automatically by the framework as needed. Developers
* can replace the standard processor using the
* <code>adf-faces-config.xml</code> file.
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/site/xdoc/tagdoc/af_returnActionListener.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/site/xdoc/tagdoc/af_returnActionListener.xml?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/site/xdoc/tagdoc/af_returnActionListener.xml
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/site/xdoc/tagdoc/af_returnActionListener.xml
Wed Jul 26 14:35:26 2006
@@ -27,7 +27,7 @@
The returnActionListener tag is a declarative way to allow an action
source
(<commandButton>, <commandLink>, etc.) to return a value
from a dialog or process. It calls the
- returnFromDialog method on the AdfFacesContext.
+ returnFromDialog method on the RequestContext.
This tag can be used both with ADF Faces commands and JSF standard
tags.
More generally, it can be used with any component at all that
implements
the standard ActionSource interface.
Copied:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java
(from r425555,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockAdfFacesContext.java)
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockAdfFacesContext.java&r1=425555&r2=425853&rev=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockAdfFacesContext.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/context/MockRequestContext.java
Wed Jul 26 14:35:26 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.DialogService;
import org.apache.myfaces.trinidad.context.PageFlowScopeProvider;
@@ -31,14 +31,14 @@
import org.apache.myfaces.trinidad.webapp.UploadedFileProcessor;
-public class MockAdfFacesContext extends AdfFacesContext
+public class MockRequestContext extends RequestContext
{
- public MockAdfFacesContext()
+ public MockRequestContext()
{
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)
Copied:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java
(from r425555,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/AdfDateTimeConverterTest.java)
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/AdfDateTimeConverterTest.java&r1=425555&r2=425853&rev=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/AdfDateTimeConverterTest.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java
Wed Jul 26 14:35:26 2006
@@ -28,15 +28,15 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.myfaces.trinidad.context.MockAdfFacesContext;
+import org.apache.myfaces.trinidad.context.MockRequestContext;
import org.apache.myfaces.trinidad.convert.DateTimeConverter;
import org.apache.myfaces.trinidadbuild.test.MockUIComponentWrapper;
import org.apache.shale.test.mock.MockFacesContext;
import org.jmock.Mock;
-public class AdfDateTimeConverterTest extends DateTimeConverterTestCase
+public class TrinidadDateTimeConverterTest extends DateTimeConverterTestCase
{
- public AdfDateTimeConverterTest(String name)
+ public TrinidadDateTimeConverterTest(String name)
{
super(name);
}
@@ -45,7 +45,7 @@
public void setUp()
{
super.setUp();
- _mafct = new MockAdfFacesContext();
+ _mafct = new MockRequestContext();
_mafct.setTwoDigitYearStart(1950);
_mafct.setTimeZone(DEFAULT_TIME_ZONE);
}
@@ -59,7 +59,7 @@
public static Test suite()
{
- return new TestSuite(AdfDateTimeConverterTest.class);
+ return new TestSuite(TrinidadDateTimeConverterTest.class);
}
@@ -336,7 +336,7 @@
return data;
}
- private MockAdfFacesContext _mafct;
+ private MockRequestContext _mafct;
private static final TimeZone DEFAULT_TIME_ZONE = TimeZone.getDefault();
}
Copied:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
(from r425555,
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/AdfNumberConverterTest.java)
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java?p2=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java&p1=incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/AdfNumberConverterTest.java&r1=425555&r2=425853&rev=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/AdfNumberConverterTest.java
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
Wed Jul 26 14:35:26 2006
@@ -24,7 +24,7 @@
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
-import org.apache.myfaces.trinidad.context.MockAdfFacesContext;
+import org.apache.myfaces.trinidad.context.MockRequestContext;
import org.apache.myfaces.trinidadbuild.test.MockUIComponentWrapper;
import org.apache.shale.test.mock.MockFacesContext;
import org.jmock.Mock;
@@ -37,9 +37,9 @@
* @author Vijay Venaktaraman ([EMAIL PROTECTED])
* @version $Name: $ ($version: $) $Date: 16-aug-2005.15:12:23 $
*/
-public class AdfNumberConverterTest extends NumberConverterTestCase
+public class TrinidadNumberConverterTest extends NumberConverterTestCase
{
- public AdfNumberConverterTest(String name)
+ public TrinidadNumberConverterTest(String name)
{
super(name);
}
@@ -52,7 +52,7 @@
public void setUp()
{
super.setUp();
- _mafct = new MockAdfFacesContext();
+ _mafct = new MockRequestContext();
_mafct.setDecimalSeparator('.');
_mafct.setNumberGroupingSeparator(',');
_mafct.setCurrencyCode(null);
@@ -61,7 +61,7 @@
public void tearDown()
{
- // AdfFacesContext uses a thread local variable to hold itself and has a
+ // RequestContext uses a thread local variable to hold itself and has a
// check in it. So you need to release, since all instances for tests
// are created on the same thread by Junit.
_mafct.release();
@@ -71,7 +71,7 @@
public static Test suite()
{
- return new TestSuite(AdfNumberConverterTest.class);
+ return new TestSuite(TrinidadNumberConverterTest.class);
}
public void testCurrencyCodeIsHonoured()
@@ -82,12 +82,12 @@
super.testCurrencyCodeIsHonoured();
}
- public void testValueSetInAdfFacesContextIsHonoured()
+ public void testValueSetInRequestContextIsHonoured()
{
//ugly ?
_mafct.release();
_mafct = null;
- _mafct = new MockAdfFacesContext();
+ _mafct = new MockRequestContext();
_mafct.setDecimalSeparator('*');
_mafct.setNumberGroupingSeparator('!');
_mafct.setCurrencyCode(null);
@@ -175,7 +175,7 @@
}
}
- private MockAdfFacesContext _mafct;
+ private MockRequestContext _mafct;
- //checkForSettingsInAdfFacesContext - dec sep, currencyCode, NumGrpSptr
+ //checkForSettingsInRequestContext - dec sep, currencyCode, NumGrpSptr
}
Modified:
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml?rev=425853&r1=425852&r2=425853&view=diff
==============================================================================
---
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml
(original)
+++
incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/converters/trinidad/Number.xml
Wed Jul 26 14:35:26 2006
@@ -28,7 +28,7 @@
Currency code can also be set for the entire application in
adf-faces-config.xml file.
If currency code is not set on the converter, and if set on
adf-faces-config.xml configuration file it will be used by calling
-
<code>AdfFacesContext().getCurrenctInstance().getCurrencyCode().</code>
+
<code>RequestContext().getCurrenctInstance().getCurrencyCode().</code>
This currency code will be used during call to getAsString() for
formatting,
provided type is set to 'currency'.]]>
</description>
