Author: jflesch
Date: 2006-12-09 16:46:33 +0000 (Sat, 09 Dec 2006)
New Revision: 11315
Added:
trunk/apps/Thaw/src/thaw/plugins/index/DetailPanel.java
Removed:
trunk/apps/Thaw/src/thaw/plugins/index/FileDetailsEditor.java
Modified:
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.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/Tables.java
trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
Cleaning some part of the index code
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2006-12-09 16:32:34 UTC
(rev 11314)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2006-12-09 16:46:33 UTC
(rev 11315)
@@ -216,8 +216,8 @@
thaw.plugin.index.delete=Delete
thaw.plugin.index.insertIndex=[Re]insert this index on Freenet
thaw.plugin.index.insertIndexes=[Re]insert these indexes on Freenet
-thaw.plugin.index.downloadIndex=[Re]download this index from Freenet
-thaw.plugin.index.downloadIndexes=[Re]download these indexes from Freenet
+thaw.plugin.index.downloadIndex=Check for index updates
+thaw.plugin.index.downloadIndexes=Check for index updates
thaw.plugin.index.copyKey=Copy index key to clipboard
thaw.plugin.index.copyKeys=Copy index keys to clipboard
thaw.plugin.index.copyPrivateKey=Copy index private key(s) to clipboard
Copied: trunk/apps/Thaw/src/thaw/plugins/index/DetailPanel.java (from rev
11311, trunk/apps/Thaw/src/thaw/plugins/index/FileDetailsEditor.java)
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/DetailPanel.java
(rev 0)
+++ trunk/apps/Thaw/src/thaw/plugins/index/DetailPanel.java 2006-12-09
16:46:33 UTC (rev 11315)
@@ -0,0 +1,19 @@
+package thaw.plugins.index;
+
+import javax.swing.JPanel;
+
+public class DetailPanel {
+
+ private JPanel panel;
+
+ public DetailPanel() {
+ panel = new JPanel();
+ }
+
+
+ public JPanel getPanel() {
+ return panel;
+ }
+
+}
+
Deleted: trunk/apps/Thaw/src/thaw/plugins/index/FileDetailsEditor.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/FileDetailsEditor.java
2006-12-09 16:32:34 UTC (rev 11314)
+++ trunk/apps/Thaw/src/thaw/plugins/index/FileDetailsEditor.java
2006-12-09 16:46:33 UTC (rev 11315)
@@ -1,19 +0,0 @@
-package thaw.plugins.index;
-
-import javax.swing.JPanel;
-
-public class FileDetailsEditor {
-
- private JPanel panel;
-
- public FileDetailsEditor(final boolean modifiables) {
- panel = new JPanel();
- }
-
-
- public JPanel getPanel() {
- return panel;
- }
-
-}
-
Modified: trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java 2006-12-09
16:32:34 UTC (rev 11314)
+++ trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java 2006-12-09
16:46:33 UTC (rev 11315)
@@ -55,12 +55,10 @@
private int[] selectedRows;
- private final Tables tables;
- private final IndexTree tree;
+ private IndexBrowserPanel indexBrowser;
- public FileTable(final FCPQueueManager queueManager, final IndexTree
tree, final Config config, final Tables tables) {
- this.tables = tables;
- this.tree = tree;
+ public FileTable(final FCPQueueManager queueManager, IndexBrowserPanel
indexBrowser, final Config config) {
+ this.indexBrowser = indexBrowser;
fileListModel = new FileListModel();
table = new JTable(fileListModel);
@@ -200,7 +198,7 @@
Index parent;
if (file.getParent() == null)
- parent =
tree.getRoot().getIndex(file.getParentId());
+ parent =
indexBrowser.getIndexTree().getRoot().getIndex(file.getParentId());
else
parent = file.getParent();
@@ -209,9 +207,9 @@
return;
}
- tree.getTree().setSelectionPath(new
TreePath(parent.getTreeNode().getPath()));
+
indexBrowser.getIndexTree().getTree().setSelectionPath(new
TreePath(parent.getTreeNode().getPath()));
- tables.setList(parent);
+ indexBrowser.getTables().setList(parent);
int row;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2006-12-09 16:32:34 UTC (rev 11314)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2006-12-09 16:46:33 UTC (rev 11315)
@@ -25,26 +25,23 @@
private JPanel listAndDetails;
private Tables tables;
- private FileDetailsEditor fileDetails;
+ private DetailPanel detailPanel;
private Hsqldb db;
private FCPQueueManager queueManager;
private Config config;
+ private MainWindow mainWindow;
-
-
public IndexBrowserPanel(final Hsqldb db, final FCPQueueManager
queueManager, final Config config, final MainWindow mainWindow) {
- if (db == null)
- Logger.error(this, "No reference to the database ?!");
-
this.db = db;
this.queueManager = queueManager;
this.config = config;
+ this.mainWindow = mainWindow;
- unknownList = new UnknownIndexList(db, queueManager);
- indexTree = new
IndexTree(I18n.getMessage("thaw.plugin.index.indexes"), false, queueManager,
unknownList, mainWindow, db);
- unknownList.setIndexTree(indexTree); /* TODO: dirty => find a
better way */
+ unknownList = new UnknownIndexList(queueManager, this);
+ indexTree = new
IndexTree(I18n.getMessage("thaw.plugin.index.indexes"), false, queueManager,
this);
+
leftSplit = new JSplitPane(JSplitPane.VERTICAL_SPLIT,
indexTree.getPanel(),
unknownList.getPanel());
@@ -52,14 +49,14 @@
listAndDetails = new JPanel();
listAndDetails.setLayout(new BorderLayout(10, 10));
- tables = new Tables(false, db, queueManager, unknownList,
indexTree, config);
- fileDetails = new FileDetailsEditor(false);
+ tables = new Tables(false, queueManager, this, config);
+ detailPanel = new DetailPanel();
listAndDetails.add(tables.getPanel(), BorderLayout.CENTER);
- listAndDetails.add(fileDetails.getPanel(), BorderLayout.SOUTH);
+ listAndDetails.add(detailPanel.getPanel(), BorderLayout.SOUTH);
split = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
- leftSplit, listAndDetails);
+ leftSplit, listAndDetails);
indexTree.addTreeSelectionListener(this);
}
@@ -86,6 +83,10 @@
tables.restoreState();
}
+ public Hsqldb getDb() {
+ return db;
+ }
+
public Tables getTables() {
return tables;
}
@@ -98,6 +99,15 @@
return unknownList;
}
+ public DetailPanel getDetailPanel() {
+ return detailPanel;
+ }
+
+ public MainWindow getMainWindow() {
+ return mainWindow;
+ }
+
+
public JSplitPane getPanel() {
return split;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java 2006-12-09
16:32:34 UTC (rev 11314)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java 2006-12-09
16:46:33 UTC (rev 11315)
@@ -83,31 +83,25 @@
private DefaultTreeModel treeModel;
- private UnknownIndexList uIndexList;
-
- private Hsqldb db;
private FCPQueueManager queueManager;
+ private IndexBrowserPanel indexBrowser;
+
/**
* @param queueManager Not used if selectionOnly is set to true
*/
- public IndexTree(final String rootName,
- boolean selectionOnly,
+ public IndexTree(final String rootName, boolean selectionOnly,
final FCPQueueManager queueManager,
- final UnknownIndexList uIndexList,
- final MainWindow mainWindow,
- final Hsqldb db) {
- this.uIndexList = uIndexList;
+ final IndexBrowserPanel indexBrowser) {
this.queueManager = queueManager;
- this.db = db;
this.selectionOnly = selectionOnly;
panel = new JPanel();
panel.setLayout(new BorderLayout(10, 10));
- root = new IndexCategory(db, queueManager, uIndexList, -1,
null, rootName);
+ root = new IndexCategory(indexBrowser.getDb(), queueManager,
indexBrowser.getUnknownIndexList(), -1, null, rootName);
root.loadChildren();
root.addObserver(this);
@@ -152,15 +146,15 @@
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.addAlreadyExistingIndex"));
indexCategoryMenu.add(item);
- indexCategoryActions.add(new
IndexManagementHelper.IndexReuser(db, queueManager, uIndexList, this,
mainWindow, item));
+ indexCategoryActions.add(new
IndexManagementHelper.IndexReuser(indexBrowser.getDb(), queueManager,
indexBrowser.getUnknownIndexList(), this, indexBrowser.getMainWindow(), item));
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.addCategory"));
indexCategoryMenu.add(item);
- indexCategoryActions.add(new
IndexManagementHelper.IndexCategoryAdder(db, queueManager, uIndexList, this,
item));
+ indexCategoryActions.add(new
IndexManagementHelper.IndexCategoryAdder(indexBrowser.getDb(), queueManager,
indexBrowser.getUnknownIndexList(), this, item));
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.createIndex"));
indexCategoryMenu.add(item);
- indexCategoryActions.add(new
IndexManagementHelper.IndexCreator(db, queueManager, uIndexList, this, item));
+ indexCategoryActions.add(new
IndexManagementHelper.IndexCreator(indexBrowser.getDb(), queueManager,
indexBrowser.getUnknownIndexList(), this, item));
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.rename"));
indexCategoryMenu.add(item);
@@ -202,7 +196,7 @@
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.changeIndexKeys"));
indexMenu.add(item);
- indexAndFileActions.add(new
IndexManagementHelper.IndexKeyModifier(mainWindow, item));
+ indexAndFileActions.add(new
IndexManagementHelper.IndexKeyModifier(indexBrowser.getMainWindow(), item));
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.copyPrivateKey"));
indexMenu.add(item);
@@ -217,20 +211,20 @@
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.addFilesWithInserting"));
fileMenu.add(item);
- indexAndFileActions.add(new
IndexManagementHelper.FileInserterAndAdder(db, queueManager, item));
+ indexAndFileActions.add(new
IndexManagementHelper.FileInserterAndAdder(indexBrowser.getDb(), queueManager,
item));
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.addFilesWithoutInserting"));
fileMenu.add(item);
- indexAndFileActions.add(new IndexManagementHelper.FileAdder(db,
queueManager, item));
+ indexAndFileActions.add(new
IndexManagementHelper.FileAdder(indexBrowser.getDb(), queueManager, item));
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.addKeys"));
fileMenu.add(item);
- indexAndFileActions.add(new IndexManagementHelper.KeyAdder(db,
mainWindow, item));
+ indexAndFileActions.add(new
IndexManagementHelper.KeyAdder(indexBrowser.getDb(),
indexBrowser.getMainWindow(), item));
// Link menu
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.addLink"));
linkMenu.add(item);
- indexAndFileActions.add(new IndexManagementHelper.LinkAdder(db,
item));
+ indexAndFileActions.add(new
IndexManagementHelper.LinkAdder(indexBrowser.getDb(), item));
indexAndFileMenu.add(indexMenu);
indexAndFileMenu.add(fileMenu);
@@ -333,8 +327,8 @@
selectedNode =
(IndexTreeNode)((DefaultMutableTreeNode)path.getLastPathComponent()).getUserObject();
- if ((uIndexList != null) && (selectedNode instanceof Index)) {
- uIndexList.addLinks(((Index)selectedNode));
+ if ((indexBrowser != null) && (selectedNode instanceof Index)) {
+
indexBrowser.getUnknownIndexList().addLinks(((Index)selectedNode));
}
setChanged();
@@ -464,7 +458,7 @@
final String realKey = key.substring(0,
maxLength).toLowerCase();
try {
- final Connection c = db.getConnection();
+ final Connection c =
indexBrowser.getDb().getConnection();
PreparedStatement st;
String query;
Modified: trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2006-12-09
16:32:34 UTC (rev 11314)
+++ trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2006-12-09
16:46:33 UTC (rev 11315)
@@ -36,9 +36,7 @@
private FCPQueueManager queueManager;
- private IndexTree indexTree;
- private Hsqldb db;
- private Tables tables;
+ private IndexBrowserPanel indexBrowser;
private JPopupMenu rightClickMenu;
private Vector rightClickActions;
@@ -46,9 +44,8 @@
private int[] selectedRows;
- public LinkTable (final Hsqldb db, final FCPQueueManager queueManager,
final UnknownIndexList uil, final IndexTree tree, final Tables tables) {
- this.queueManager = queueManager;
- this.db = db;
+ public LinkTable (final FCPQueueManager queueManager, IndexBrowserPanel
indexBrowser) {
+ this.indexBrowser = indexBrowser;
linkListModel = new LinkListModel();
table = new JTable(linkListModel);
@@ -62,9 +59,6 @@
table.addMouseListener(this);
- indexTree = tree;
- this.tables = tables;
-
rightClickMenu = new JPopupMenu();
rightClickActions = new Vector();
@@ -72,7 +66,9 @@
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.addIndexesFromLink"));
rightClickMenu.add(item);
- rightClickActions.add(new LinkManagementHelper.IndexAdder(item,
db, queueManager, uil, tree));
+ rightClickActions.add(new LinkManagementHelper.IndexAdder(item,
indexBrowser.getDb(), queueManager,
+
indexBrowser.getUnknownIndexList(),
+
indexBrowser.getIndexTree()));
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.copyKeys"));
rightClickMenu.add(item);
@@ -177,7 +173,7 @@
Index parent;
if (link.getParent() == null)
- parent =
indexTree.getRoot().getIndex(link.getParentId());
+ parent =
indexBrowser.getIndexTree().getRoot().getIndex(link.getParentId());
else
parent = link.getParent();
@@ -186,9 +182,9 @@
return;
}
- indexTree.getTree().setSelectionPath(new
TreePath(parent.getTreeNode().getPath()));
+
indexBrowser.getIndexTree().getTree().setSelectionPath(new
TreePath(parent.getTreeNode().getPath()));
- tables.setList(parent);
+ indexBrowser.getTables().setList(parent);
return;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/SearchBar.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/SearchBar.java 2006-12-09
16:32:34 UTC (rev 11314)
+++ trunk/apps/Thaw/src/thaw/plugins/index/SearchBar.java 2006-12-09
16:46:33 UTC (rev 11315)
@@ -19,17 +19,14 @@
private JTextField userText;
private JButton validationButton;
- private Hsqldb db;
- private IndexTree tree;
+ private IndexBrowserPanel indexBrowser;
private Tables tables;
private FCPQueueManager queueManager;
- public SearchBar(final Hsqldb db, final IndexTree indexTree, final
FCPQueueManager queueManager, final Tables tables) {
- this.db = db;
- tree = indexTree;
- this.tables = tables;
+ public SearchBar(final FCPQueueManager queueManager, IndexBrowserPanel
indexBrowser) {
+ this.indexBrowser = indexBrowser;
this.queueManager = queueManager;
panel = new JPanel();
@@ -59,8 +56,8 @@
userText.setSelectionStart(0);
userText.setSelectionEnd(userText.getText().length());
- final SearchResult sr = new SearchResult(db,
userText.getText(), tree.getSelectedNode(), queueManager);
- tables.setList(sr);
+ final SearchResult sr = new SearchResult(indexBrowser.getDb(),
userText.getText(), indexBrowser.getIndexTree().getSelectedNode(),
queueManager);
+ indexBrowser.getTables().setList(sr);
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Tables.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Tables.java 2006-12-09 16:32:34 UTC
(rev 11314)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Tables.java 2006-12-09 16:46:33 UTC
(rev 11315)
@@ -22,16 +22,16 @@
private JSplitPane split;
private Config config;
- public Tables(final boolean modifiables, final Hsqldb db, final
FCPQueueManager queueManager, final UnknownIndexList uil, final IndexTree tree,
final Config config) {
+ public Tables(final boolean modifiables, FCPQueueManager queueManager,
IndexBrowserPanel indexBrowser, final Config config) {
this.config = config;
panel = new JPanel();
panel.setLayout(new BorderLayout(10, 10));
- fileTable = new FileTable(queueManager, tree, config, this);
- linkTable = new LinkTable(db, queueManager, uil, tree, this);
+ fileTable = new FileTable(queueManager, indexBrowser, config);
+ linkTable = new LinkTable(queueManager, indexBrowser);
- searchBar = new SearchBar(db, tree, queueManager, this);
+ searchBar = new SearchBar(queueManager, indexBrowser);
split = new JSplitPane(JSplitPane.VERTICAL_SPLIT,
linkTable.getPanel(),
Modified: trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
2006-12-09 16:32:34 UTC (rev 11314)
+++ trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
2006-12-09 16:46:33 UTC (rev 11315)
@@ -34,13 +34,12 @@
private JPopupMenu rightClickMenu = null;
private Vector rightClickActions = null;
- private Hsqldb db;
private FCPQueueManager queueManager;
- private IndexTree indexTree;
+ private IndexBrowserPanel indexBrowser;
- public UnknownIndexList(final Hsqldb db, final FCPQueueManager
queueManager) {
- this.db = db;
+ public UnknownIndexList(final FCPQueueManager queueManager,
IndexBrowserPanel indexBrowser) {
this.queueManager = queueManager;
+ this.indexBrowser = indexBrowser;
offset = 0;
full = false;
@@ -63,10 +62,6 @@
list.addMouseListener(this);
}
- public void setIndexTree(final IndexTree tree) {
- indexTree = tree;
- }
-
public JPanel getPanel() {
return panel;
}
@@ -156,7 +151,7 @@
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.addIndexesFromLink"));
rightClickMenu.add(item);
- rightClickActions.add(new
LinkManagementHelper.IndexAdder(item, db, queueManager, this, indexTree));
+ rightClickActions.add(new
LinkManagementHelper.IndexAdder(item, indexBrowser.getDb(), queueManager, this,
indexBrowser.getIndexTree()));
item = new
JMenuItem(I18n.getMessage("thaw.plugin.index.copyKeys"));
rightClickMenu.add(item);
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2006-12-09 16:32:34 UTC (rev 11314)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2006-12-09 16:46:33 UTC (rev 11315)
@@ -312,7 +312,7 @@
}
}
- Logger.notice(this, "update(): unknow change");
+ Logger.debug(this, "update(): unknow change");
reloadQueue();
}
