diff --git a/src/java/org/jivesoftware/spark/component/browser/BrowserListener.java b/src/java/org/jivesoftware/spark/component/browser/BrowserListener.java
index 75edc5d6..042da7b9 100644
--- a/src/java/org/jivesoftware/spark/component/browser/BrowserListener.java
+++ b/src/java/org/jivesoftware/spark/component/browser/BrowserListener.java
@@ -15,7 +15,7 @@ package org.jivesoftware.spark.component.browser;
* Implementation of BrowserListener allows for handling when documents
* have been downloaded via a BrowserViewer implementation.
*
- * @authro Derek DeMoro
+ * @author Derek DeMoro
*/
public interface BrowserListener {
diff --git a/src/java/org/jivesoftware/spark/component/panes/CollapsiblePane.java b/src/java/org/jivesoftware/spark/component/panes/CollapsiblePane.java
index 5e3d827b..4615732a 100644
--- a/src/java/org/jivesoftware/spark/component/panes/CollapsiblePane.java
+++ b/src/java/org/jivesoftware/spark/component/panes/CollapsiblePane.java
@@ -12,11 +12,6 @@ package org.jivesoftware.spark.component.panes;
import org.jivesoftware.spark.util.ModelUtil;
-import javax.swing.Icon;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.event.MouseAdapter;
@@ -25,6 +20,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+
/**
* CollapsiblePane provides a component which can collapse or expand its content area
* with animation and fade in/fade out effects. It also acts as a standard container for
@@ -64,15 +62,23 @@ public class CollapsiblePane extends JPanel {
});
}
+ /**
+ * Creates a CollapsiblePane.
+ * @param title the title to use.
+ */
public CollapsiblePane(String title) {
this();
setTitle(title);
}
+ /**
+ * Set the title of the Collapsible Pane.
+ * @param title the collapsible pane title.
+ */
public void setTitle(String title) {
titlePane.setTitle(title);
}
-
+
public void setIcon(Icon icon) {
titlePane.setIcon(icon);
}
@@ -133,22 +139,4 @@ public class CollapsiblePane extends JPanel {
titlePane.setSubPane(subPane);
}
-
- public static void main(String args[]) {
- JFrame frame = new JFrame();
-
-
- CollapsiblePane pane = new CollapsiblePane();
- pane.setTitle("Jive Software");
- pane.setSubPane(true);
-
- pane.setContentPane(new JButton("HELLO"));
-
- frame.add(pane);
- frame.pack();
- frame.setVisible(true);
-
- }
-
-
}
diff --git a/src/java/org/jivesoftware/spark/component/tabbedPane/SparkTab.java b/src/java/org/jivesoftware/spark/component/tabbedPane/SparkTab.java
index f7dba17e..1d5f1981 100644
--- a/src/java/org/jivesoftware/spark/component/tabbedPane/SparkTab.java
+++ b/src/java/org/jivesoftware/spark/component/tabbedPane/SparkTab.java
@@ -10,10 +10,6 @@
package org.jivesoftware.spark.component.tabbedPane;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-
import java.awt.Color;
import java.awt.Component;
import java.awt.Font;
@@ -21,8 +17,14 @@ import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+
/**
+ * Represent one tab in a SparkTabbedPane.
*
+ * @author Derek DeMoro
*/
public class SparkTab extends TabPanel {
private JLabel iconLabel;
diff --git a/src/java/org/jivesoftware/spark/component/tabbedPane/SparkTabbedPane.java b/src/java/org/jivesoftware/spark/component/tabbedPane/SparkTabbedPane.java
index 0e93c0c8..7122e7ad 100644
--- a/src/java/org/jivesoftware/spark/component/tabbedPane/SparkTabbedPane.java
+++ b/src/java/org/jivesoftware/spark/component/tabbedPane/SparkTabbedPane.java
@@ -39,7 +39,9 @@ import javax.swing.JPanel;
import javax.swing.JTabbedPane;
/**
+ * Jive Software imlementation of a TabbedPane.
*
+ * @author Derek DeMoro
*/
public class SparkTabbedPane extends JPanel implements MouseListener {
private JPanel tabs;
diff --git a/src/java/org/jivesoftware/spark/filetransfer/FileTransferListener.java b/src/java/org/jivesoftware/spark/filetransfer/FileTransferListener.java
index ff925243..ac04bc81 100644
--- a/src/java/org/jivesoftware/spark/filetransfer/FileTransferListener.java
+++ b/src/java/org/jivesoftware/spark/filetransfer/FileTransferListener.java
@@ -15,6 +15,8 @@ import org.jivesoftware.smackx.filetransfer.FileTransferRequest;
/**
* Implementation of the TransferListener interface allows for
* handling of file transfers externally of the default behaviour.
+ *
+ * @author Derek DeMoro
*/
public interface FileTransferListener {
diff --git a/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java b/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
index 5b6c1aa9..490329e2 100644
--- a/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
+++ b/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
@@ -12,6 +12,7 @@ package org.jivesoftware.spark.filetransfer;
import org.jivesoftware.Spark;
import org.jivesoftware.resource.SparkRes;
+import org.jivesoftware.resource.Res;
import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.Roster;
import org.jivesoftware.smack.XMPPException;
@@ -91,6 +92,8 @@ import java.util.Map;
/**
* 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.
+ *
+ * @author Derek DeMoro
*/
public class SparkTransferManager {
@@ -133,9 +136,9 @@ public class SparkTransferManager {
PreferenceManager prefManager = SparkManager.getPreferenceManager();
prefManager.addPreference(new FileTransferPreference());
- final JMenu actionsMenu = SparkManager.getMainWindow().getMenuByName("Actions");
+ final JMenu actionsMenu = SparkManager.getMainWindow().getMenuByName(Res.getString("menuitem.actions"));
JMenuItem downloadsMenu = new JMenuItem("", SparkRes.getImageIcon(SparkRes.DOWNLOAD_16x16));
- ResourceUtils.resButton(downloadsMenu, "&View Downloads");
+ ResourceUtils.resButton(downloadsMenu, Res.getString("menuitem.view.downloads"));
actionsMenu.add(downloadsMenu);
downloadsMenu.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -192,7 +195,7 @@ public class SparkTransferManager {
JPanel commandPanel = statusBar.getCommandPanel();
RolloverButton viewDownloads = new RolloverButton(SparkRes.getImageIcon(SparkRes.DOWNLOAD_16x16));
- viewDownloads.setToolTipText("View Downloads");
+ viewDownloads.setToolTipText(Res.getString("menuitem.view.downloads"));
commandPanel.add(viewDownloads);
viewDownloads.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -256,7 +259,7 @@ public class SparkTransferManager {
public void sendFileTo(ContactItem item) {
final ContactList contactList = SparkManager.getWorkspace().getContactList();
- getFileChooser().setDialogTitle("Select the file to send");
+ getFileChooser().setDialogTitle(Res.getString("title.select.file.to.send"));
int ok = getFileChooser().showOpenDialog(contactList);
if (ok != JFileChooser.APPROVE_OPTION) {
return;
@@ -327,12 +330,12 @@ public class SparkTransferManager {
ChatRoomButton sendFileButton = new ChatRoomButton("", SparkRes.getImageIcon(SparkRes.SEND_FILE_24x24));
- sendFileButton.setToolTipText("Send file(s) to this user");
+ 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("Send a picture of your desktop");
+ sendScreenShotButton.setToolTipText(Res.getString("message.send.picture"));
room.getToolBar().addChatRoomButton(sendScreenShotButton);
sendScreenShotButton.addActionListener(new ActionListener() {
@@ -351,13 +354,13 @@ public class SparkTransferManager {
catch (InterruptedException e1) {
Log.error(e1);
}
- return "delay";
+ return true;
}
public void finished() {
ChatRoomImpl roomImpl = (ChatRoomImpl)room;
- getFileChooser().setDialogTitle("Select File(s) to send");
+ getFileChooser().setDialogTitle(Res.getString("title.select.file.to.send"));
getFileChooser().setMultiSelectionEnabled(true);
int ok = getFileChooser().showOpenDialog(roomImpl);
if (ok != JFileChooser.APPROVE_OPTION) {
@@ -446,7 +449,7 @@ public class SparkTransferManager {
if (room != null) {
Message message = new Message();
- message.setBody("You have just been sent offline file(s).");
+ message.setBody(Res.getString("message.sent.offline.files"));
room.sendMessage(message);
}
}
diff --git a/src/resources/i18n/spark_i18n_en.properties b/src/resources/i18n/spark_i18n_en.properties
index a059afd8..1e99c6d6 100644
--- a/src/resources/i18n/spark_i18n_en.properties
+++ b/src/resources/i18n/spark_i18n_en.properties
@@ -54,7 +54,9 @@ message.locked.workstation = User has locked their workstation.
message.away.idle = Away due to idle.
message.default.error = An error has been detected. Please report to support@jivesoftware.com.
message.new.message = New message from {0}.
-
+message.send.file.to.user = Send files to this user.
+message.send.picture = Send a picture of your desktop.
+message.sent.offline.files = You have just been sent offline file(s).
title.passwords.no.match = Confirm passwords.
title.create.problem = Account Creation Problem
@@ -71,6 +73,7 @@ title.spark.preferences = Spark Preferences
title.alert = Alert
title.broadcast.message = Broadcast Message
title.tray.information = Tray Information
+title.select.file.to.send = Select File(s) To Send
menuitem.contacts = Contacts
menuitem.actions = Actions
@@ -87,7 +90,7 @@ menuitem.online.help = Online Help
menuitem.open = Open
menuitem.hide = Hide
menuitem.status = Status
-
+menuitem.view.downloads = View Downloads
tab.general = General
tab.proxy = Proxy
@@ -99,13 +102,6 @@ group.connection = Connection
# TO DO
-# org.jivesoftware.spark
-# org.jivesoftware.spark.component
-# org.jivesoftware.spark.component.borders
-# org.jivesoftware.spark.comopnent.browser
-# org.jivesoftware.spark.component.panes
-# org.jivesoftware.spark.component.renderer
-# org.jivesoftware.spark.component.tabbedpane
# org.jivesoftware.spark.filetransfer
# org.jivesoftware.spark.filetransfer.preferences
# org.jivesoftware.spark.plugin