aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/itmill/toolkit/Application.java
diff options
context:
space:
mode:
authorJani Laakso <jani.laakso@itmill.com>2008-03-06 10:11:02 +0000
committerJani Laakso <jani.laakso@itmill.com>2008-03-06 10:11:02 +0000
commitb0e486bd9811bff5f3c258d0dffcb33f16d65852 (patch)
treefbb6915ffe20c63e25ad30c22cdb9470729dc3ac /src/com/itmill/toolkit/Application.java
parentfd08131f44f475b185a4f84a1c1757bab43702c0 (diff)
downloadvaadin-framework-b0e486bd9811bff5f3c258d0dffcb33f16d65852.tar.gz
vaadin-framework-b0e486bd9811bff5f3c258d0dffcb33f16d65852.zip
Fixed #1174: Where comes data for the Application.getProperty()
svn changeset:3986/svn branch:trunk
Diffstat (limited to 'src/com/itmill/toolkit/Application.java')
-rw-r--r--src/com/itmill/toolkit/Application.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/com/itmill/toolkit/Application.java b/src/com/itmill/toolkit/Application.java
index e5b44542d0..5a18903fa1 100644
--- a/src/com/itmill/toolkit/Application.java
+++ b/src/com/itmill/toolkit/Application.java
@@ -407,10 +407,16 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
* corresponds to the given URL and it will return windows when asked for
* them.
*
+ * Application properties are defined by servlet configuration object
+ * {@link javax.servlet.ServletConfig} and they are overridden by
+ * context-wide initialization parameters
+ * {@link javax.servlet.ServletContext}.
+ *
* @param applicationUrl
* the URL the application should respond to.
* @param applicationProperties
- * the Application properties as specified by the adapter.
+ * the Application properties as specified by the servlet
+ * configuration.
* @param context
* the context application will be running in.
*
@@ -527,6 +533,9 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
/**
* Returns an enumeration of all the names in this application.
*
+ * See {@link #start(URL, Properties, ApplicationContext)} how properties
+ * are defined.
+ *
* @return an enumeration of all the keys in this property list, including
* the keys in the default property list.
*
@@ -539,6 +548,9 @@ public abstract class Application implements URIHandler, Terminal.ErrorListener
* Searches for the property with the specified name in this application.
* This method returns <code>null</code> if the property is not found.
*
+ * See {@link #start(URL, Properties, ApplicationContext)} how properties
+ * are defined.
+ *
* @param name
* the name of the property.
* @return the value in this property list with the specified key value.