Correct license location

3 files changed, 3 insertions, 20 deletions

diff --git a/server/src/main/java/com/vaadin/navigator/Navigator.java b/server/src/main/java/com/vaadin/navigator/Navigator.java
index 58f74e79f7..96660d80a2 100644
--- a/server/src/main/java/com/vaadin/navigator/Navigator.java
+++ b/server/src/main/java/com/vaadin/navigator/Navigator.java
@@ -15,22 +15,6 @@
  */
 package com.vaadin.navigator;
 
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/server/src/test/java/ClassInDefaultPackage.java b/server/src/test/java/ClassInDefaultPackage.java
index 3ec67a05c1..6d1ff33748 100644
--- a/server/src/test/java/ClassInDefaultPackage.java
+++ b/server/src/test/java/ClassInDefaultPackage.java
@@ -1,5 +1,3 @@
-import org.junit.Ignore;
-
 /*
  * Copyright 2000-2016 Vaadin Ltd.
  *
@@ -16,6 +14,8 @@ import org.junit.Ignore;
  * the License.
  */
 
+import org.junit.Ignore;
+
 /**
  *
  * This class is test data. Don't delete it.
diff --git a/server/src/test/java/com/vaadin/server/JSONSerializerTest.java b/server/src/test/java/com/vaadin/server/JSONSerializerTest.java
index bd60f8f6aa..ec5ba8bfc8 100644
--- a/server/src/test/java/com/vaadin/server/JSONSerializerTest.java
+++ b/server/src/test/java/com/vaadin/server/JSONSerializerTest.java
@@ -1,5 +1,3 @@
-package com.vaadin.server;
-
 /*
  * Copyright 2000-2016 Vaadin Ltd.
  *
@@ -15,6 +13,7 @@ package com.vaadin.server;
  * License for the specific language governing permissions and limitations under
  * the License.
  */
+package com.vaadin.server;
 
 import java.lang.reflect.Type;
 import java.util.Collection;