mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-08-18 02:56:24 +00:00
Code Issues Projects Releases Wiki Activity

ConferenceRoomBrowser: refactor invoke() to get rid of the JOptionPane

Browse Source
This commit is contained in:
Sergey Ponomarev
2026-08-17 21:10:35 +03:00
parent 6b9469e97e
commit 23d983a298
1 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomBrowser.java
View File

@ -475,38 +475,25 @@ public class ConferenceRoomBrowser extends JPanel implements ActionListener, Com
final JPanel mainPanel = new JPanel();
mainPanel.setLayout(new BorderLayout());
mainPanel.add(titlePanel, NORTH);
// Add this content panel
mainPanel.add(this, CENTER);
// The user should only be able to close this dialog.
Object[] options = {Res.getString("close")};
final JOptionPane pane = new JOptionPane(this, JOptionPane.PLAIN_MESSAGE,
JOptionPane.OK_CANCEL_OPTION, null, options, options[0]);
mainPanel.add(pane, CENTER);
final JOptionPane p = new JOptionPane();
// Add close button panel
JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
JButton closeButton = new JButton(Res.getString("close"));
closeButton.addActionListener(e -> dlg.dispose());
buttonPanel.add(closeButton);
mainPanel.add(buttonPanel, SOUTH);
dlg = p.createDialog(SparkManager.getMainWindow(),
dlg = new JDialog(SparkManager.getMainWindow(),
Res.getString("title.browse.room.service", serviceName));
dlg.setModal(false);
dlg.addComponentListener(this);
dlg.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dlg.setResizable(true);
dlg.setContentPane(mainPanel);
dlg.setLocationRelativeTo(SparkManager.getMainWindow());
PropertyChangeListener changeListener = new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent e) {
String value = (String) pane.getValue();
if (Res.getString("close").equals(value)) {
pane.removePropertyChangeListener(this);
dlg.dispose();
} else if (Res.getString("close").equals(value)) {
pane.setValue(JOptionPane.UNINITIALIZED_VALUE);
}
}
};
pane.addPropertyChangeListener(changeListener);
dlg.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {