From 4dd096ae6fe5e56dc9716a17a31510baeecc675d Mon Sep 17 00:00:00 2001
From: Gregory Martin <gregory.martin@urao.fr>
Date: Sat, 3 Feb 2018 09:53:36 +0100
Subject: [PATCH] Misc: Changes for Java 9

---
 pom.xml                                              | 12 ++----------
 .../model/utils/fastforward/condition/Condition.java |  2 +-
 .../fastforward/condition/ConditionAlgorithm.java    |  4 ++--
 .../condition/ConditionMeasureDynamic.java           |  2 +-
 .../ocm/model/utils/serialize/OCMDeserializer.java   |  2 +-
 .../ocm/model/utils/serialize/OCMSerializer.java     |  2 +-
 .../ocm/model/wrapper/realkd/CSVLoaderRealKD.java    |  2 +-
 .../insa/ocm/model/wrapper/spmf/CSVLoaderSPMF.java   |  2 +-
 .../fr/insa/ocm/view/mainuis/FastForwardView.java    |  2 +-
 .../java/fr/insa/ocm/view/mainuis/MiningView.java    |  2 +-
 src/main/java/fr/insa/ocm/view/misc/InfoView.java    |  2 +-
 .../insa/ocm/view/misc/parts/mining/PatternView.java |  2 +-
 12 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5daf78f..6b15845 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,14 +24,6 @@
 			<artifactId>gson</artifactId>
 			<version>2.8.1</version>
 		</dependency>
-		<dependency>
-			<!-- JavaFX -->
-			<groupId>com.oracle</groupId>
-			<artifactId>javafx</artifactId>
-			<version>8</version>
-			<systemPath>${java.home}/lib/ext/jfxrt.jar</systemPath>
-			<scope>system</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.jetbrains</groupId>
 			<artifactId>annotations</artifactId>
@@ -61,8 +53,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>1.9</source>
+					<target>1.9</target>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/Condition.java b/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/Condition.java
index 502f17a..3ea7bf4 100644
--- a/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/Condition.java
+++ b/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/Condition.java
@@ -2,7 +2,7 @@ package fr.insa.ocm.model.utils.fastforward.condition;
 
 
 import com.google.gson.annotations.Expose;
-import com.sun.istack.internal.NotNull;
+import org.jetbrains.annotations.NotNull;
 import fr.insa.ocm.model.wrapper.api.Pattern;
 
 import java.util.List;
diff --git a/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/ConditionAlgorithm.java b/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/ConditionAlgorithm.java
index 149a08a..6cb56d1 100644
--- a/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/ConditionAlgorithm.java
+++ b/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/ConditionAlgorithm.java
@@ -1,8 +1,8 @@
 package fr.insa.ocm.model.utils.fastforward.condition;
 
 import com.google.gson.annotations.Expose;
-import com.sun.istack.internal.NotNull;
-import com.sun.istack.internal.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import fr.insa.ocm.model.utils.fastforward.condition.Condition;
 import fr.insa.ocm.model.wrapper.api.Pattern;
 
diff --git a/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/ConditionMeasureDynamic.java b/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/ConditionMeasureDynamic.java
index 1e8b113..88fe41d 100644
--- a/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/ConditionMeasureDynamic.java
+++ b/src/main/java/fr/insa/ocm/model/utils/fastforward/condition/ConditionMeasureDynamic.java
@@ -1,7 +1,7 @@
 package fr.insa.ocm.model.utils.fastforward.condition;
 
 import com.google.gson.annotations.Expose;
-import com.sun.istack.internal.NotNull;
+import org.jetbrains.annotations.NotNull;
 import fr.insa.ocm.model.utils.fastforward.condition.Condition;
 import fr.insa.ocm.model.wrapper.api.Pattern;
 
diff --git a/src/main/java/fr/insa/ocm/model/utils/serialize/OCMDeserializer.java b/src/main/java/fr/insa/ocm/model/utils/serialize/OCMDeserializer.java
index 757a2c4..020bd13 100644
--- a/src/main/java/fr/insa/ocm/model/utils/serialize/OCMDeserializer.java
+++ b/src/main/java/fr/insa/ocm/model/utils/serialize/OCMDeserializer.java
@@ -1,7 +1,7 @@
 package fr.insa.ocm.model.utils.serialize;
 
 import com.google.gson.*;
-import com.sun.istack.internal.NotNull;
+import org.jetbrains.annotations.NotNull;
 import fr.insa.ocm.model.DebugLogger;
 import fr.insa.ocm.model.OCMManager;
 import fr.insa.ocm.model.oneclicklearning.bandit.CesaBianciBandit;
diff --git a/src/main/java/fr/insa/ocm/model/utils/serialize/OCMSerializer.java b/src/main/java/fr/insa/ocm/model/utils/serialize/OCMSerializer.java
index 898d8f7..e8f7c34 100644
--- a/src/main/java/fr/insa/ocm/model/utils/serialize/OCMSerializer.java
+++ b/src/main/java/fr/insa/ocm/model/utils/serialize/OCMSerializer.java
@@ -2,7 +2,7 @@ package fr.insa.ocm.model.utils.serialize;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.sun.istack.internal.NotNull;
+import org.jetbrains.annotations.NotNull;
 import fr.insa.ocm.model.OCMManager;
 
 import java.io.BufferedWriter;
diff --git a/src/main/java/fr/insa/ocm/model/wrapper/realkd/CSVLoaderRealKD.java b/src/main/java/fr/insa/ocm/model/wrapper/realkd/CSVLoaderRealKD.java
index c8a9ab4..db47cb7 100644
--- a/src/main/java/fr/insa/ocm/model/wrapper/realkd/CSVLoaderRealKD.java
+++ b/src/main/java/fr/insa/ocm/model/wrapper/realkd/CSVLoaderRealKD.java
@@ -1,6 +1,6 @@
 package fr.insa.ocm.model.wrapper.realkd;
 
-import com.sun.istack.internal.NotNull;
+import org.jetbrains.annotations.NotNull;
 import de.unibonn.realkd.data.table.DataFormatException;
 import de.unibonn.realkd.data.table.DataTable;
 import de.unibonn.realkd.data.table.DataTableFromCSVFileBuilder;
diff --git a/src/main/java/fr/insa/ocm/model/wrapper/spmf/CSVLoaderSPMF.java b/src/main/java/fr/insa/ocm/model/wrapper/spmf/CSVLoaderSPMF.java
index 4499fb0..14edd85 100644
--- a/src/main/java/fr/insa/ocm/model/wrapper/spmf/CSVLoaderSPMF.java
+++ b/src/main/java/fr/insa/ocm/model/wrapper/spmf/CSVLoaderSPMF.java
@@ -1,7 +1,7 @@
 package fr.insa.ocm.model.wrapper.spmf;
 
 
-import com.sun.istack.internal.NotNull;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
 import java.util.ArrayList;
diff --git a/src/main/java/fr/insa/ocm/view/mainuis/FastForwardView.java b/src/main/java/fr/insa/ocm/view/mainuis/FastForwardView.java
index 4c064d0..5ca6d42 100644
--- a/src/main/java/fr/insa/ocm/view/mainuis/FastForwardView.java
+++ b/src/main/java/fr/insa/ocm/view/mainuis/FastForwardView.java
@@ -1,6 +1,6 @@
 package fr.insa.ocm.view.mainuis;
 
-import com.sun.istack.internal.NotNull;
+import org.jetbrains.annotations.NotNull;
 import fr.insa.ocm.model.DebugLogger;
 import fr.insa.ocm.model.utils.serialize.condition.ConditionsDeserializer;
 import fr.insa.ocm.model.utils.serialize.condition.ConditionsSerializer;
diff --git a/src/main/java/fr/insa/ocm/view/mainuis/MiningView.java b/src/main/java/fr/insa/ocm/view/mainuis/MiningView.java
index fd5936f..9b2fb47 100644
--- a/src/main/java/fr/insa/ocm/view/mainuis/MiningView.java
+++ b/src/main/java/fr/insa/ocm/view/mainuis/MiningView.java
@@ -1,6 +1,6 @@
 package fr.insa.ocm.view.mainuis;
 
-import com.sun.istack.internal.NotNull;
+import org.jetbrains.annotations.NotNull;
 import fr.insa.ocm.model.OCMManager;
 import fr.insa.ocm.model.wrapper.api.Pattern;
 import fr.insa.ocm.view.misc.parts.mining.PatternView;
diff --git a/src/main/java/fr/insa/ocm/view/misc/InfoView.java b/src/main/java/fr/insa/ocm/view/misc/InfoView.java
index d552b38..ce551f2 100644
--- a/src/main/java/fr/insa/ocm/view/misc/InfoView.java
+++ b/src/main/java/fr/insa/ocm/view/misc/InfoView.java
@@ -1,6 +1,6 @@
 package fr.insa.ocm.view.misc;
 
-import com.sun.istack.internal.NotNull;
+import org.jetbrains.annotations.NotNull;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/mining/PatternView.java b/src/main/java/fr/insa/ocm/view/misc/parts/mining/PatternView.java
index f697fa7..24e4d4e 100644
--- a/src/main/java/fr/insa/ocm/view/misc/parts/mining/PatternView.java
+++ b/src/main/java/fr/insa/ocm/view/misc/parts/mining/PatternView.java
@@ -1,6 +1,6 @@
 package fr.insa.ocm.view.misc.parts.mining;
 
-import com.sun.istack.internal.NotNull;
+import org.jetbrains.annotations.NotNull;
 import fr.insa.ocm.model.DebugLogger;
 import fr.insa.ocm.model.OCMManager;
 import fr.insa.ocm.model.utils.Vector;