Memory work.

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@9252 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/spark/filetransfer/ChatRoomTransferDecorator.java

@@ -0,0 +1,153 @@
+/**
+ * $Revision: $
+ * $Date: $
+ *
+ * Copyright (C) 2006 Jive Software. All rights reserved.
+ *
+ * This software is published under the terms of the GNU Lesser Public License (LGPL),
+ * a copy of which is included in this distribution.
+ */
+
+package org.jivesoftware.spark.filetransfer;
+
+import org.jivesoftware.resource.Res;
+import org.jivesoftware.resource.SparkRes;
+import org.jivesoftware.spark.SparkManager;
+import org.jivesoftware.spark.ui.ChatRoom;
+import org.jivesoftware.spark.ui.ChatRoomButton;
+import org.jivesoftware.spark.ui.ChatRoomClosingListener;
+import org.jivesoftware.spark.ui.FileDropListener;
+import org.jivesoftware.spark.ui.rooms.ChatRoomImpl;
+import org.jivesoftware.spark.util.SwingWorker;
+import org.jivesoftware.spark.util.log.Log;
+
+import java.awt.Component;
+import java.awt.FileDialog;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.io.File;
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Enables encapsulation of transfer capabilities within a ChatRoom.
+ */
+public class ChatRoomTransferDecorator implements KeyListener, FileDropListener, ChatRoomClosingListener, ActionListener {
+
+    private ChatRoom chatRoom;
+    private ChatRoomButton sendFileButton;
+    private ChatRoomButton sendScreenShotButton;
+
+    public ChatRoomTransferDecorator(final ChatRoom chatRoom) {
+        this.chatRoom = chatRoom;
+
+        chatRoom.addFileDropListener(this);
+        chatRoom.getChatInputEditor().addKeyListener(this);
+        chatRoom.addClosingListener(this);
+
+
+        sendFileButton = new ChatRoomButton("", SparkRes.getImageIcon(SparkRes.SEND_FILE_24x24));
+        sendFileButton.setToolTipText(Res.getString("message.send.file.to.user"));
+
+        chatRoom.getToolBar().addChatRoomButton(sendFileButton);
+
+        sendScreenShotButton = new ChatRoomButton("", SparkRes.getImageIcon(SparkRes.PHOTO_IMAGE));
+        sendScreenShotButton.setToolTipText(Res.getString("message.send.picture"));
+        chatRoom.getToolBar().addChatRoomButton(sendScreenShotButton);
+
+        sendFileButton.addActionListener(this);
+        sendScreenShotButton.addActionListener(this);
+    }
+
+    public void keyTyped(KeyEvent e) {
+    }
+
+    public void keyPressed(KeyEvent ke) {
+        if (ke.getKeyCode() == KeyEvent.VK_V) {
+            int i = ke.getModifiers();
+            if ((i & InputEvent.CTRL_MASK) == InputEvent.CTRL_MASK) {
+                Clipboard clb = Toolkit.getDefaultToolkit().getSystemClipboard();
+                Transferable contents = clb.getContents(ke.getSource());
+                if (contents != null && contents.getTransferDataFlavors().length == 1) {
+                    if (contents.isDataFlavorSupported(DataFlavor.imageFlavor)) {
+                        SparkManager.getTransferManager().sendImage(SparkTransferManager.getClipboard(), chatRoom);
+                    }
+                }
+            }
+        }
+    }
+
+    public void keyReleased(KeyEvent e) {
+    }
+
+    public void filesDropped(Collection files, Component component) {
+        if (component instanceof ChatRoomImpl) {
+            ChatRoomImpl roomImpl = (ChatRoomImpl)component;
+
+
+            Iterator iter = files.iterator();
+            while (iter.hasNext()) {
+                SparkManager.getTransferManager().sendFile((File)iter.next(), roomImpl.getParticipantJID());
+            }
+
+            SparkManager.getChatManager().getChatContainer().activateChatRoom(roomImpl);
+        }
+    }
+
+
+    public void actionPerformed(ActionEvent e) {
+        if (e.getSource() == sendScreenShotButton) {
+            SparkManager.getTransferManager().sendScreenshot(sendScreenShotButton, chatRoom);
+        }
+        else {
+            showFilePicker();
+        }
+    }
+
+    private void showFilePicker() {
+        SwingWorker worker = new SwingWorker() {
+            public Object construct() {
+                try {
+                    Thread.sleep(10);
+                }
+                catch (InterruptedException e1) {
+                    Log.error(e1);
+                }
+                return true;
+            }
+
+            public void finished() {
+                FileDialog fileChooser = SparkManager.getTransferManager().getFileChooser(SparkManager.getChatManager().getChatContainer().getChatFrame(), Res.getString("title.select.file.to.send"));
+                fileChooser.show();
+
+                if (fileChooser.getDirectory() == null || fileChooser.getFile() == null) {
+                    return;
+                }
+
+                File file = new File(fileChooser.getDirectory(), fileChooser.getFile());
+
+                if (file.exists()) {
+                    SparkManager.getTransferManager().setDefaultDirectory(file.getParentFile());
+                    SparkManager.getTransferManager().sendFile(file, ((ChatRoomImpl)chatRoom).getParticipantJID());
+                }
+
+            }
+        };
+        worker.start();
+    }
+
+    public void closing() {
+        chatRoom.removeFileDropListener(this);
+        chatRoom.getChatInputEditor().removeKeyListener(this);
+        chatRoom.removeClosingListener(this);
+        sendFileButton.removeActionListener(this);
+        sendScreenShotButton.removeActionListener(this);
+    }
+}

src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java

@@ -34,7 +34,6 @@ import org.jivesoftware.spark.component.RolloverButton;
 import org.jivesoftware.spark.filetransfer.preferences.FileTransferPreference;
 import org.jivesoftware.spark.preference.PreferenceManager;
 import org.jivesoftware.spark.ui.ChatFrame;
-import org.jivesoftware.spark.ui.ChatInputEditor;
 import org.jivesoftware.spark.ui.ChatRoom;
 import org.jivesoftware.spark.ui.ChatRoomButton;
 import org.jivesoftware.spark.ui.ChatRoomClosingListener;
@@ -54,18 +53,6 @@ import org.jivesoftware.sparkimpl.plugin.filetransfer.transfer.ui.ReceiveMessage
 import org.jivesoftware.sparkimpl.plugin.filetransfer.transfer.ui.SendMessage;
 import org.jivesoftware.sparkimpl.plugin.manager.Enterprise;
 
-import javax.imageio.ImageIO;
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Style;
-import javax.swing.text.StyleConstants;
-import javax.swing.text.StyledDocument;
-
 import java.awt.AWTException;
 import java.awt.Component;
 import java.awt.Cursor;
@@ -76,13 +63,11 @@ import java.awt.GraphicsEnvironment;
 import java.awt.Rectangle;
 import java.awt.Robot;
 import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
@@ -97,6 +82,18 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import javax.imageio.ImageIO;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Style;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyledDocument;
+
 /**
  * Responsible for the handling of File Transfer within Spark. You would use the SparkManager
  * for sending of images, files, multiple files and adding your own transfer listeners for plugin work.
@@ -299,8 +296,6 @@ public class SparkTransferManager {
 
 
     public void sendFileTo(ContactItem item) {
-        final ContactList contactList = SparkManager.getWorkspace().getContactList();
-
         FileDialog fileChooser = getFileChooser(SparkManager.getMainWindow(), Res.getString("title.select.file.to.send"));
         fileChooser.show();
 
@@ -321,113 +316,24 @@ public class SparkTransferManager {
         final ChatManager chatManager = SparkManager.getChatManager();
         chatManager.addChatRoomListener(new ChatRoomListenerAdapter() {
 
-            FileDropListener fileDropListener;
-
             public void chatRoomOpened(final ChatRoom room) {
                 if (!(room instanceof ChatRoomImpl)) {
                     return;
                 }
 
-
+                // Otherwise,
-                final ChatInputEditor chatSendField = room.getChatInputEditor();
+                new ChatRoomTransferDecorator(room);
-                chatSendField.addKeyListener(new KeyAdapter() {
-                    public void keyPressed(KeyEvent ke) {
-                        if (ke.getKeyCode() == KeyEvent.VK_V) {
-                            int i = ke.getModifiers();
-                            if ((i & InputEvent.CTRL_MASK) == InputEvent.CTRL_MASK) {
-                                Clipboard clb = Toolkit.getDefaultToolkit().getSystemClipboard();
-                                Transferable contents = clb.getContents(ke.getSource());
-                                if (contents != null && contents.getTransferDataFlavors().length == 1) {
-                                    if (contents.isDataFlavorSupported(DataFlavor.imageFlavor)) {
-                                        sendImage(getClipboard(), room);
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                });
-
-                fileDropListener = new FileDropListener() {
-                    public void filesDropped(Collection files, Component component) {
-                        if (component instanceof ChatRoomImpl) {
-                            ChatRoomImpl roomImpl = (ChatRoomImpl)component;
-
-
-                            Iterator iter = files.iterator();
-                            while (iter.hasNext()) {
-                                sendFile((File)iter.next(), roomImpl.getParticipantJID());
-                            }
-
-                            SparkManager.getChatManager().getChatContainer().activateChatRoom(roomImpl);
-                        }
-                    }
-                };
-
-                room.addFileDropListener(fileDropListener);
-
-
-                ChatRoomButton sendFileButton = new ChatRoomButton("", SparkRes.getImageIcon(SparkRes.SEND_FILE_24x24));
-                sendFileButton.setToolTipText(Res.getString("message.send.file.to.user"));
-
-                room.getToolBar().addChatRoomButton(sendFileButton);
-
-                final ChatRoomButton sendScreenShotButton = new ChatRoomButton("", SparkRes.getImageIcon(SparkRes.PHOTO_IMAGE));
-                sendScreenShotButton.setToolTipText(Res.getString("message.send.picture"));
-                room.getToolBar().addChatRoomButton(sendScreenShotButton);
-
-                sendScreenShotButton.addActionListener(new ActionListener() {
-                    public void actionPerformed(ActionEvent actionEvent) {
-                        sendScreenshot(sendScreenShotButton, room);
-                    }
-                });
-
-                sendFileButton.addActionListener(new ActionListener() {
-                    public void actionPerformed(ActionEvent e) {
-                        SwingWorker worker = new SwingWorker() {
-                            public Object construct() {
-                                try {
-                                    Thread.sleep(10);
-                                }
-                                catch (InterruptedException e1) {
-                                    Log.error(e1);
-                                }
-                                return true;
-                            }
-
-                            public void finished() {
-                                ChatRoomImpl chatRoom = (ChatRoomImpl)room;
-
-                                FileDialog fileChooser = getFileChooser(SparkManager.getChatManager().getChatContainer().getChatFrame(), Res.getString("title.select.file.to.send"));
-                                fileChooser.show();
-
-                                if (fileChooser.getDirectory() == null || fileChooser.getFile() == null) {
-                                    return;
-                                }
-
-                                File file = new File(fileChooser.getDirectory(), fileChooser.getFile());
-
-                                if (file.exists()) {
-                                    defaultDirectory = file.getParentFile();
-                                    sendFile(file, chatRoom.getParticipantJID());
-                                }
-
-                            }
-                        };
-                        worker.start();
-                    }
-                });
             }
 
             public void chatRoomClosed(ChatRoom room) {
-                room.removeFileDropListener(fileDropListener);
+
             }
         });
 
 
     }
 
-    private void sendScreenshot(final ChatRoomButton button, final ChatRoom room) {
+    public void sendScreenshot(final ChatRoomButton button, final ChatRoom room) {
         button.setEnabled(false);
 
         final MainWindow mainWindow = SparkManager.getMainWindow();
@@ -777,7 +683,22 @@ public class SparkTransferManager {
         return false;
     }
 
-    private FileDialog getFileChooser(Frame parent, String title) {
+    /**
+     * Sets the current default directory to store files.
+     *
+     * @param directory the default directory.
+     */
+    public void setDefaultDirectory(File directory) {
+        defaultDirectory = directory;
+    }
+
+    /**
+     * Return the File Chooser to user.
+     * @param parent the parent component.
+     * @param title the title.
+     * @return the FileChooser. (Native Widget)
+     */
+    public FileDialog getFileChooser(Frame parent, String title) {
         FileDialog dialog = new FileDialog(parent, title, FileDialog.LOAD);
         return dialog;
     }