aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/itmill/toolkit/Application.java
diff options
context:
space:
mode:
authorJoonas Lehtinen <joonas.lehtinen@itmill.com>2006-12-27 11:40:51 +0000
committerJoonas Lehtinen <joonas.lehtinen@itmill.com>2006-12-27 11:40:51 +0000
commitedc2d3dcf543f4be79dcb3175d16183f62d6d4dc (patch)
tree0be662815667157f3ec96269d15bbc3c38cfc3ce /src/com/itmill/toolkit/Application.java
parent1fc55f6c542933ea7b82e940118d9a0124ea4799 (diff)
downloadvaadin-framework-edc2d3dcf543f4be79dcb3175d16183f62d6d4dc.tar.gz
vaadin-framework-edc2d3dcf543f4be79dcb3175d16183f62d6d4dc.zip
Changed API to avoid naming problems when inherited applications also have licenses
svn changeset:156/svn branch:toolkit
Diffstat (limited to 'src/com/itmill/toolkit/Application.java')
-rw-r--r--src/com/itmill/toolkit/Application.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/Application.java b/src/com/itmill/toolkit/Application.java
index 60dc6b1e30..0f59967fb1 100644
--- a/src/com/itmill/toolkit/Application.java
+++ b/src/com/itmill/toolkit/Application.java
@@ -773,7 +773,7 @@ public abstract class Application
*
* @return License this application is currently using
*/
- public License getLicense() {
+ public License getToolkitLicense() {
return license;
}
@@ -784,7 +784,7 @@ public abstract class Application
*
* @param license New license for this application.
*/
- public void setLicense(License license) {
+ public void setToolkitLicense(License license) {
this.license = license;
}