Author: mes
Date: 2010-11-18 15:18:53 -0800 (Thu, 18 Nov 2010)
New Revision: 22911
Added:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GSUtils.java
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/DeleteFileInGenomeSpace.java
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/DownloadFileFromGenomeSpace.java
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/ListFilesInGenomeSpace.java
Log:
got download and delete working in the most rudimentary way possible
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/DeleteFileInGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/DeleteFileInGenomeSpace.java
2010-11-18 22:54:40 UTC (rev 22910)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/DeleteFileInGenomeSpace.java
2010-11-18 23:18:53 UTC (rev 22911)
@@ -10,6 +10,8 @@
import java.io.File;
import java.awt.FileDialog;
import java.util.List;
+import java.util.Map;
+import java.util.Collection;
import org.genomespace.client.GsFile;
import org.genomespace.client.GsSession;
@@ -47,15 +49,27 @@
logger.info("Logged in to GenomeSpace: " + client.isLoggedIn()
+ " as " + user.getUsername());
// list the files present for this user
- List<GsFile> myFiles = client.list();
- if (myFiles.size() > 0){
- logger.info("Deleting " + myFiles.get(0).getFilename());
- client.delete(myFiles.get(0));
+ Map<String,GsFile> files = GSUtils.getFileNameMap(
client.list() );
+
+ String selectedFile = getSelectedFile( files.keySet() );
+
+ // Delete the file from GenomeSpace
+ if (selectedFile != null && files.get(selectedFile) != null) {
+ logger.info("Deleting " + selectedFile);
+ client.delete(files.get(selectedFile));
}
-
+
} catch (Exception ex) {
logger.error("GenomeSpace failed",ex);
}
}
+ private String getSelectedFile(Collection<String> names) {
+ String s = (String)JOptionPane.showInputDialog(
+ Cytoscape.getDesktop(), "Select a file to delete:",
+ "Delete from GenomeSpace",
+ JOptionPane.WARNING_MESSAGE,
+ null, names.toArray() ,null);
+ return s;
+ }
}
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/DownloadFileFromGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/DownloadFileFromGenomeSpace.java
2010-11-18 22:54:40 UTC (rev 22910)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/DownloadFileFromGenomeSpace.java
2010-11-18 23:18:53 UTC (rev 22911)
@@ -10,6 +10,8 @@
import java.io.File;
import java.awt.FileDialog;
import java.util.List;
+import java.util.Map;
+import java.util.Collection;
import org.genomespace.client.GsFile;
import org.genomespace.client.GsSession;
@@ -47,13 +49,14 @@
logger.info("Logged in to GenomeSpace: " + client.isLoggedIn()
+ " as " + user.getUsername());
// list the files present for this user
- List<GsFile> myFiles = client.list();
+ Map<String,GsFile> files = GSUtils.getFileNameMap(
client.list() );
+ String selectedFile = getSelectedFile( files.keySet() );
+
// Download the file back from GenomeSpace
- myFiles = client.list();
- if (myFiles.size() > 0){
- logger.info("Downloading " +
myFiles.get(0).getFilename());
- GsFile localCopy = client.downloadFile(myFiles.get(0));
+ if (selectedFile != null && files.get(selectedFile) != null) {
+ logger.info("Downloading " + files.get(selectedFile));
+ GsFile localCopy =
client.downloadFile(files.get(selectedFile));
logger.info("\t saved to: " +
localCopy.getFile().getAbsolutePath());
}
@@ -61,4 +64,13 @@
logger.error("GenomeSpace failed",ex);
}
}
+
+ private String getSelectedFile(Collection<String> names) {
+ String s = (String)JOptionPane.showInputDialog(
+ Cytoscape.getDesktop(), "Select a file to download:",
+ "Download from GenomeSpace",
+ JOptionPane.PLAIN_MESSAGE,
+ null, names.toArray() ,null);
+ return s;
+ }
}
Added:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GSUtils.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GSUtils.java
(rev 0)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/GSUtils.java
2010-11-18 23:18:53 UTC (rev 22911)
@@ -0,0 +1,22 @@
+
+package cytoscape.genomespace;
+
+
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import org.genomespace.client.GsFile;
+
+final class GSUtils {
+
+ private GSUtils() {};
+
+ public static Map<String,GsFile> getFileNameMap(List<GsFile> l) {
+ Map<String,GsFile> nm = new HashMap<String,GsFile>();
+ for ( GsFile f : l )
+ nm.put(f.getFilename(), f);
+
+ return nm;
+ }
+}
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/ListFilesInGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/ListFilesInGenomeSpace.java
2010-11-18 22:54:40 UTC (rev 22910)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/ListFilesInGenomeSpace.java
2010-11-18 23:18:53 UTC (rev 22911)
@@ -71,7 +71,7 @@
JList jl = new JList( fileNames );
jl.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
JScrollPane scrollPane = new JScrollPane(jl);
- scrollPane.setPreferredSize(new Dimension(250, 80));
+ scrollPane.setPreferredSize(new Dimension(250, 200));
JPanel jp = new JPanel();
jp.add(scrollPane);
JOptionPane.showMessageDialog(Cytoscape.getDesktop(),jp);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
