[Thaw-dev] r10679 - trunk/apps/Thaw/src/thaw/plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-10-20 06:33:09 +0000 (Fri, 20 Oct 2006)
New Revision: 10679

Modified:
   trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
   trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java
Log:
Fix right click menu in index browser / editor

Modified: trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java       2006-10-20 
06:19:16 UTC (rev 10678)
+++ trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java       2006-10-20 
06:33:09 UTC (rev 10679)
@@ -131,8 +131,7 @@

        public void mouseClicked(MouseEvent e) {
                if(e.getButton() == MouseEvent.BUTTON3
-                  && fileList != null
-                  && fileList instanceof Index) {
+                  && fileList != null) {
                        selectedRows = table.getSelectedRows();
                        rightClickMenu.show(e.getComponent(), e.getX(), 
e.getY());
                }
@@ -153,16 +152,13 @@
        public void keyTyped(KeyEvent e) { }

        public void actionPerformed(ActionEvent e) {
-               if(fileList == null
-                  || !(fileList instanceof Index))
+               if(fileList == null)
                        return;

                String keys = "";

                Vector files = null;

-               Index index = (Index)fileList;
-
                java.io.File destination = null;

                if(e.getSource() == downloadFiles) {
@@ -184,6 +180,8 @@
                for(int i = 0 ; i < selectedRows.length ; i++) {

                        if(e.getSource() == removeFiles) {
+                               Index index = (Index)fileList;
+
                                thaw.plugins.index.File file = 
(thaw.plugins.index.File)files.get(selectedRows[i]);
                                if (file.getTransfer() != null)
                                        file.getTransfer().stop(queueManager);
@@ -191,6 +189,8 @@
                        }

                        if(e.getSource() == insertFiles) {
+                               Index index = (Index)fileList;
+
                                thaw.plugins.index.File file = 
index.getFile(selectedRows[i]);

                                FCPClientPut clientPut = new FCPClientPut(new 
java.io.File(file.getLocalPath()),
@@ -202,8 +202,13 @@


                        if(e.getSource() == downloadFiles) {
-                               thaw.plugins.index.File file = 
index.getFile(selectedRows[i]);
+                               thaw.plugins.index.File file = 
fileList.getFile(selectedRows[i]);

+                               if (file == null) {
+                                       Logger.notice(this, "File disappeared 
?");
+                                       continue;
+                               }                                       
+
                                FCPClientGet clientGet = new 
FCPClientGet(file.getPublicKey(), 4, 0, true, -1,
                                                                          
destination.getPath());

@@ -213,13 +218,13 @@
                        }

                        if(e.getSource() == copyFileKeys) {
-                               thaw.plugins.index.File file = 
index.getFile(selectedRows[i]);
+                               thaw.plugins.index.File file = 
fileList.getFile(selectedRows[i]);
                                if(file.getPublicKey() != null)
                                        keys = keys + file.getPublicKey() + 
"\n";
                        }

                        if(e.getSource() == recalculateKeys) {
-                               thaw.plugins.index.File file = 
index.getFile(selectedRows[i]);
+                               thaw.plugins.index.File file = 
fileList.getFile(selectedRows[i]);

                                FCPClientPut insertion = new FCPClientPut(new 
java.io.File(file.getLocalPath()), 0, 0, null,
                                                                          null, 
4,

Modified: trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java    2006-10-20 
06:19:16 UTC (rev 10678)
+++ trunk/apps/Thaw/src/thaw/plugins/index/SearchResult.java    2006-10-20 
06:33:09 UTC (rev 10679)
@@ -140,11 +140,11 @@


        public thaw.plugins.index.File getFile(int index) {
-               return null;
+               return (thaw.plugins.index.File)fileList.get(index);
        }

        public Link getLink(int index) {
-               return null;
+               return (Link)linkList.get(index);
        }