diff --git a/WEB-INF/classes/controleurs/LogIn.class b/WEB-INF/classes/controleurs/LogIn.class deleted file mode 100644 index 34640d678d8193a8897e67c83cc4c46a74de2d6e..0000000000000000000000000000000000000000 Binary files a/WEB-INF/classes/controleurs/LogIn.class and /dev/null differ diff --git a/WEB-INF/classes/controleurs/SignIn.class b/WEB-INF/classes/controleurs/SignIn.class deleted file mode 100644 index e16cbbf9fbeb27d5267ec8a60b6203278cf024ee..0000000000000000000000000000000000000000 Binary files a/WEB-INF/classes/controleurs/SignIn.class and /dev/null differ diff --git a/WEB-INF/classes/dao/BDConnection.class b/WEB-INF/classes/dao/BDConnection.class deleted file mode 100644 index 6b3325e1ced614f09b6a9275af2cad4b7b997aa2..0000000000000000000000000000000000000000 Binary files a/WEB-INF/classes/dao/BDConnection.class and /dev/null differ diff --git a/WEB-INF/classes/dao/ThreadDAO.class b/WEB-INF/classes/dao/ThreadDAO.class deleted file mode 100644 index c71c8b8c8e913c4c238bde9189f4a9c65af2ed44..0000000000000000000000000000000000000000 Binary files a/WEB-INF/classes/dao/ThreadDAO.class and /dev/null differ diff --git a/WEB-INF/classes/dao/UserDAO.class b/WEB-INF/classes/dao/UserDAO.class deleted file mode 100644 index 5f6e297b01c74494541e99ff2c295b2af0942d13..0000000000000000000000000000000000000000 Binary files a/WEB-INF/classes/dao/UserDAO.class and /dev/null differ diff --git a/WEB-INF/classes/dto/User.class b/WEB-INF/classes/dto/User.class deleted file mode 100644 index ceab80e8239ab16b9ddabd0cda7753dc1da9a3c8..0000000000000000000000000000000000000000 Binary files a/WEB-INF/classes/dto/User.class and /dev/null differ diff --git a/WEB-INF/src/dao/ThreadDAO.java b/WEB-INF/src/dao/ThreadDAO.java index 8ff8ab9f50efa6d7f54d4e3ef88af69fc249430d..ba44d27ec30f3d4d77ace34bd0a240c700768f9f 100644 --- a/WEB-INF/src/dao/ThreadDAO.java +++ b/WEB-INF/src/dao/ThreadDAO.java @@ -2,6 +2,7 @@ package dao; import dto.Message; import dto.User; +import dto.MyThread; import java.sql.*; import java.util.ArrayList; @@ -35,15 +36,15 @@ public class ThreadDAO { return messages; } - public Thread getThreadById(int threadID) throws SQLException { - Thread thread = new Thread(); + public MyThread getThreadById(int threadID) throws SQLException { + MyThread thread = new MyThread(0, null); PreparedStatement ps = this.con.prepareStatement("SELECT threadID, threadName FROM thread WHERE threadID = ?"); try { ps.setInt(1, threadID); ResultSet rs = ps.executeQuery(); if(rs.next()){ thread.setThreadID(rs.getInt(1)); - thread.setName(rs.getString(2)); + thread.setThreadName(rs.getString(2)); } } catch (SQLException sqle) { diff --git a/WEB-INF/src/dto/Thread.java b/WEB-INF/src/dto/MyThread.java similarity index 89% rename from WEB-INF/src/dto/Thread.java rename to WEB-INF/src/dto/MyThread.java index 84e2e67821c8a1fa3cddcd6efa2e4ee4037af848..73cab30615fac2783d70d0165c08809ce7d0aafa 100644 --- a/WEB-INF/src/dto/Thread.java +++ b/WEB-INF/src/dto/MyThread.java @@ -1,13 +1,13 @@ package dto; -public class Thread { +public class MyThread { private int threadID; private String threadName; // Constructor // - public Thread(int id, String name){ + public MyThread(int id, String name){ this.threadID = id; this.threadName = name; }