summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-08-09 19:08:29 +0300
committerArtur Signell <artur@vaadin.com>2012-08-09 19:08:29 +0300
commitc0a192974a4d64f12128a1a957d331a82101a0f4 (patch)
tree67d6c3ac706c1f91fe1134d8a57ad4a0a32d2379 /src/com/vaadin
parent2b0cb55ef291f8f8a95e45c4afa87ca3b2e650b8 (diff)
downloadvaadin-framework-c0a192974a4d64f12128a1a957d331a82101a0f4.tar.gz
vaadin-framework-c0a192974a4d64f12128a1a957d331a82101a0f4.zip
Reformatted project
Diffstat (limited to 'src/com/vaadin')
-rw-r--r--src/com/vaadin/annotations/JavaScript.java9
-rw-r--r--src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java5
2 files changed, 6 insertions, 8 deletions
diff --git a/src/com/vaadin/annotations/JavaScript.java b/src/com/vaadin/annotations/JavaScript.java
index f97457c1cd..357bcc3649 100644
--- a/src/com/vaadin/annotations/JavaScript.java
+++ b/src/com/vaadin/annotations/JavaScript.java
@@ -20,11 +20,10 @@ import com.vaadin.terminal.gwt.server.ClientConnector;
* Relative urls are mapped to APP/CONNECTOR/[url] which are by default served
* from the classpath relative to the class where the annotation is defined.
* <p>
- * Example: {@code @JavaScript( "http://host.com/file1.js", "file2.js"})} on
- * the class com.example.MyConnector would load the file
- * http://host.com/file1.js as is and file2.js from /com/example/file2.js on the
- * server's classpath using the ClassLoader that was used to load
- * com.example.MyConnector.
+ * Example: {@code @JavaScript( "http://host.com/file1.js", "file2.js"})} on the
+ * class com.example.MyConnector would load the file http://host.com/file1.js as
+ * is and file2.js from /com/example/file2.js on the server's classpath using
+ * the ClassLoader that was used to load com.example.MyConnector.
*
* @author Vaadin Ltd
* @version @VERSION@
diff --git a/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java b/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java
index b2b962b0fd..2a1dc31897 100644
--- a/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java
+++ b/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java
@@ -31,9 +31,8 @@ class ServletPortletHelper implements Serializable {
throws ApplicationClassException {
String applicationParameter = deploymentConfiguration
.getInitParameters().getProperty("application");
- String rootParameter = deploymentConfiguration
- .getInitParameters().getProperty(
- Application.ROOT_PARAMETER);
+ String rootParameter = deploymentConfiguration.getInitParameters()
+ .getProperty(Application.ROOT_PARAMETER);
ClassLoader classLoader = deploymentConfiguration.getClassLoader();
if (applicationParameter == null) {