gallois/Clavardage
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: gallois:a168df58fbfc371277afaccc00e0fbed951b1906
Branches Tags
gallois:master
gallois:websocket
gallois:version_2(broadcast+BD)
gallois:v1
..
compare: gallois:b9a1a15dca7f9a197888edaf5538f4847cc0a64b
Branches Tags
gallois:master
gallois:websocket
gallois:version_2(broadcast+BD)
gallois:v1

No commits in common. "a168df58fbfc371277afaccc00e0fbed951b1906" and "b9a1a15dca7f9a197888edaf5538f4847cc0a64b" have entirely different histories.
a168df58fb ... b9a1a15dca

1 changed files with 13 additions and 23 deletions
Show stats Expand all files Collapse all files

36
Application/Clavardage/src/view/Interface.java
View file

@ -20,9 +20,8 @@ public class Interface extends JFrame implements ActionListener, WindowListener
public JLabel Pseudolabel; public JLabel Pseudolabel;
public JTextField PseudotextField; public JTextField PseudotextField;
public JTextArea MessagetextArea; public JLabel Messagelabel;
public JTextField MessagetextField; public JTextField MessagetextField;
public JScrollPane scrollpane;
public JButton RemoteUserButton; public JButton RemoteUserButton;
public JComboBox RemoteUserbox; public JComboBox RemoteUserbox;
@ -45,18 +44,15 @@ public class Interface extends JFrame implements ActionListener, WindowListener
} }
public Component createComponents() { public Component createComponents() {
PseudotextField = new JTextField(); //Pseudo setup
//Pseudo setup
PseudotextField = new JTextField();
PseudotextField.setColumns(10); PseudotextField.setColumns(10);
PseudotextField.addActionListener(this); PseudotextField.addActionListener(this);
Pseudolabel = new JLabel("Your current username is: " + controller.getMyUser().getPseudo()); Pseudolabel = new JLabel("Your current username is: " + controller.getMyUser().getPseudo());
Pseudolabel.setLabelFor(PseudotextField); Pseudolabel.setLabelFor(PseudotextField);
//Remote user list setup RemoteUserButton = new JButton("Click to get Remote User list"); //Remote user list setup
RemoteUserButton = new JButton("Click to get Remote User list");
RemoteUserButton.addActionListener(this); RemoteUserButton.addActionListener(this);
//Converts the Userlist to a Pseudotab for treatment in actionPerformed //Convert the Userlist to Pseudotab
String[] pseudotab = new String[controller.getMyUser().getRemoteUsersList().size()]; String[] pseudotab = new String[controller.getMyUser().getRemoteUsersList().size()];
for(int i=0; i < controller.getMyUser().getRemoteUsersList().size(); i++) { for(int i=0; i < controller.getMyUser().getRemoteUsersList().size(); i++) {
pseudotab[i] = "(" + Integer.toString(i) + "): " + controller.getMyUser().getRemoteUsersList().get(i).getPseudo(); pseudotab[i] = "(" + Integer.toString(i) + "): " + controller.getMyUser().getRemoteUsersList().get(i).getPseudo();
@ -69,17 +65,13 @@ public class Interface extends JFrame implements ActionListener, WindowListener
CloseConversationButton.addActionListener(this); CloseConversationButton.addActionListener(this);
CloseConversationButton.setVisible(false); CloseConversationButton.setVisible(false);
//Messages setup MessagetextField = new JTextField(); //Messages setup
MessagetextField = new JTextField();
MessagetextField.setColumns(10); MessagetextField.setColumns(10);
MessagetextField.addActionListener(this); MessagetextField.addActionListener(this);
MessagetextArea = new JTextArea("Message field: "); Messagelabel = new JLabel("Message field: ");
scrollpane = new JScrollPane(); Messagelabel.setLabelFor(MessagetextField);
scrollpane.getViewport().add(MessagetextArea);
scrollpane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
MessagetextField.setVisible(false); MessagetextField.setVisible(false);
MessagetextArea.setVisible(false); Messagelabel.setVisible(false);
scrollpane.setVisible(false);
/* /*
* An easy way to put space between a top-level container * An easy way to put space between a top-level container
@ -91,7 +83,7 @@ public class Interface extends JFrame implements ActionListener, WindowListener
pane.add(PseudotextField); pane.add(PseudotextField);
pane.add(RemoteUserButton); pane.add(RemoteUserButton);
pane.add(RemoteUserbox); pane.add(RemoteUserbox);
pane.add(scrollpane); pane.add(Messagelabel);
pane.add(MessagetextField); pane.add(MessagetextField);
pane.add(CloseConversationButton); pane.add(CloseConversationButton);
pane.setBorder(BorderFactory.createEmptyBorder( pane.setBorder(BorderFactory.createEmptyBorder(
@ -117,7 +109,7 @@ public class Interface extends JFrame implements ActionListener, WindowListener
} }
}else if(e.getSource() == MessagetextField){ //Messages }else if(e.getSource() == MessagetextField){ //Messages
String Textinput = MessagetextField.getText(); String Textinput = MessagetextField.getText();
MessagetextArea.setText(MessagetextArea.getText() + controller.getMyUser().getPseudo() + ": " + Textinput + "\n"); Messagelabel.setText(Messagelabel.getText()+"<br>test" + Textinput);
MessagetextField.setText(""); MessagetextField.setText("");
controller.askToSend(Textinput); // ask to send to controller controller.askToSend(Textinput); // ask to send to controller
@ -125,8 +117,7 @@ public class Interface extends JFrame implements ActionListener, WindowListener
RemoteUserbox.setVisible(true); RemoteUserbox.setVisible(true);
}else if(e.getSource() == CloseConversationButton) { }else if(e.getSource() == CloseConversationButton) {
controller.askCloseSession(); controller.askCloseSession();
MessagetextArea.setVisible(false); Messagelabel.setVisible(false);
scrollpane.setVisible(false);
MessagetextField.setVisible(false); MessagetextField.setVisible(false);
CloseConversationButton.setVisible(false); CloseConversationButton.setVisible(false);
}else { // Choice in remote user list }else { // Choice in remote user list
@ -137,10 +128,9 @@ public class Interface extends JFrame implements ActionListener, WindowListener
// start or switch chat => get history // start or switch chat => get history
String history = controller.askOpenSession(selectedUsernb); String history = controller.askOpenSession(selectedUsernb);
// display it // display it
MessagetextArea.setText("Message:"+history); Messagelabel.setText("Message:<br>"+history);
MessagetextField.setVisible(true); MessagetextField.setVisible(true);
scrollpane.setVisible(true); Messagelabel.setVisible(true);
MessagetextArea.setVisible(true);
CloseConversationButton.setVisible(true); CloseConversationButton.setVisible(true);
} }
} }