From af37f3dfd5f92eb1e70bd9ab7deb94eb8e712c23 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Fri, 23 Feb 2007 16:30:37 +0000
Subject: [PATCH] tidy
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@5491 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
uk/ac/sanger/artemis/ExternalProgram.java | 5 ++-
.../artemis/components/filetree/FileList.java | 13 +++-----
.../components/filetree/RemoteFileNode.java | 10 ++++--
.../components/filetree/SshJTreeTable.java | 33 +++++++------------
4 files changed, 26 insertions(+), 35 deletions(-)
diff --git a/uk/ac/sanger/artemis/ExternalProgram.java b/uk/ac/sanger/artemis/ExternalProgram.java
index dfde4a290..13097e45d 100644
--- a/uk/ac/sanger/artemis/ExternalProgram.java
+++ b/uk/ac/sanger/artemis/ExternalProgram.java
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/ExternalProgram.java,v 1.12 2006-02-03 09:33:42 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/ExternalProgram.java,v 1.13 2007-02-23 16:30:37 tjc Exp $
**/
package uk.ac.sanger.artemis;
@@ -29,7 +29,6 @@ import uk.ac.sanger.artemis.util.*;
import uk.ac.sanger.artemis.io.EntryInformation;
import uk.ac.sanger.artemis.io.EntryInformationException;
import uk.ac.sanger.artemis.io.DocumentEntry;
-import uk.ac.sanger.artemis.io.Qualifier;
import uk.ac.sanger.artemis.components.filetree.RemoteFileNode;
import uk.ac.sanger.artemis.j2ssh.FileTransferProgressMonitor;
import uk.ac.sanger.artemis.j2ssh.FTProgress;
@@ -44,7 +43,7 @@ import java.util.Enumeration;
* and contains methods for invoking it.
*
* @author Kim Rutherford
- * @version $Id: ExternalProgram.java,v 1.12 2006-02-03 09:33:42 tjc Exp $
+ * @version $Id: ExternalProgram.java,v 1.13 2007-02-23 16:30:37 tjc Exp $
**/
public class ExternalProgram
diff --git a/uk/ac/sanger/artemis/components/filetree/FileList.java b/uk/ac/sanger/artemis/components/filetree/FileList.java
index 1cf3fefc7..3ab67d23f 100644
--- a/uk/ac/sanger/artemis/components/filetree/FileList.java
+++ b/uk/ac/sanger/artemis/components/filetree/FileList.java
@@ -23,10 +23,7 @@ package uk.ac.sanger.artemis.components.filetree;
import uk.ac.sanger.artemis.j2ssh.FTProgress;
import uk.ac.sanger.artemis.j2ssh.SshFileManager;
-import java.util.Vector;
-import java.util.Collections;
import java.util.Hashtable;
-import java.util.Date;
import java.io.IOException;
import java.io.File;
import com.sshtools.j2ssh.sftp.FileAttributes;
@@ -35,17 +32,17 @@ public class FileList
{
/** vector containing directories */
private Hashtable vdir;
- private Hashtable vfile;
protected static SshFileManager ssh_client;
public FileList()
{
- ssh_client = new SshFileManager();
+ if(ssh_client == null)
+ ssh_client = new SshFileManager();
}
public FileList(SshFileManager ssh_client)
{
- this.ssh_client = ssh_client;
+ FileList.ssh_client = ssh_client;
}
/**
@@ -63,7 +60,7 @@ public class FileList
}
catch(IOException ioe)
{
- ioe.printStackTrace();
+ return null;
}
vdir = ssh_client.getDirList();
return ssh_client.getFileList();
@@ -139,7 +136,7 @@ public class FileList
* Get the file contents
*
*/
- protected byte[] getFileContents(String file, FTProgress monitor)
+ public byte[] getFileContents(String file, FTProgress monitor)
{
return ssh_client.getFileContents(file, monitor);
}
diff --git a/uk/ac/sanger/artemis/components/filetree/RemoteFileNode.java b/uk/ac/sanger/artemis/components/filetree/RemoteFileNode.java
index 725a67cb5..679cefbd2 100644
--- a/uk/ac/sanger/artemis/components/filetree/RemoteFileNode.java
+++ b/uk/ac/sanger/artemis/components/filetree/RemoteFileNode.java
@@ -36,6 +36,8 @@ import java.util.*;
public class RemoteFileNode extends DefaultMutableTreeNode
implements Transferable, Serializable
{
+ /** */
+ private static final long serialVersionUID = 1L;
/** true if node is explored */
private boolean explored = false;
/** true if node is a directory */
@@ -47,8 +49,6 @@ public class RemoteFileNode extends DefaultMutableTreeNode
/** root directory */
private String rootdir;
- /** parent directory listing */
- private transient FileList parentList; // make transient for
/** remote server file roots */
private transient String froots;
/** file separator for server files */
@@ -105,7 +105,7 @@ public class RemoteFileNode extends DefaultMutableTreeNode
boolean ldir)
{
this.froots = froots;
- this.parentList = parentList;
+
isDir = ldir;
rootdir = froots;
serverPathToFile = froots;
@@ -206,6 +206,10 @@ public class RemoteFileNode extends DefaultMutableTreeNode
dir = dir.trim();
Hashtable children = flist.getDirList(dir);
+
+ if(children == null)
+ return null;
+
Object files[] = children.keySet().toArray();
Arrays.sort(files);
diff --git a/uk/ac/sanger/artemis/components/filetree/SshJTreeTable.java b/uk/ac/sanger/artemis/components/filetree/SshJTreeTable.java
index e66e5b0db..ff4ca5f4b 100644
--- a/uk/ac/sanger/artemis/components/filetree/SshJTreeTable.java
+++ b/uk/ac/sanger/artemis/components/filetree/SshJTreeTable.java
@@ -27,12 +27,9 @@ import javax.swing.*;
import javax.swing.tree.*;
import javax.swing.table.*;
import javax.swing.filechooser.FileSystemView;
-import javax.swing.event.*;
import java.io.File;
import java.io.IOException;
-import java.io.FileOutputStream;
-import java.io.FileNotFoundException;
import java.awt.*;
import java.awt.event.*;
@@ -51,14 +48,12 @@ import uk.ac.sanger.artemis.Entry;
import uk.ac.sanger.artemis.EntryGroup;
import uk.ac.sanger.artemis.SimpleEntryGroup;
import uk.ac.sanger.artemis.util.OutOfRangeException;
-import uk.ac.sanger.artemis.util.FileDocument;
import uk.ac.sanger.artemis.io.EntryInformation;
import uk.ac.sanger.artemis.io.SimpleEntryInformation;
import uk.ac.sanger.artemis.components.EntryEdit;
import uk.ac.sanger.artemis.components.EntryFileDialog;
import uk.ac.sanger.artemis.components.SwingWorker;
import uk.ac.sanger.artemis.components.MessageDialog;
-import uk.ac.sanger.artemis.components.filetree.*;
import uk.ac.sanger.artemis.sequence.NoSequenceException;
/**
@@ -76,14 +71,14 @@ public class SshJTreeTable extends JTable
DragSourceListener, DropTargetListener, ActionListener,
Autoscroll
{
+ /** */
+ private static final long serialVersionUID = 1L;
/** popup menu */
private JPopupMenu popup;
/** busy cursor */
private Cursor cbusy = new Cursor(Cursor.WAIT_CURSOR);
/** done cursor */
private Cursor cdone = new Cursor(Cursor.DEFAULT_CURSOR);
- /** file separator */
- private String fs = new String(System.getProperty("file.separator"));
/** line separator */
private String ls = new String(System.getProperty("line.separator"));
/** AutoScroll margin */
@@ -116,10 +111,13 @@ public class SshJTreeTable extends JTable
// Force the JTable and JTree to share their row selection models.
tree.setSelectionModel(new DefaultTreeSelectionModel()
{
+ /** */
+ private static final long serialVersionUID = 1L;
+
// Extend the implementation of the constructor, as if:
/* public this() */
{
- setSelectionModel(listSelectionModel);
+ setSelectionModel(listSelectionModel);
}
});
// Make the tree and table row heights the same.
@@ -311,15 +309,9 @@ public class SshJTreeTable extends JTable
"Folder Name","Create New Folder in",
JOptionPane.QUESTION_MESSAGE);
- String dropDest = null;
-
if(node.isLeaf())
- {
pn = (RemoteFileNode)node.getParent();
- dropDest = pn.getFullName() + "/" + inputValue; //assumes unix file sep.!
- }
- else
- dropDest = node.getFullName() + "/" + inputValue;
+
String newNode = pn.getServerName();
if(!newNode.endsWith("/"))
@@ -331,7 +323,6 @@ public class SshJTreeTable extends JTable
if(inputValue != null && !inputValue.equals("") )
{
- final RemoteFileNode pnn = pn;
node.mkdir(newNode);
Runnable addDirToTree = new Runnable()
@@ -576,6 +567,8 @@ public class SshJTreeTable extends JTable
//
public class TreeTableCellRenderer extends JTree implements TableCellRenderer
{
+ /** */
+ private static final long serialVersionUID = 1L;
protected int visibleRow;
public TreeTableCellRenderer(TreeModel model)
@@ -666,12 +659,10 @@ public class SshJTreeTable extends JTable
for(int i=0; i<vnode.size();i++)
{
final RemoteFileNode fn = (RemoteFileNode)vnode.get(i);
- String dropDest = null;
-
+
String serverName = fdropPath.getServerName()+"/"+fn.getFile();
if(!nodeExists(fdropPath,serverName))
{
- String root = fn.getRootDir();
rename(fn, serverName);
Runnable addDirToTree = new Runnable()
@@ -841,7 +832,7 @@ public class SshJTreeTable extends JTable
* appropriate icon
*
*/
- private BufferedImage getImage(File temp)
+ /*private BufferedImage getImage(File temp)
{
// get the right icon
FileSystemView fsv = FileSystemView.getFileSystemView( );
@@ -854,7 +845,7 @@ public class SshJTreeTable extends JTable
BufferedImage.TYPE_INT_ARGB);
icn.paintIcon(this,buff.getGraphics( ),0,0);
return buff;
- }
+ }*/
public void dragDropEnd(DragSourceDropEvent e) {}
public void dragEnter(DragSourceDragEvent e) {}
--
GitLab