Author: nextgens
Date: 2007-03-03 22:19:45 +0000 (Sat, 03 Mar 2007)
New Revision: 11948
Modified:
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java
trunk/apps/Thaw/src/thaw/gui/JDragTree.java
trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
trunk/apps/Thaw/src/thaw/plugins/LogConsole.java
trunk/apps/Thaw/src/thaw/plugins/index/DatabaseManager.java
trunk/apps/Thaw/src/thaw/plugins/index/File.java
trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexProgressBar.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexTreeNode.java
trunk/apps/Thaw/src/thaw/plugins/index/Link.java
trunk/apps/Thaw/src/thaw/plugins/index/LinkManagementHelper.java
trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
trunk/apps/Thaw/src/thaw/plugins/index/SearchBar.java
trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java
trunk/apps/Thaw/src/thaw/plugins/index/Tables.java
trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
Log:
Thaw: remove unused imports
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2007-03-03 19:19:41 UTC (rev
11947)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2007-03-03 22:19:45 UTC (rev
11948)
@@ -5,18 +5,8 @@
import javax.swing.JDialog;
import javax.swing.JFrame;
-import javax.swing.JLabel;
import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
import javax.swing.UIManager;
-import javax.swing.WindowConstants;
-import javax.swing.JButton;
-import java.awt.BorderLayout;
-
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-
import thaw.fcp.FCPClientHello;
import thaw.fcp.FCPConnection;
import thaw.fcp.FCPQueryManager;
@@ -501,7 +491,7 @@
public void reconnect() {
if (reconnectionManager == null) {
reconnectionManager = new ReconnectionManager();
- Thread th = new Thread(reconnectionManager);
+ final Thread th = new Thread(reconnectionManager);
th.start();
} else {
Logger.warning(this, "Already trying to reconnect !");
Modified: trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java 2007-03-03
19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java 2007-03-03
22:19:45 UTC (rev 11948)
@@ -1,6 +1,5 @@
package thaw.core;
-import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -10,12 +9,7 @@
import java.util.Vector;
import java.util.LinkedHashMap;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import javax.swing.JCheckBox;
/**
Modified: trunk/apps/Thaw/src/thaw/gui/JDragTree.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/JDragTree.java 2007-03-03 19:19:41 UTC (rev
11947)
+++ trunk/apps/Thaw/src/thaw/gui/JDragTree.java 2007-03-03 22:19:45 UTC (rev
11948)
@@ -56,7 +56,6 @@
import javax.swing.Icon;
import javax.swing.JLabel;
import javax.swing.JTree;
-import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.MutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeModel;
Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-03-03 19:19:41 UTC
(rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2007-03-03 22:19:45 UTC
(rev 11948)
@@ -1,12 +1,7 @@
package thaw.plugins;
-import java.util.Iterator;
import java.util.Vector;
-import java.awt.BorderLayout;
-import javax.swing.JPanel;
-
-import javax.swing.JButton;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -17,7 +12,6 @@
import thaw.core.Plugin;
import thaw.plugins.index.IndexBrowserPanel;
import thaw.plugins.index.IndexManagementHelper;
-import thaw.plugins.index.IndexTreeNode;
import thaw.plugins.index.DatabaseManager;
import thaw.plugins.index.IndexConfigPanel;
import thaw.plugins.index.AutoRefresh;
Modified: trunk/apps/Thaw/src/thaw/plugins/LogConsole.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/LogConsole.java 2007-03-03 19:19:41 UTC
(rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/LogConsole.java 2007-03-03 22:19:45 UTC
(rev 11948)
@@ -1,7 +1,6 @@
package thaw.plugins;
import java.awt.BorderLayout;
-import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
@@ -9,12 +8,9 @@
import javax.swing.JButton;
import javax.swing.JFileChooser;
-import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
import thaw.core.Core;
import thaw.core.FileChooser;
import thaw.core.I18n;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/DatabaseManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/DatabaseManager.java 2007-03-03
19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/DatabaseManager.java 2007-03-03
22:19:45 UTC (rev 11948)
@@ -4,7 +4,6 @@
import java.io.FileOutputStream;
import java.io.FileInputStream;
-import javax.swing.tree.DefaultMutableTreeNode;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.OutputKeys;
@@ -15,9 +14,6 @@
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
import java.util.Vector;
import java.util.Iterator;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/File.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/File.java 2007-03-03 19:19:41 UTC
(rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/File.java 2007-03-03 22:19:45 UTC
(rev 11948)
@@ -3,17 +3,11 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Types;
-import java.util.Iterator;
-import java.util.Vector;
import java.util.Observer;
import java.util.Observable;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import thaw.core.FreenetURIHelper;
import thaw.core.Logger;
import thaw.fcp.FCPClientGet;
@@ -21,7 +15,6 @@
import thaw.fcp.FCPQueueManager;
import thaw.fcp.FCPTransferQuery;
import thaw.plugins.Hsqldb;
-import thaw.plugins.insertPlugin.DefaultMIMETypes;
public class File implements Observer {
private Hsqldb db = null;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java 2007-03-03
19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java 2007-03-03
22:19:45 UTC (rev 11948)
@@ -9,7 +9,6 @@
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.Iterator;
-import java.util.Observable;
import java.util.Vector;
import java.awt.Color;
@@ -24,11 +23,7 @@
import javax.swing.event.TableModelEvent;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.JTableHeader;
-import javax.swing.tree.TreePath;
-
import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import javax.swing.event.TableModelEvent;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-03-03 19:19:41 UTC
(rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2007-03-03 22:19:45 UTC
(rev 11948)
@@ -10,14 +10,12 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
-import java.util.Iterator;
import java.util.Vector;
import java.util.Enumeration;
import java.util.Observer;
import java.util.Observable;
import javax.swing.JOptionPane;
-import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.MutableTreeNode;
import javax.swing.tree.TreeNode;
import javax.xml.parsers.DocumentBuilder;
@@ -40,7 +38,6 @@
import thaw.core.I18n;
import thaw.fcp.FCPClientGet;
import thaw.fcp.FCPClientPut;
-import thaw.fcp.FCPGenerateSSK;
import thaw.fcp.FCPQueueManager;
import thaw.fcp.FCPTransferQuery;
import thaw.plugins.Hsqldb;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2007-03-03 19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2007-03-03 22:19:45 UTC (rev 11948)
@@ -1,13 +1,8 @@
package thaw.plugins.index;
import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
import javax.swing.JPanel;
import javax.swing.JSplitPane;
-import javax.swing.tree.DefaultMutableTreeNode;
-
import thaw.core.Config;
import thaw.core.I18n;
import thaw.core.Logger;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java
2007-03-03 19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexConfigPanel.java
2007-03-03 22:19:45 UTC (rev 11948)
@@ -1,7 +1,6 @@
package thaw.plugins.index;
import javax.swing.JPanel;
-import java.awt.BorderLayout;
import java.awt.GridLayout;
import javax.swing.JLabel;
import javax.swing.JTextField;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java 2007-03-03
19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexFolder.java 2007-03-03
22:19:45 UTC (rev 11948)
@@ -1,6 +1,5 @@
package thaw.plugins.index;
-import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -9,9 +8,6 @@
import java.util.Iterator;
import java.util.Vector;
import java.util.Observer;
-import java.util.Observable;
-
-import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.MutableTreeNode;
import javax.swing.tree.TreeNode;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-03-03 19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-03-03 22:19:45 UTC (rev 11948)
@@ -31,17 +31,13 @@
import javax.swing.JTextField;
import javax.swing.tree.TreeNode;
import javax.swing.tree.MutableTreeNode;
-import javax.swing.tree.DefaultMutableTreeNode;
-
import java.sql.*;
import thaw.core.FileChooser;
import thaw.core.FreenetURIHelper;
import thaw.core.I18n;
import thaw.core.Logger;
-import thaw.core.MainWindow;
import thaw.core.Config;
-import thaw.fcp.FCPClientPut;
import thaw.fcp.FCPQueueManager;
import thaw.fcp.FCPTransferQuery;
import thaw.fcp.FCPGenerateSSK;
@@ -224,7 +220,7 @@
sskGenerator.getPublicKey(), 0, sskGenerator.getPrivateKey(),
name, false);
-
((MutableTreeNode)getTarget()).insert(((MutableTreeNode)index), 0);
+
((MutableTreeNode)getTarget()).insert((index), 0);
getIndexBrowserPanel().getIndexTree().refresh(getTarget());
@@ -594,7 +590,7 @@
st.execute();
- index = new Index(db, id, (TreeNode)parent,
+ index = new Index(db, id, parent,
publicKey, revision,
privateKey,
name, false);
@@ -608,7 +604,7 @@
if (load)
download(queueManager, indexBrowser, index);
- ((MutableTreeNode)parent).insert(((MutableTreeNode)index), 0);
+ ((MutableTreeNode)parent).insert((index), 0);
indexBrowser.getIndexTree().refresh(parent);
@@ -683,7 +679,7 @@
}
}
- ((MutableTreeNode)target).insert(((MutableTreeNode)folder), 0);
+ ((MutableTreeNode)target).insert((folder), 0);
indexBrowser.getIndexTree().refresh(target);
return folder;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexProgressBar.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexProgressBar.java
2007-03-03 19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexProgressBar.java
2007-03-03 22:19:45 UTC (rev 11948)
@@ -2,14 +2,7 @@
import javax.swing.JProgressBar;
-import java.util.Vector;
-import java.util.Iterator;
-
-import java.util.Observable;
-import java.util.Observer;
-
import thaw.core.Logger;
-import thaw.fcp.FCPTransferQuery;
public class IndexProgressBar {
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java 2007-03-03
19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java 2007-03-03
22:19:45 UTC (rev 11948)
@@ -12,8 +12,6 @@
import java.sql.ResultSet;
import java.util.Iterator;
import java.util.Vector;
-import java.util.Hashtable;
-
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
@@ -32,11 +30,9 @@
import thaw.core.I18n;
import thaw.core.IconBox;
import thaw.core.Logger;
-import thaw.core.MainWindow;
import thaw.core.FreenetURIHelper;
import thaw.fcp.FCPQueueManager;
import thaw.gui.JDragTree;
-import thaw.plugins.Hsqldb;
import thaw.plugins.ToolbarModifier;
/**
@@ -534,7 +530,7 @@
}
public void redraw(TreePath path) {
- Object[] nodes = (Object[])(path.getPath());
+ Object[] nodes = (path.getPath());
for (int i = 0 ; i < nodes.length ; i++) {
IndexTreeNode node = (IndexTreeNode)nodes[i];
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexTreeNode.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexTreeNode.java 2007-03-03
19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexTreeNode.java 2007-03-03
22:19:45 UTC (rev 11948)
@@ -1,11 +1,7 @@
package thaw.plugins.index;
-import java.util.Vector;
-
-import java.util.Observable;
import java.util.Observer;
-import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.MutableTreeNode;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Link.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Link.java 2007-03-03 19:19:41 UTC
(rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Link.java 2007-03-03 22:19:45 UTC
(rev 11948)
@@ -3,8 +3,6 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Types;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/LinkManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/LinkManagementHelper.java
2007-03-03 19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/LinkManagementHelper.java
2007-03-03 22:19:45 UTC (rev 11948)
@@ -11,7 +11,6 @@
import javax.swing.AbstractButton;
import thaw.fcp.FCPQueueManager;
-import thaw.plugins.Hsqldb;
public class LinkManagementHelper {
public interface LinkAction extends ActionListener {
Modified: trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2007-03-03
19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2007-03-03
22:19:45 UTC (rev 11948)
@@ -8,7 +8,6 @@
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.Iterator;
-import java.util.Observable;
import java.util.Vector;
import java.awt.Color;
import java.awt.Component;
@@ -22,14 +21,10 @@
import javax.swing.JButton;
import javax.swing.event.TableModelEvent;
import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.tree.TreePath;
-
import thaw.core.I18n;
-import thaw.core.Logger;
import thaw.core.IconBox;
import thaw.plugins.ToolbarModifier;
import thaw.fcp.FCPQueueManager;
-import thaw.plugins.Hsqldb;
public class LinkTable implements MouseListener, KeyListener, ActionListener {
Modified: trunk/apps/Thaw/src/thaw/plugins/index/SearchBar.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/SearchBar.java 2007-03-03
19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/SearchBar.java 2007-03-03
22:19:45 UTC (rev 11948)
@@ -10,8 +10,6 @@
import javax.swing.JTextField;
import thaw.core.I18n;
-import thaw.fcp.FCPQueueManager;
-import thaw.plugins.Hsqldb;
public class SearchBar implements ActionListener {
private JPanel panel;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java 2007-03-03
19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java 2007-03-03
22:19:45 UTC (rev 11948)
@@ -1,16 +1,11 @@
package thaw.plugins.index;
-import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.Observable;
-import java.util.Observer;
import java.util.Vector;
import thaw.core.Logger;
-import thaw.fcp.FCPQueueManager;
import thaw.plugins.Hsqldb;
public class SearchResult implements FileAndLinkList {
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Tables.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Tables.java 2007-03-03 19:19:41 UTC
(rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Tables.java 2007-03-03 22:19:45 UTC
(rev 11948)
@@ -7,7 +7,6 @@
import thaw.core.Config;
import thaw.fcp.FCPQueueManager;
-import thaw.plugins.Hsqldb;
/**
* Contains a FileTable, a LinkTable, and a SearchBar
Modified: trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
2007-03-03 19:19:41 UTC (rev 11947)
+++ trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
2007-03-03 22:19:45 UTC (rev 11948)
@@ -18,7 +18,6 @@
import thaw.core.IconBox;
import thaw.plugins.ToolbarModifier;
import thaw.fcp.FCPQueueManager;
-import thaw.plugins.Hsqldb;
public class UnknownIndexList implements MouseListener {
public final static int MAX_INDEXES = 50;
