Author: ehillenius
Date: Sun Oct 15 06:51:30 2006
New Revision: 464197
URL: http://svn.apache.org/viewvc?view=rev&rev=464197
Log:
fixed inconsistent naming
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IApplicationSettings.java
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/convert/CoverterLocatorFactory.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/convert/IConverterLocatorFactory.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/lang/Classes.java
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java?view=diff&rev=464197&r1=464196&r2=464197
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/Session.java Sun Oct 15
06:51:30 2006
@@ -859,7 +859,7 @@
{
// Let the factory create a new converter
converterSupplier =
getApplication().getApplicationSettings()
-
.getConverterSupplierFactory().newConverterSupplier();
+
.getConverterLocatorFactory().newConverterLocator();
}
return converterSupplier.getConverter(type);
}
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IApplicationSettings.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IApplicationSettings.java?view=diff&rev=464197&r1=464196&r2=464197
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IApplicationSettings.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/IApplicationSettings.java
Sun Oct 15 06:51:30 2006
@@ -87,11 +87,11 @@
String getContextPath();
/**
- * Gets the converter supplier factory.
+ * Gets the converter locator factory.
*
- * @return the converter factory
+ * @return the converter locator factory
*/
- IConverterLocatorFactory getConverterSupplierFactory();
+ IConverterLocatorFactory getConverterLocatorFactory();
/**
* @return Returns the defaultLocale.
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java?view=diff&rev=464197&r1=464196&r2=464197
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java
(original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/settings/Settings.java
Sun Oct 15 06:51:30 2006
@@ -476,9 +476,9 @@
}
/**
- * @see
wicket.settings.IApplicationSettings#getConverterSupplierFactory()
+ * @see
wicket.settings.IApplicationSettings#getConverterLocatorFactory()
*/
- public IConverterLocatorFactory getConverterSupplierFactory()
+ public IConverterLocatorFactory getConverterLocatorFactory()
{
if (converterFactory == null)
{
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/util/convert/CoverterLocatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/convert/CoverterLocatorFactory.java?view=diff&rev=464197&r1=464196&r2=464197
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/util/convert/CoverterLocatorFactory.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/util/convert/CoverterLocatorFactory.java
Sun Oct 15 06:51:30 2006
@@ -30,9 +30,9 @@
public final class CoverterLocatorFactory implements IConverterLocatorFactory
{
/**
- * @see
wicket.util.convert.IConverterLocatorFactory#newConverterSupplier()
+ * @see
wicket.util.convert.IConverterLocatorFactory#newConverterLocator()
*/
- public IConverterLocator newConverterSupplier()
+ public IConverterLocator newConverterLocator()
{
return new ConverterLocator();
}
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/util/convert/IConverterLocatorFactory.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/convert/IConverterLocatorFactory.java?view=diff&rev=464197&r1=464196&r2=464197
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/util/convert/IConverterLocatorFactory.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/util/convert/IConverterLocatorFactory.java
Sun Oct 15 06:51:30 2006
@@ -33,5 +33,5 @@
*
* @return A new [EMAIL PROTECTED] IConverterLocator} instance
*/
- IConverterLocator newConverterSupplier();
+ IConverterLocator newConverterLocator();
}
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/util/lang/Classes.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/lang/Classes.java?view=diff&rev=464197&r1=464196&r2=464197
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/util/lang/Classes.java
(original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/util/lang/Classes.java
Sun Oct 15 06:51:30 2006
@@ -84,7 +84,7 @@
try
{
final IConverter converter =
Application.get().getApplicationSettings()
-
.getConverterSupplierFactory().newConverterSupplier().getConverter(paramClass);
+
.getConverterLocatorFactory().newConverterLocator().getConverter(paramClass);
final Object param = converter.convertToObject(value,
locale);
if (param == null)
{
