diff --git a/chat/pom.xml b/chat/pom.xml index c771398..01c19d0 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -64,6 +64,12 @@ sqlite-jdbc 3.48.0.0 + + org.slf4j + slf4j-api + 2.0.16 + + diff --git a/chat/src/main/java/module-info.java b/chat/src/main/java/module-info.java index 4fb2698..ce8c6ff 100644 --- a/chat/src/main/java/module-info.java +++ b/chat/src/main/java/module-info.java @@ -7,6 +7,7 @@ module rtgre.chat { requires net.synedra.validatorfx; requires org.json; requires java.sql; + requires org.xerial.sqlitejdbc; opens rtgre.chat to javafx.fxml; diff --git a/chat/src/main/java/rtgre/ChatLauncher.java b/chat/src/main/java/rtgre/ChatLauncher.java index c22c2aa..a3b515d 100644 --- a/chat/src/main/java/rtgre/ChatLauncher.java +++ b/chat/src/main/java/rtgre/ChatLauncher.java @@ -18,6 +18,8 @@ public class ChatLauncher { ChatApplication.main(args); } } catch (Exception e) { + System.out.println(e.getMessage()); + e.printStackTrace(); System.out.println("test2"); ChatApplication.main(args); } diff --git a/chat/src/main/java/rtgre/chat/ChatApplication.java b/chat/src/main/java/rtgre/chat/ChatApplication.java index 9007559..ec92f49 100644 --- a/chat/src/main/java/rtgre/chat/ChatApplication.java +++ b/chat/src/main/java/rtgre/chat/ChatApplication.java @@ -25,7 +25,7 @@ public class ChatApplication extends Application { InputStream is = ChatApplication.class .getResource("logging.properties").openStream(); LogManager.getLogManager().readConfiguration(is); - if (!Files.exists(new File("chat/target/").toPath())) { + if (!Files.exists(new File("target/").toPath())) { Files.createDirectory(new File("target").toPath()); } } catch (Exception e) { diff --git a/chat/src/main/java/rtgre/chat/ChatController.java b/chat/src/main/java/rtgre/chat/ChatController.java index 830772f..3de0de4 100644 --- a/chat/src/main/java/rtgre/chat/ChatController.java +++ b/chat/src/main/java/rtgre/chat/ChatController.java @@ -91,6 +91,7 @@ public class ChatController implements Initializable { try { InputStream in = ChatController.class.getResourceAsStream("config.properties"); + System.out.println(ChatController.class.getResource("config.properties").getPath()); properties.load(in); if (contact != null) { this.contact.setAvatar(Contact.base64ToImage(properties.getProperty("avatar"))); @@ -241,6 +242,7 @@ public class ChatController implements Initializable { } properties.setProperty("avatar", Contact.imageToBase64(ImageIO.read(selectedFile))); properties.store(new FileOutputStream(getClass().getResource("config.properties").getPath()), null); + } } catch (IOException e) { LOGGER.warning("Impossible de lire l'image!"); diff --git a/chat/src/main/java/rtgre/modeles/DatabaseApi.java b/chat/src/main/java/rtgre/modeles/DatabaseApi.java index f93b5a9..0fd4ca6 100644 --- a/chat/src/main/java/rtgre/modeles/DatabaseApi.java +++ b/chat/src/main/java/rtgre/modeles/DatabaseApi.java @@ -4,6 +4,7 @@ import javax.xml.transform.Result; import java.io.File; import java.sql.*; import java.util.UUID; +import org.sqlite.JDBC; import static rtgre.chat.ChatApplication.LOGGER; @@ -13,7 +14,7 @@ public class DatabaseApi { public DatabaseApi() { try { - this.con = DriverManager.getConnection("jdbc:sqlite:chat/src/main/resources/rtgre/chat/dbase.db"); + this.con = DriverManager.getConnection("jdbc:sqlite:target/dbase.db"); this.stmt = con.createStatement(); initDB(con); LOGGER.info("Database connected!"); diff --git a/chat/src/main/java/rtgre/server/ChatServer.java b/chat/src/main/java/rtgre/server/ChatServer.java index 8f60be9..230b249 100644 --- a/chat/src/main/java/rtgre/server/ChatServer.java +++ b/chat/src/main/java/rtgre/server/ChatServer.java @@ -41,6 +41,11 @@ public class ChatServer { public static void main(String[] args) throws IOException { + try { + Class.forName("org.sqlite.JDBC"); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } ChatServer server = new ChatServer(2024); //daisyConnect(); server.acceptClients(); diff --git a/chat/src/main/resources/rtgre/chat/logging.properties b/chat/src/main/resources/rtgre/chat/logging.properties index c772ac3..94b3bdf 100644 --- a/chat/src/main/resources/rtgre/chat/logging.properties +++ b/chat/src/main/resources/rtgre/chat/logging.properties @@ -9,7 +9,7 @@ handlers=java.util.logging.ConsoleHandler, java.util.logging.FileHandler java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter # Nom du fichier de logs -java.util.logging.FileHandler.pattern=chat/target/java%u.log +java.util.logging.FileHandler.pattern=target/java%u.log # Format de logs plus compact sur 1 seule ligne java.util.logging.SimpleFormatter.format=%1$tF %1$tT.%1$tL | %4$-7s | %2$s | %5$s %6$s%n