ToshuuMilia
/
OneClickLearning
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc: Changes for Java 9

master
Gregory Martin 2018-02-03 09:53:36 +01:00
parent e78b5b2c9b
commit 4dd096ae6f
No known key found for this signature in database
GPG Key ID: 8791DD65FA92D9F0
12 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -24,14 +24,6 @@
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.8.1</version> <version>2.8.1</version>
</dependency> </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> <dependency>
<groupId>org.jetbrains</groupId> <groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId> <artifactId>annotations</artifactId>
@ -61,8 +53,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.8</source> <source>1.9</source>
<target>1.8</target> <target>1.9</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

2
src/main/java/fr/insa/ocm/model/utils/fastforward/condition/Condition.java
View File

@ -2,7 +2,7 @@ package fr.insa.ocm.model.utils.fastforward.condition;
import com.google.gson.annotations.Expose; 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 fr.insa.ocm.model.wrapper.api.Pattern;
import java.util.List; import java.util.List;

4
src/main/java/fr/insa/ocm/model/utils/fastforward/condition/ConditionAlgorithm.java
View File

@ -1,8 +1,8 @@
package fr.insa.ocm.model.utils.fastforward.condition; package fr.insa.ocm.model.utils.fastforward.condition;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import com.sun.istack.internal.NotNull; import org.jetbrains.annotations.NotNull;
import com.sun.istack.internal.Nullable; import org.jetbrains.annotations.Nullable;
import fr.insa.ocm.model.utils.fastforward.condition.Condition; import fr.insa.ocm.model.utils.fastforward.condition.Condition;
import fr.insa.ocm.model.wrapper.api.Pattern; import fr.insa.ocm.model.wrapper.api.Pattern;

2
src/main/java/fr/insa/ocm/model/utils/fastforward/condition/ConditionMeasureDynamic.java
View File

@ -1,7 +1,7 @@
package fr.insa.ocm.model.utils.fastforward.condition; package fr.insa.ocm.model.utils.fastforward.condition;
import com.google.gson.annotations.Expose; 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.utils.fastforward.condition.Condition;
import fr.insa.ocm.model.wrapper.api.Pattern; import fr.insa.ocm.model.wrapper.api.Pattern;

2
src/main/java/fr/insa/ocm/model/utils/serialize/OCMDeserializer.java
View File

@ -1,7 +1,7 @@
package fr.insa.ocm.model.utils.serialize; package fr.insa.ocm.model.utils.serialize;
import com.google.gson.*; 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.DebugLogger;
import fr.insa.ocm.model.OCMManager; import fr.insa.ocm.model.OCMManager;
import fr.insa.ocm.model.oneclicklearning.bandit.CesaBianciBandit; import fr.insa.ocm.model.oneclicklearning.bandit.CesaBianciBandit;

2
src/main/java/fr/insa/ocm/model/utils/serialize/OCMSerializer.java
View File

@ -2,7 +2,7 @@ package fr.insa.ocm.model.utils.serialize;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.sun.istack.internal.NotNull; import org.jetbrains.annotations.NotNull;
import fr.insa.ocm.model.OCMManager; import fr.insa.ocm.model.OCMManager;
import java.io.BufferedWriter; import java.io.BufferedWriter;

2
src/main/java/fr/insa/ocm/model/wrapper/realkd/CSVLoaderRealKD.java
View File

@ -1,6 +1,6 @@
package fr.insa.ocm.model.wrapper.realkd; 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.DataFormatException;
import de.unibonn.realkd.data.table.DataTable; import de.unibonn.realkd.data.table.DataTable;
import de.unibonn.realkd.data.table.DataTableFromCSVFileBuilder; import de.unibonn.realkd.data.table.DataTableFromCSVFileBuilder;

2
src/main/java/fr/insa/ocm/model/wrapper/spmf/CSVLoaderSPMF.java
View File

@ -1,7 +1,7 @@
package fr.insa.ocm.model.wrapper.spmf; package fr.insa.ocm.model.wrapper.spmf;
import com.sun.istack.internal.NotNull; import org.jetbrains.annotations.NotNull;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;

2
src/main/java/fr/insa/ocm/view/mainuis/FastForwardView.java
View File

@ -1,6 +1,6 @@
package fr.insa.ocm.view.mainuis; 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.DebugLogger;
import fr.insa.ocm.model.utils.serialize.condition.ConditionsDeserializer; import fr.insa.ocm.model.utils.serialize.condition.ConditionsDeserializer;
import fr.insa.ocm.model.utils.serialize.condition.ConditionsSerializer; import fr.insa.ocm.model.utils.serialize.condition.ConditionsSerializer;

2
src/main/java/fr/insa/ocm/view/mainuis/MiningView.java
View File

@ -1,6 +1,6 @@
package fr.insa.ocm.view.mainuis; 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.OCMManager;
import fr.insa.ocm.model.wrapper.api.Pattern; import fr.insa.ocm.model.wrapper.api.Pattern;
import fr.insa.ocm.view.misc.parts.mining.PatternView; import fr.insa.ocm.view.misc.parts.mining.PatternView;

2
src/main/java/fr/insa/ocm/view/misc/InfoView.java
View File

@ -1,6 +1,6 @@
package fr.insa.ocm.view.misc; package fr.insa.ocm.view.misc;
import com.sun.istack.internal.NotNull; import org.jetbrains.annotations.NotNull;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.Scene; import javafx.scene.Scene;

2
src/main/java/fr/insa/ocm/view/misc/parts/mining/PatternView.java
View File

@ -1,6 +1,6 @@
package fr.insa.ocm.view.misc.parts.mining; 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.DebugLogger;
import fr.insa.ocm.model.OCMManager; import fr.insa.ocm.model.OCMManager;
import fr.insa.ocm.model.utils.Vector; import fr.insa.ocm.model.utils.Vector;