From 4ee9cc6fc96c33d5bbd8f7a0851940212f433ef4 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Mon, 22 May 2006 15:14:11 +0000
Subject: [PATCH] "escape on a non - empty message window should trigger a
 warning" - Done.

---
 .../impl/gui/main/i18n/messages.properties    |  1 +
 .../impl/gui/main/message/ChatWindow.java     | 24 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/gui/main/i18n/messages.properties b/src/net/java/sip/communicator/impl/gui/main/i18n/messages.properties
index 382cd0b1f..8f6ab2a82 100644
--- a/src/net/java/sip/communicator/impl/gui/main/i18n/messages.properties
+++ b/src/net/java/sip/communicator/impl/gui/main/i18n/messages.properties
@@ -52,6 +52,7 @@ multipleLogins=You have logged in more than once with the same account. ? accoun
 networkFailure=Network failure
 next=Next
 no=No
+nonEmptyChatWindowClose=You're trying to close a non empty chat. Are you sure you want to close this chat?
 nonExistingUserId=The ? server does not recognize specified user id.
 notifications=Notifications
 passwd=Password:
diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java
index 62ad5d994..c32eba322 100755
--- a/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java
@@ -20,11 +20,13 @@
 import javax.swing.InputMap;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
+import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 
 import net.java.sip.communicator.impl.gui.main.MainFrame;
 import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommTabbedPane;
 import net.java.sip.communicator.impl.gui.main.customcontrols.events.CloseListener;
+import net.java.sip.communicator.impl.gui.main.i18n.Messages;
 import net.java.sip.communicator.impl.gui.utils.Constants;
 import net.java.sip.communicator.impl.gui.utils.ImageLoader;
 import net.java.sip.communicator.service.contactlist.MetaContact;
@@ -135,13 +137,21 @@ private void enableKeyActions(){
         {
             public void actionPerformed(ActionEvent e)
             {
-                if(chatTabbedPane.getTabCount() > 1){
-                    removeContactTab(chatTabbedPane.getSelectedIndex());
-                }
-                else{
-                    ChatWindow.this.dispose();
-                    mainFrame.getTabbedPane().getContactListPanel()
-                    		.setTabbedChatWindow(null);
+                int answer = JOptionPane.showConfirmDialog(ChatWindow.this,
+                                Messages.getString("nonEmptyChatWindowClose"),
+                                Messages.getString("warning"),
+                                JOptionPane.OK_CANCEL_OPTION,
+                                JOptionPane.WARNING_MESSAGE);
+                
+                if(answer == JOptionPane.YES_OPTION){
+                    if(chatTabbedPane.getTabCount() > 1){
+                        removeContactTab(chatTabbedPane.getSelectedIndex());
+                    }
+                    else{
+                        ChatWindow.this.dispose();
+                        mainFrame.getTabbedPane().getContactListPanel()
+                        		.setTabbedChatWindow(null);
+                    }
                 }
             }
         };