UI Upgrade

Projet_POO/src/ui/ListUI.java

@@ -100,7 +100,7 @@ public class ListUI extends JFrame implements Runnable{
 			}
 		});
 		// Bouton Rename (suite)
-		renameButton.setBounds(97, 207, 89, 23);
+		renameButton.setBounds(335, 227, 89, 23);
 		contentPane.add(renameButton);
 		
 		// Bouton Connect
@@ -111,6 +111,43 @@ public class ListUI extends JFrame implements Runnable{
 				int row = table.getSelectedRow();
 				int col = table.getSelectedColumn();
 				
+				connect(row, col);
+				
+			}
+		});
+		// Buton Connect (suite)
+		connectButton.setBounds(156, 192, 89, 23);
+		contentPane.add(connectButton);
+		
+		// idLabel
+		JLabel idLabel = new JLabel("ID : " + GestionnaireNom.instance().getId() );
+		idLabel.setBounds(10, 202, 78, 23);
+		contentPane.add(idLabel);
+		
+		// nameLabel
+		JLabel nameLabel = new JLabel("Username : " + GestionnaireNom.instance().getNom() );
+		nameLabel.setBounds(10, 227, 119, 23);
+		contentPane.add(nameLabel);
+	}
+	
+	
+	
+	/**
+	 * Méthode
+	 */
+	
+	// à améliorer ... (suppression ?)
+	public void ajouterNomListe(DefaultTableModel dtm, ArrayList<String> liste) {
+		for (String t : liste) {
+			if (!t.equals(GestionnaireNom.instance().getNom())) {
+				dtm.addRow(new Object[] {t});
+			}
+		}
+		
+	}
+	
+	// Lance une communication avce l'Utilisateur voulu
+	public void connect(int row, int col) {
 		try{
 			String nom = (String) table.getValueAt(row, col);
 			
@@ -120,24 +157,5 @@ public class ListUI extends JFrame implements Runnable{
 			}
 			catch (Exception e) {}
 		
-			}
-		});
-		// Buton Connect (suite)
-		connectButton.setBounds(261, 207, 89, 23);
-		contentPane.add(connectButton);
-	}
-	
-	
-	
-	/**
-	 * Méthode
-	 */
-	
-	// à améliorer ... (suppression ?)
-	public void ajouterNomListe(DefaultTableModel dtm, ArrayList<String> test) {
-		for (String t : test) {
-			dtm.addRow(new Object[] {t});
-		}
-		
 	}
 }

Projet_POO/src/ui/NomUI.java

@@ -83,6 +83,40 @@ public class NomUI extends JFrame implements Runnable{
 				if (e.getExtendedKeyCode() == KeyEvent.VK_ENTER) {
 					String nom = usernameField.getText();
 					
+					nommer(nom);
+				}
+				
+			}
+		});
+		usernameField.addFocusListener(new FocusAdapter() { //Focus
+			@Override
+			public void focusGained(FocusEvent e) {
+				String s = usernameField.getText();
+				if ( s.equals("Username") ) {
+					usernameField.setText("");
+				}
+			}
+		});
+		// UsernameField (suite)
+		usernameField.setText("Username");
+		usernameField.setBounds(109, 90, 206, 54);
+		contentPane.add(usernameField);
+		usernameField.setColumns(10);
+		
+		// nameLabel
+		nameLabel = new JLabel("Choose a username");
+		nameLabel.setBounds(109, 149, 206, 31);
+		contentPane.add(nameLabel);
+	}
+
+	
+	
+	/**
+	 * Méthode
+	 */
+	
+	// On choisit son Username
+	private void nommer(String nom) {
 		// Si l'on se renomme on peut annuler en entrant rien ou Reprendre le même Username
 		if( (GestionnaireNom.instance().getNom() != null) && (nom.isBlank() || nom.toLowerCase().equals(GestionnaireNom.instance().getNom().toLowerCase()) ) ) {
 			dispose();
@@ -111,28 +145,7 @@ public class NomUI extends JFrame implements Runnable{
 				nameLabel.setText("Username already taken");
 			}
 		}
-				}
 		
 	}
-		});
-		usernameField.addFocusListener(new FocusAdapter() { //Focus
-			@Override
-			public void focusGained(FocusEvent e) {
-				String s = usernameField.getText();
-				if ( s.equals("Username") ) {
-					usernameField.setText("");
-				}
-			}
-		});
-		// UsernameField (suite)
-		usernameField.setText("Username");
-		usernameField.setBounds(109, 90, 206, 54);
-		contentPane.add(usernameField);
-		usernameField.setColumns(10);
 	
-		// nameLabel
-		nameLabel = new JLabel("Choose a username");
-		nameLabel.setBounds(109, 149, 206, 31);
-		contentPane.add(nameLabel);
-	}
 }