You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by or...@apache.org on 2005/09/01 03:03:14 UTC
svn commit: r265610 - in /myfaces/impl/trunk/src/java/org/apache/myfaces:
taglib/core/ConvertDateTimeTag.java taglib/core/ConvertNumberTag.java
webapp/MyFacesServlet.java
Author: oros
Date: Wed Aug 31 18:03:08 2005
New Revision: 265610
URL: http://svn.apache.org/viewcvs?rev=265610&view=rev
Log:
fixed all signature issues so now all API classes/interfaces comply with the spec
Modified:
myfaces/impl/trunk/src/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
myfaces/impl/trunk/src/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
myfaces/impl/trunk/src/java/org/apache/myfaces/webapp/MyFacesServlet.java
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java?rev=265610&r1=265609&r2=265610&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java Wed Aug 31 18:03:08 2005
@@ -26,6 +26,9 @@
import java.util.TimeZone;
import java.util.Locale;
+import org.apache.myfaces.util.LocaleUtils;
+
+
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -110,7 +113,7 @@
}
else
{
- Locale locale = localeFromString(value);
+ Locale locale = LocaleUtils.converterTagLocaleFromString(value);
converter.setLocale(locale);
}
}
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java?rev=265610&r1=265609&r2=265610&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java Wed Aug 31 18:03:08 2005
@@ -25,6 +25,9 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
+import org.apache.myfaces.util.LocaleUtils;
+
+
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -143,7 +146,7 @@
}
else
{
- Locale locale = localeFromString(value);
+ Locale locale = LocaleUtils.converterTagLocaleFromString(value);
converter.setLocale(locale);
}
}
@@ -151,8 +154,8 @@
private static void setConverterCurrencyCode(FacesContext facesContext,
- NumberConverter converter,
- String value)
+ NumberConverter converter,
+ String value)
{
if (value == null) return;
if (UIComponentTag.isValueReference(value))
@@ -167,8 +170,8 @@
}
private static void setConverterCurrencySymbol(FacesContext facesContext,
- NumberConverter converter,
- String value)
+ NumberConverter converter,
+ String value)
{
if (value == null) return;
if (UIComponentTag.isValueReference(value))
@@ -183,8 +186,8 @@
}
private static void setConverterGroupingUsed(FacesContext facesContext,
- NumberConverter converter,
- String value)
+ NumberConverter converter,
+ String value)
{
if (value == null) return;
if (UIComponentTag.isValueReference(value))
@@ -203,8 +206,8 @@
}
private static void setConverterIntegerOnly(FacesContext facesContext,
- NumberConverter converter,
- String value)
+ NumberConverter converter,
+ String value)
{
if (value == null) return;
if (UIComponentTag.isValueReference(value))
@@ -223,8 +226,8 @@
}
private static void setConverterMaxFractionDigits(FacesContext facesContext,
- NumberConverter converter,
- String value)
+ NumberConverter converter,
+ String value)
{
if (value == null) return;
if (UIComponentTag.isValueReference(value))
@@ -243,8 +246,8 @@
}
private static void setConverterMaxIntegerDigits(FacesContext facesContext,
- NumberConverter converter,
- String value)
+ NumberConverter converter,
+ String value)
{
if (value == null) return;
if (UIComponentTag.isValueReference(value))
@@ -263,8 +266,8 @@
}
private static void setConverterMinFractionDigits(FacesContext facesContext,
- NumberConverter converter,
- String value)
+ NumberConverter converter,
+ String value)
{
if (value == null) return;
if (UIComponentTag.isValueReference(value))
@@ -283,8 +286,8 @@
}
private static void setConverterMinIntegerDigits(FacesContext facesContext,
- NumberConverter converter,
- String value)
+ NumberConverter converter,
+ String value)
{
if (value == null) return;
if (UIComponentTag.isValueReference(value))
@@ -303,8 +306,8 @@
}
private static void setConverterPattern(FacesContext facesContext,
- NumberConverter converter,
- String value)
+ NumberConverter converter,
+ String value)
{
if (value == null) return;
if (UIComponentTag.isValueReference(value))
@@ -319,8 +322,8 @@
}
private static void setConverterType(FacesContext facesContext,
- NumberConverter converter,
- String value)
+ NumberConverter converter,
+ String value)
{
if (value == null) return;
if (UIComponentTag.isValueReference(value))
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/webapp/MyFacesServlet.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/webapp/MyFacesServlet.java?rev=265610&r1=265609&r2=265610&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/webapp/MyFacesServlet.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/webapp/MyFacesServlet.java Wed Aug 31 18:03:08 2005
@@ -29,11 +29,27 @@
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class MyFacesServlet
- extends FacesServlet
+public class MyFacesServlet implements Servlet
{
private static final Log log = LogFactory.getLog(MyFacesServlet.class);
+ private FacesServlet delegate = new FacesServlet();
+
+ public void destroy()
+ {
+ delegate.destroy();
+ }
+
+ public ServletConfig getServletConfig()
+ {
+ return delegate.getServletConfig();
+ }
+
+ public String getServletInfo()
+ {
+ return delegate.getServletInfo();
+ }
+
public void init(ServletConfig servletConfig)
throws ServletException
{
@@ -45,7 +61,7 @@
log.warn("ServletContextListener not yet called");
org.apache.myfaces.webapp.StartupServletContextListener.initFaces(servletConfig.getServletContext());
}
- super.init(servletConfig);
+ delegate.init(servletConfig);
log.info("MyFacesServlet for context '" + servletConfig.getServletContext().getRealPath("/") + "' initialized.");
}
@@ -54,7 +70,7 @@
ServletException
{
if (log.isTraceEnabled()) log.trace("MyFacesServlet service start");
- super.service(request, response);
+ delegate.service(request, response);
if (log.isTraceEnabled()) log.trace("MyFacesServlet service finished");
}