svn commit: r3286 - trunk/src/net/java/sip/communicator/plugin/whiteboard

yanas at dev.java.net yanas at dev.java.net
Tue Dec 4 16:23:29 CET 2007


Author: yanas
Date: 2007-12-04 15:23:28+0000
New Revision: 3286

Modified:
   trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardActivator.java
   trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java
   trunk/src/net/java/sip/communicator/plugin/whiteboard/resources.properties

Log:
some bugs fixed in the whiteboard plugin

Modified: trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardActivator.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardActivator.java?view=diff&rev=3286&p1=trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardActivator.java&p2=trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardActivator.java&r1=3285&r2=3286
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardActivator.java	(original)
+++ trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardActivator.java	2007-12-04 15:23:28+0000
@@ -101,6 +101,9 @@
                         + e);
         }
 
+        if (serRefs == null)
+            return null;
+
         for (int i = 0; i < serRefs.length; i++)
         {
             ProtocolProviderService protocolProvider

Modified: trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java?view=diff&rev=3286&p1=trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java&p2=trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java&r1=3285&r2=3286
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java	(original)
+++ trunk/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java	2007-12-04 15:23:28+0000
@@ -53,6 +53,10 @@
 
     public WhiteboardSessionManager()
     {
+        if (WhiteboardActivator
+            .getWhiteboardOperationSets() == null)
+            return;
+
         Iterator opSets = WhiteboardActivator
             .getWhiteboardOperationSets().iterator();
 
@@ -649,6 +653,7 @@
                 if (frame == null)
                     return;
 
+                wbFrames.remove(frame);
                 frame.dispose();
                 whiteboardSession.removeWhiteboardObjectListener(
                     WhiteboardSessionManager.this);
@@ -665,4 +670,17 @@
             }
         }
     }
+
+    /**
+     * Removes a white board frame.
+     * 
+     * @param frame the frame to remove
+     */
+    public void removeWhiteboardWindow(WhiteboardFrame frame)
+    {
+        synchronized (wbFrames)
+        {
+            wbFrames.remove(frame);
+        }
+    }
 }
\ No newline at end of file

Modified: trunk/src/net/java/sip/communicator/plugin/whiteboard/resources.properties
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/whiteboard/resources.properties?view=diff&rev=3286&p1=trunk/src/net/java/sip/communicator/plugin/whiteboard/resources.properties&p2=trunk/src/net/java/sip/communicator/plugin/whiteboard/resources.properties&r1=3285&r2=3286
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/whiteboard/resources.properties	(original)
+++ trunk/src/net/java/sip/communicator/plugin/whiteboard/resources.properties	2007-12-04 15:23:28+0000
@@ -34,6 +34,11 @@
 invitationReceivedFormInfo={0} has invited you to join {1} whiteboard. You could accept, reject or ignore this invitation.
 invitation=Invitation text
 whiteboardTitle=Whiteboard [Beta]
+cancel=Cancel
+yes=Yes
+no=No
+doNotAskAgain=Do not ask me again.
+closeSessionQuestion=Would you like to end current session ? If you choose "yes" the current session will be ended, otherwise only your whiteboard window will be closed.
 file=File
 draw=Draw
 new=New

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





More information about the commits mailing list