Author: ehillenius
Date: Thu Jan 4 21:20:02 2007
New Revision: 492908
URL: http://svn.apache.org/viewvc?view=rev&rev=492908
Log:
WICKET-81
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Application.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Application.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Application.java?view=diff&rev=492908&r1=492907&r2=492908
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Application.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Application.java
Thu Jan 4 21:20:02 2007
@@ -238,7 +238,7 @@
/** Request logger instance. */
private IRequestLogger requestLogger;
-
+
/** Settings for this application. */
private Settings settings;
@@ -284,7 +284,7 @@
}
});
}
-
+
/**
* Gets the [EMAIL PROTECTED] RequestLogger}.
*
@@ -292,28 +292,29 @@
*/
public final IRequestLogger getRequestLogger()
{
- if(getRequestLoggerSettings().isRequestLoggerEnabled())
+ if (getRequestLoggerSettings().isRequestLoggerEnabled())
{
- if(requestLogger == null) requestLogger =
newRequestLogger();
+ if (requestLogger == null)
+ requestLogger = newRequestLogger();
}
else
{
requestLogger = null;
}
return requestLogger;
- }
-
+ }
+
/**
* creates a new request logger when requests logging is enabled.
*
- * @return The new request logger
+ * @return The new request logger
*
*/
protected IRequestLogger newRequestLogger()
{
return new RequestLogger();
}
-
+
/**
* Adds a component instantiation listener. This method should typicaly
only
* be called during application startup; it is not thread safe.
@@ -437,7 +438,7 @@
* @since 1.2
* @deprecated use [EMAIL PROTECTED] #getDebugSettings()} instead
*/
- public final IAjaxSettings getAjaxSettings()
+ public IAjaxSettings getAjaxSettings()
{
return getSettings();
}
@@ -455,7 +456,7 @@
* @see IApplicationSettings
* @since 1.2
*/
- public final IApplicationSettings getApplicationSettings()
+ public IApplicationSettings getApplicationSettings()
{
return getSettings();
}
@@ -477,7 +478,7 @@
* @see IDebugSettings
* @since 1.2
*/
- public final IDebugSettings getDebugSettings()
+ public IDebugSettings getDebugSettings()
{
return getSettings();
}
@@ -487,7 +488,7 @@
* @see IExceptionSettings
* @since 1.2
*/
- public final IExceptionSettings getExceptionSettings()
+ public IExceptionSettings getExceptionSettings()
{
return getSettings();
}
@@ -497,7 +498,7 @@
* @see IFrameworkSettings
* @since 1.2
*/
- public final IFrameworkSettings getFrameworkSettings()
+ public IFrameworkSettings getFrameworkSettings()
{
return getSettings();
}
@@ -525,7 +526,7 @@
* @see IMarkupSettings
* @since 1.2
*/
- public final IMarkupSettings getMarkupSettings()
+ public IMarkupSettings getMarkupSettings()
{
return getSettings();
}
@@ -558,7 +559,7 @@
* @see IPageSettings
* @since 1.2
*/
- public final IPageSettings getPageSettings()
+ public IPageSettings getPageSettings()
{
return getSettings();
}
@@ -568,7 +569,7 @@
* @see IDebugSettings
* @since 1.2
*/
- public final IRequestCycleSettings getRequestCycleSettings()
+ public IRequestCycleSettings getRequestCycleSettings()
{
return getSettings();
}
@@ -578,7 +579,7 @@
* @see IResourceSettings
* @since 1.2
*/
- public final IResourceSettings getResourceSettings()
+ public IResourceSettings getResourceSettings()
{
return getSettings();
}
@@ -588,16 +589,17 @@
* @see IResourceSettings
* @since 1.3
*/
- public final IRequestLoggerSettings getRequestLoggerSettings()
+ public IRequestLoggerSettings getRequestLoggerSettings()
{
return getSettings();
}
+
/**
* @return Application's security related settings
* @see ISecuritySettings
* @since 1.2
*/
- public final ISecuritySettings getSecuritySettings()
+ public ISecuritySettings getSecuritySettings()
{
return getSettings();
}
@@ -607,7 +609,7 @@
* @see ISessionSettings
* @since 1.2
*/
- public final ISessionSettings getSessionSettings()
+ public ISessionSettings getSessionSettings()
{
return getSettings();
}
@@ -638,10 +640,8 @@
* @see Application#getResourceSettings()
* @see Application#getSecuritySettings()
* @see Application#getSessionSettings()
- * @deprecated will be made private after 1.2
*/
- // TODO Post 1.2: Make private
- public Settings getSettings()
+ private Settings getSettings()
{
if (!settingsAccessible)
{
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java?view=diff&rev=492908&r1=492907&r2=492908
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
Thu Jan 4 21:20:02 2007
@@ -43,8 +43,6 @@
import wicket.model.ICompoundModel;
import wicket.model.IModel;
import wicket.model.IModelComparator;
-import wicket.settings.IApplicationSettings;
-import wicket.settings.Settings;
import wicket.util.convert.IConverter;
import wicket.util.lang.Classes;
import wicket.util.lang.Objects;
@@ -747,42 +745,6 @@
public final Application getApplication()
{
return Application.get();
- }
-
- /**
- *
- * Deprecated. Use getApplication().getXXXSettings() instead
- *
- * Gets the application pages from the application that this component
- * belongs to.
- *
- * @return The application pages
- * @see IApplicationSettings
- *
- * @deprecated
- */
- // TODO Post 1.2: Remove this method
- public final IApplicationSettings getApplicationPages()
- {
- return getApplication().getSettings();
- }
-
- /**
- * This method has been deprecated in favor of
- * Application.get().getXXXSettings()
- *
- * Gets the application settings from the application that this
component
- * belongs to.
- *
- * @return The application settings from the application that this
component
- * belongs to
- * @see Settings
- * @deprecated will be removed after 1.2
- */
- // TODO Post 1.2: Remove this method
- public final Settings getApplicationSettings()
- {
- return getApplication().getSettings();
}
/**
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java?view=diff&rev=492908&r1=492907&r2=492908
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java
(original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/Application.java Thu Jan
4 21:20:02 2007
@@ -387,7 +387,7 @@
* @see IApplicationSettings
* @since 1.2
*/
- public final IApplicationSettings getApplicationSettings()
+ public IApplicationSettings getApplicationSettings()
{
return getSettings();
}
@@ -409,7 +409,7 @@
* @see IDebugSettings
* @since 1.2
*/
- public final IDebugSettings getDebugSettings()
+ public IDebugSettings getDebugSettings()
{
return getSettings();
}
@@ -419,7 +419,7 @@
* @see IFrameworkSettings
* @since 1.2
*/
- public final IFrameworkSettings getFrameworkSettings()
+ public IFrameworkSettings getFrameworkSettings()
{
return getSettings();
}
@@ -447,7 +447,7 @@
* @see IMarkupSettings
* @since 1.2
*/
- public final IMarkupSettings getMarkupSettings()
+ public IMarkupSettings getMarkupSettings()
{
return getSettings();
}
@@ -481,7 +481,7 @@
* @see IPageSettings
* @since 1.2
*/
- public final IPageSettings getPageSettings()
+ public IPageSettings getPageSettings()
{
return getSettings();
}
@@ -491,7 +491,7 @@
* @see IDebugSettings
* @since 1.2
*/
- public final IRequestCycleSettings getRequestCycleSettings()
+ public IRequestCycleSettings getRequestCycleSettings()
{
return getSettings();
}
@@ -531,7 +531,7 @@
* @see IResourceSettings
* @since 1.2
*/
- public final IResourceSettings getResourceSettings()
+ public IResourceSettings getResourceSettings()
{
return getSettings();
}
@@ -541,7 +541,7 @@
* @see IResourceSettings
* @since 1.3
*/
- public final IRequestLoggerSettings getRequestLoggerSettings()
+ public IRequestLoggerSettings getRequestLoggerSettings()
{
return getSettings();
}
@@ -551,7 +551,7 @@
* @see ISecuritySettings
* @since 1.2
*/
- public final ISecuritySettings getSecuritySettings()
+ public ISecuritySettings getSecuritySettings()
{
return getSettings();
}
@@ -561,7 +561,7 @@
* @see ISessionSettings
* @since 1.2
*/
- public final ISessionSettings getSessionSettings()
+ public ISessionSettings getSessionSettings()
{
return getSettings();
}
