Author: jflesch
Date: 2007-05-03 22:01:55 +0000 (Thu, 03 May 2007)
New Revision: 13136
Modified:
trunk/apps/Thaw/src/thaw/gui/Table.java
trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
Log:
Remove stupid synchronize() in FileTable.java
Modified: trunk/apps/Thaw/src/thaw/gui/Table.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/Table.java 2007-05-03 21:54:35 UTC (rev
13135)
+++ trunk/apps/Thaw/src/thaw/gui/Table.java 2007-05-03 22:01:55 UTC (rev
13136)
@@ -305,6 +305,8 @@
int nmb = m.getColumnCount();
+ Logger.info(this, "saving column size for table
'"+configPrefix+"'");
+
for (int i = 0 ; i < nmb ; i++) {
TableColumn c = m.getColumn(i);
config.setValue(configPrefix+"_col_width_"+Integer.toString(i),
Modified: trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java 2007-05-03
21:54:35 UTC (rev 13135)
+++ trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java 2007-05-03
22:01:55 UTC (rev 13136)
@@ -44,7 +44,7 @@
private final JPanel panel;
- private final Table table;
+ private final JTable table;
private FileListModel fileListModel;
private FileList fileList;
@@ -87,6 +87,7 @@
fileListModel = new FileListModel();
table = new Table(config, "index_file_table", fileListModel);
+ //table = new JTable(fileListModel);
table.setShowGrid(false);
table.setIntercellSpacing(new java.awt.Dimension(0, 0));
@@ -204,7 +205,8 @@
}
protected Vector getSelectedFiles(final int[] selectedRows) {
- final Vector srcList =
fileList.getFileList(fileListModel.getColumnNameInDb(columnToSort), sortAsc);
+ //final Vector srcList =
fileList.getFileList(fileListModel.getColumnNameInDb(columnToSort), sortAsc);
+ final Vector srcList = fileListModel.getFiles();
final Vector files = new Vector();
for(int i = 0 ; i < selectedRows.length ; i++) {
@@ -445,30 +447,28 @@
Vector files = fileListModel.getFiles();
- synchronized(files) {
- for (Iterator it = files.iterator() ;
- it.hasNext(); i++) {
- thaw.plugins.index.File file =
(thaw.plugins.index.File)it.next();
+ for (Iterator it = files.iterator() ;
+ it.hasNext(); i++) {
+ thaw.plugins.index.File file =
(thaw.plugins.index.File)it.next();
- if (file.getPublicKey() == null
- ||
!FreenetURIHelper.isAKey(file.getPublicKey())) {
- FCPTransferQuery
transfer;
- transfer =
file.getTransfer(queueManager);
+ if (file.getPublicKey() == null
+ ||
!FreenetURIHelper.isAKey(file.getPublicKey())) {
+ FCPTransferQuery transfer;
+ transfer =
file.getTransfer(queueManager);
- if (transfer != null) {
- if
(transfer.isSuccessful())
-
file.forceReload();
- }
+ if (transfer != null) {
+ if
(transfer.isSuccessful())
+
file.forceReload();
}
+ }
- /* won't query the database */
- fileListModel.refresh(i);
+ /* won't query the database */
+ fileListModel.refresh(i);
- try {
- Thread.sleep(100);
- } catch(InterruptedException e)
{
- /* \_o< */
- }
+ try {
+ Thread.sleep(100);
+ } catch(InterruptedException e) {
+ /* \_o< */
}
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2007-05-03
21:54:35 UTC (rev 13135)
+++ trunk/apps/Thaw/src/thaw/plugins/index/LinkTable.java 2007-05-03
22:01:55 UTC (rev 13136)
@@ -170,7 +170,8 @@
}
protected Vector getSelectedLinks(final int[] selectedRows) {
- final Vector srcList = linkList.getLinkList(null, false);
+ //final Vector srcList = linkList.getLinkList(null, false);
+ final Vector srcList = linkListModel.getLinks();
final Vector links = new Vector();
for(int i = 0 ; i < selectedRows.length ; i++) {
@@ -289,6 +290,10 @@
}
+ public Vector getLinks() {
+ return links;
+ }
+
public int getRowCount() {
if (links == null)
return 0;
