svn commit: r3321 - trunk/src/net/java/sip/communicator/plugin/whiteboard/gui: . whiteboardshapes

damencho at dev.java.net damencho at dev.java.net
Wed Dec 19 22:23:57 CET 2007


Author: damencho
Date: 2007-12-19 21:23:56+0000
New Revision: 3321

Modified:
   trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
   trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java

Log:
Fix importing images in whiteboard sessions.

Modified: trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java?view=diff&rev=3321&p1=trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java&p2=trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java&r1=3320&r2=3321
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java	(original)
+++ trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java	2007-12-19 21:23:56+0000
@@ -971,7 +971,7 @@
             }
         });
 
-//        toolBar.add(imageButton);
+        toolBar.add(imageButton);
 
         buttonGroup.add(polygonButton);
         polygonButton.setToolTipText(Resources.getString("polygon"));

Modified: trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java?view=diff&rev=3321&p1=trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java&p2=trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java&r1=3320&r2=3321
==============================================================================
--- trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java	(original)
+++ trunk/src/net/java/sip/communicator/plugin/whiteboard/gui/whiteboardshapes/WhiteboardShapeImage.java	2007-12-19 21:23:56+0000
@@ -78,9 +78,9 @@
         this.whiteboardPoint = p;
         this.width = width;
         this.height = height;
-        ImageIcon ii = new ImageIcon (bytes);
+        this.bytes = Base64.decode(bytes);
+        ImageIcon ii = new ImageIcon (this.bytes);
         this.image = ii.getImage ();
-        this.bytes = bytes;
 
         this.recalculateSelectionPoints();
     }
@@ -302,9 +302,9 @@
      * displayed as the object background.
      */
     public void setBackgroundImage (byte[] background)
-    {
-        this.bytes = background;
-        ImageIcon ii = new ImageIcon (bytes);
+    {       
+        this.bytes = Base64.decode(background);
+        ImageIcon ii = new ImageIcon (this.bytes);
         this.image = ii.getImage ();
     }
     

---------------------------------------------------------------------
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