summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@itmill.com>2010-10-04 07:27:28 +0000
committerHenri Sara <henri.sara@itmill.com>2010-10-04 07:27:28 +0000
commit85df43c2df34486e091d3847c2e531bdcae2e19c (patch)
tree19b6807de08dd1e580416d3215332da1f6032eb2 /src/com/vaadin
parent94b22ca256ceb9d393fba49eb86494976f980574 (diff)
downloadvaadin-framework-85df43c2df34486e091d3847c2e531bdcae2e19c.tar.gz
vaadin-framework-85df43c2df34486e091d3847c2e531bdcae2e19c.zip
#5692 Generics: DemoLauncher minor update
svn changeset:15317/svn branch:6.5
Diffstat (limited to 'src/com/vaadin')
-rw-r--r--src/com/vaadin/launcher/DemoLauncher.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/vaadin/launcher/DemoLauncher.java b/src/com/vaadin/launcher/DemoLauncher.java
index 38b6060a27..f18cdf636f 100644
--- a/src/com/vaadin/launcher/DemoLauncher.java
+++ b/src/com/vaadin/launcher/DemoLauncher.java
@@ -36,7 +36,8 @@ public class DemoLauncher {
public static void main(String[] args) throws Exception {
- final Map serverArgs = DevelopmentServerLauncher.parseArguments(args);
+ final Map<String, String> serverArgs = DevelopmentServerLauncher
+ .parseArguments(args);
boolean deployed = false;
try {
// Default deployment: embedded.war
@@ -176,7 +177,8 @@ public class DemoLauncher {
* @return
* @throws IOException
*/
- protected static boolean deployEmbeddedWarfile(Map args) throws IOException {
+ protected static boolean deployEmbeddedWarfile(Map<String, String> args)
+ throws IOException {
final String embeddedWarfileName = "/embedded.war";
final InputStream embeddedWarfile = DemoLauncher.class
.getResourceAsStream(embeddedWarfileName);