upgrade Java 8 (to continue)

lesfurets · Oct 1, 2015 · 31df05b · 31df05b
1 parent 1f3da53
commit 31df05b
Show file tree

Hide file tree

Showing 29 changed files with 792 additions and 843 deletions.
diff --git a/mdl4ui-base/pom.xml b/mdl4ui-base/pom.xml
@@ -1,55 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.mdl4ui</groupId>
-		<artifactId>mdl4ui-root</artifactId>
-		<version>0.1-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.mdl4ui</groupId>
-	<artifactId>mdl4ui-base</artifactId>
-	<name>mdl4ui-base</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.mdl4ui</groupId>
-			<artifactId>mdl4ui-i18n</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava-gwt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**/**.java</include>
-					<include>**/*.gwt.xml</include>
-				</includes>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>${project.build.directory}/generated-resources/apt</directory>
-				<includes>
-					<include>META-INF/services/*</include>
-				</includes>
-			</resource>
-		</resources>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.mdl4ui</groupId>
+    <artifactId>mdl4ui-root</artifactId>
+    <version>0.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.mdl4ui</groupId>
+  <artifactId>mdl4ui-base</artifactId>
+  <name>mdl4ui-base</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.mdl4ui</groupId>
+      <artifactId>mdl4ui-i18n</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava-gwt</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>**/**.java</include>
+          <include>**/*.gwt.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>${project.build.directory}/generated-resources/apt</directory>
+        <includes>
+          <include>META-INF/services/*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
 </project>
diff --git a/mdl4ui-base/src/main/java/org/mdl4ui/base/apt/FieldHelpProcessor.java b/mdl4ui-base/src/main/java/org/mdl4ui/base/apt/FieldHelpProcessor.java
@@ -3,17 +3,13 @@
  */
 package org.mdl4ui.base.apt;
 
-import static javax.lang.model.SourceVersion.RELEASE_6;
-
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
 
 import org.mdl4ui.base.injection.InjectHelp;
 
 @SupportedAnnotationTypes(value = "org.mdl4ui.base.injection.InjectHelp")
-@SupportedSourceVersion(RELEASE_6)
 public class FieldHelpProcessor extends FieldMessageProcessor {
 
     @Override

diff --git a/mdl4ui-base/src/main/java/org/mdl4ui/base/apt/FieldLabelProcessor.java b/mdl4ui-base/src/main/java/org/mdl4ui/base/apt/FieldLabelProcessor.java
@@ -3,17 +3,13 @@
  */
 package org.mdl4ui.base.apt;
 
-import static javax.lang.model.SourceVersion.RELEASE_6;
-
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
 
 import org.mdl4ui.base.injection.InjectLabel;
 
 @SupportedAnnotationTypes(value = "org.mdl4ui.base.injection.InjectLabel")
-@SupportedSourceVersion(RELEASE_6)
 public class FieldLabelProcessor extends FieldMessageProcessor {
 
     @Override

diff --git a/mdl4ui-base/src/main/java/org/mdl4ui/base/apt/FieldMessageProcessor.java b/mdl4ui-base/src/main/java/org/mdl4ui/base/apt/FieldMessageProcessor.java
@@ -4,7 +4,6 @@
 package org.mdl4ui.base.apt;
 
 import static java.text.DateFormat.SHORT;
-import static javax.lang.model.SourceVersion.RELEASE_6;
 import static javax.lang.model.element.ElementKind.ANNOTATION_TYPE;
 import static javax.lang.model.element.ElementKind.METHOD;
 
@@ -22,7 +21,6 @@
 
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
@@ -44,7 +42,6 @@
 import com.google.common.collect.Multimap;
 
 @SupportedAnnotationTypes(value = "org.mdl4ui.base.injection.InjectLabel")
-@SupportedSourceVersion(RELEASE_6)
 public abstract class FieldMessageProcessor extends FieldProcessor {
 
     @Override

diff --git a/mdl4ui-base/src/main/java/org/mdl4ui/base/apt/FieldPlaceholderProcessor.java b/mdl4ui-base/src/main/java/org/mdl4ui/base/apt/FieldPlaceholderProcessor.java
@@ -3,17 +3,13 @@
  */
 package org.mdl4ui.base.apt;
 
-import static javax.lang.model.SourceVersion.RELEASE_6;
-
 import java.lang.annotation.Annotation;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
 
 import org.mdl4ui.base.injection.InjectPlaceholder;
 
 @SupportedAnnotationTypes(value = "org.mdl4ui.base.injection.InjectPlaceholder")
-@SupportedSourceVersion(RELEASE_6)
 public class FieldPlaceholderProcessor extends FieldMessageProcessor {
 
     @Override