[sip-comm-cvs] CVS update: /sip-communicator/src/net/java/sip/communicator/impl/gui/main/chatroomslist/

emcho at dev.java.net emcho at dev.java.net
Mon Apr 23 20:55:20 CEST 2007


User: emcho   
Date: 2007-04-23 18:55:20+0000
Modified:
   sip-communicator/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomsList.java
   sip-communicator/src/net/java/sip/communicator/impl/gui/main/chatroomslist/JoinChannelDialog.java

Log:
 updated according to last changes in multi chatting

File Changes:

Directory: /sip-communicator/src/net/java/sip/communicator/impl/gui/main/chatroomslist/
=======================================================================================

File [changed]: ChatRoomsList.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomsList.java?r1=1.2&r2=1.3
Delta lines:  +36 -29
---------------------
--- ChatRoomsList.java	2007-04-20 14:18:19+0000	1.2
+++ ChatRoomsList.java	2007-04-23 18:55:18+0000	1.3
@@ -84,12 +84,19 @@
             }
             
         }
+        catch (OperationNotSupportedException ex)
+        {
+            logger.error(
+                "Failed to obtain existing chat rooms for the following server: "
+                + pps.getAccountID().getService(), ex);
+        }
         catch (OperationFailedException ex)
         {
             logger.error(
                 "Failed to obtain existing chat rooms for the following server: "
                 + pps.getAccountID().getService(), ex);
         }
+
     }
     
 

File [changed]: JoinChannelDialog.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/impl/gui/main/chatroomslist/JoinChannelDialog.java?r1=1.2&r2=1.3
Delta lines:  +57 -37
---------------------
--- JoinChannelDialog.java	2007-04-20 14:27:25+0000	1.2
+++ JoinChannelDialog.java	2007-04-23 18:55:18+0000	1.3
@@ -1,3 +1,9 @@
+/*
+ * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
 package net.java.sip.communicator.impl.gui.main.chatroomslist;
 
 import java.awt.*;
@@ -9,11 +15,15 @@
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.util.*;
 
 public class JoinChannelDialog
     extends SIPCommDialog
     implements ActionListener
 {
+    private static final Logger logger
+        = Logger.getLogger(JoinChannelDialog.class);
+
     private JPanel mainPanel = new JPanel(new BorderLayout(5, 5));
     
     private JPanel buttonsPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
@@ -99,7 +109,17 @@
             
             String chatRoomName = channelTextField.getText();
             
-            ChatRoom chatRoom = multiChatOpSet.findRoom(chatRoomName);
+            ChatRoom chatRoom = null;
+            try
+            {
+                chatRoom = multiChatOpSet.findRoom(chatRoomName);
+            }
+            catch (Exception ex)
+            {
+                /** @todo handle exceptions being thrown here. */
+                logger.error("Failed to find room " + chatRoomName
+                             , ex);
+            }
             
             if(chatRoom != null)
             {




---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe at sip-communicator.dev.java.net
For additional commands, e-mail: cvs-help at sip-communicator.dev.java.net





More information about the commits mailing list