Skip to content

Commit

Permalink
Merge pull request #13 from josue-lubaki/main
Browse files Browse the repository at this point in the history
add authors
  • Loading branch information
josue-lubaki authored Dec 1, 2021
2 parents d13771d + d8df3cf commit 245f811
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions src/server/Server.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

import javax.swing.*;

/**
* @author Josue Lubaki & Ismael Coulibaly
* @version 1.0
*/
public class Server {
public static void main(String[] args) {
try {
Expand All @@ -13,10 +17,11 @@ public static void main(String[] args) {
break;
}
}
} catch (ClassNotFoundException | UnsupportedLookAndFeelException | IllegalAccessException | InstantiationException ex) {
} catch (ClassNotFoundException | UnsupportedLookAndFeelException | IllegalAccessException
| InstantiationException ex) {
java.util.logging.Logger.getLogger(Server.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
}
//</editor-fold>
// </editor-fold>

/* Create and display the form */
java.awt.EventQueue.invokeLater(() -> new serverForm().setVisible(true));
Expand Down
4 changes: 4 additions & 0 deletions src/server/handlers/ClientHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
import server.utility.Command;
import static server.utility.utils.*;

/**
* @author Josue Lubaki & Ismael Coulibaly
* @version 1.0
*/
public class ClientHandler implements Runnable {

private Socket clientSocket;
Expand Down
4 changes: 4 additions & 0 deletions src/server/handlers/ServerStart.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
import server.models.User;
import static server.ui.serverForm.*;

/**
* @author Josue Lubaki & Ismael Coulibaly
* @version 1.0
*/
public class ServerStart implements Runnable {

public static HashMap<User, PrintWriter> onlineUsers;
Expand Down
4 changes: 4 additions & 0 deletions src/server/models/Paquet.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package server.models;

/**
* @author Josue Lubaki & Ismael Coulibaly
* @version 1.0
*/
public class Paquet {
private User user;
private String message;
Expand Down
4 changes: 4 additions & 0 deletions src/server/models/User.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package server.models;

/**
* @author Josue Lubaki & Ismael Coulibaly
* @version 1.0
*/
public class User {

private String username;
Expand Down
12 changes: 6 additions & 6 deletions src/server/ui/serverForm.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import server.utility.Command;

/**
*
* @author coulibai
* @author Josue Lubaki & Ismael Coulibaly
* @version 1.0
*/
public class serverForm extends javax.swing.JFrame {

Expand All @@ -32,14 +32,14 @@ public serverForm() {
}

// <editor-fold defaultstate="collapsed" desc="Generated
// Code">
// Code">
private void initComponents() {

javax.swing.JDesktopPane jDesktopPane1 = new javax.swing.JDesktopPane();
/*
* @param args the command line arguments
*/
// Variables declaration - do not modify
// Variables declaration - do not modify
javax.swing.JLabel lblServer = new javax.swing.JLabel();
btnStart = new javax.swing.JButton();
btnRefresh = new javax.swing.JButton();
Expand Down Expand Up @@ -175,7 +175,7 @@ private void initComponents() {

pack();
setLocationRelativeTo(null);
}// </editor-fold>
}// </editor-fold>

protected void btnRefreshActionPerformed(ActionEvent e) {
setIconImage(new ImageIcon("src/resources/images/server-down.png").getImage());
Expand Down Expand Up @@ -236,5 +236,5 @@ protected void jButton2ActionPerformed(ActionEvent e) {
public static javax.swing.JButton btnRefresh;
public static javax.swing.JButton btnClear;
public static javax.swing.JTextArea taConsole;
// End of variables declaration
// End of variables declaration
}
4 changes: 4 additions & 0 deletions src/server/utility/Command.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package server.utility;

/**
* @author Josue Lubaki & Ismael Coulibaly
* @version 1.0
*/
public final class Command {
public static final String LIST = "list";
public static final String CHAT = "chat";
Expand Down
4 changes: 4 additions & 0 deletions src/server/utility/utils.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package server.utility;

/**
* @author Josue Lubaki & Ismael Coulibaly
* @version 1.0
*/
public class utils {

// Methode qui permet de mettre le mot en capitalize (premiere lettre en
Expand Down

0 comments on commit 245f811

Please sign in to comment.