Author: ruschein
Date: 2011-06-17 16:19:01 -0700 (Fri, 17 Jun 2011)
New Revision: 25800
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/LoadNetworkFromGenomeSpace.java
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoadSessionFromGenomeSpace.java
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/SaveNetworkToGenomeSpace.java
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/SaveSessionToGenomeSpace.java
Log:
Updated to track changes in the CDK.
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
2011-06-17 21:15:50 UTC (rev 25799)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/DeleteFileInGenomeSpace.java
2011-06-17 23:19:01 UTC (rev 25800)
@@ -5,29 +5,24 @@
import cytoscape.util.CytoscapeAction;
import cytoscape.util.FileUtil;
import cytoscape.logger.CyLogger;
-import java.awt.event.ActionEvent;
-import javax.swing.ImageIcon;
-import javax.swing.JOptionPane;
-import java.io.File;
import java.awt.FileDialog;
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.Collection;
+import javax.swing.ImageIcon;
+import javax.swing.JOptionPane;
+
import org.genomespace.datamanager.core.GSFileMetadata;
-import org.genomespace.client.GsSession;
import org.genomespace.client.DataManagerClient;
-import org.genomespace.client.User;
+import org.genomespace.client.GsSession;
+import org.genomespace.client.ui.GSFileBrowserDialog;
-/**
- * A simple action. Change the names as appropriate and
- * then fill in your expected behavior in the actionPerformed()
- * method.
- */
public class DeleteFileInGenomeSpace extends CytoscapeAction {
-
private static final long serialVersionUID = 4234432889999989L;
private static final CyLogger logger =
CyLogger.getLogger(DeleteFileInGenomeSpace.class);
@@ -43,23 +38,12 @@
}
public void actionPerformed(ActionEvent e) {
-
try {
-
- GsSession client = GSUtils.getSession();
- DataManagerClient dmc = client.getDataManagerClient();
-
- // list the files present for this user
- Map<String,GSFileMetadata> files = GSUtils.getFileNameMap(
dmc.listDefaultDirectory().getContents() );
-
- String selectedFile = getSelectedFile( files.keySet() );
-
- // Delete the file from GenomeSpace
- if (selectedFile != null && files.get(selectedFile) != null) {
- logger.info("Deleting " + selectedFile);
- dmc.delete(files.get(selectedFile));
- }
-
+ final GsSession session = GSUtils.getSession();
+ final DataManagerClient dataManagerClient =
session.getDataManagerClient();
+ final GSFileBrowserDialog dialog =
+ new GSFileBrowserDialog(Cytoscape.getDesktop(),
dataManagerClient,
+
GSFileBrowserDialog.DialogType.FILE_DELETION_DIALOG);
} catch (Exception ex) {
logger.error("GenomeSpace failed",ex);
}
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
2011-06-17 21:15:50 UTC (rev 25799)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/DownloadFileFromGenomeSpace.java
2011-06-17 23:19:01 UTC (rev 25800)
@@ -43,13 +43,14 @@
setPreferredMenu("File.Import.GenomeSpace");
}
- public void actionPerformed(ActionEvent e) {
+ public void actionPerformed(final ActionEvent e) {
try {
final GsSession client = GSUtils.getSession();
final DataManagerClient dataManagerClient =
client.getDataManagerClient();
final GSFileBrowserDialog dialog =
- new GSFileBrowserDialog(Cytoscape.getDesktop(),
dataManagerClient);
+ new GSFileBrowserDialog(Cytoscape.getDesktop(),
dataManagerClient,
+
GSFileBrowserDialog.DialogType.FILE_SELECTION_DIALOG);
final GSFileMetadata fileMetadata =
dialog.getSelectedFileMetadata();
if (fileMetadata == null)
return;
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoadNetworkFromGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoadNetworkFromGenomeSpace.java
2011-06-17 21:15:50 UTC (rev 25799)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoadNetworkFromGenomeSpace.java
2011-06-17 23:19:01 UTC (rev 25800)
@@ -51,7 +51,8 @@
acceptableExtensions.add("gml");
final GSFileBrowserDialog dialog =
new GSFileBrowserDialog(Cytoscape.getDesktop(),
dataManagerClient,
- acceptableExtensions);
+ acceptableExtensions,
+
GSFileBrowserDialog.DialogType.FILE_SELECTION_DIALOG);
final GSFileMetadata fileMetadata =
dialog.getSelectedFileMetadata();
if (fileMetadata == null)
return;
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoadSessionFromGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoadSessionFromGenomeSpace.java
2011-06-17 21:15:50 UTC (rev 25799)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/LoadSessionFromGenomeSpace.java
2011-06-17 23:19:01 UTC (rev 25800)
@@ -58,7 +58,8 @@
acceptableExtensions.add("cys");
final GSFileBrowserDialog dialog =
new GSFileBrowserDialog(Cytoscape.getDesktop(),
dataManagerClient,
- acceptableExtensions);
+ acceptableExtensions,
+
GSFileBrowserDialog.DialogType.FILE_SELECTION_DIALOG);
final GSFileMetadata fileMetadata =
dialog.getSelectedFileMetadata();
if (fileMetadata == null)
return;
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/SaveNetworkToGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/SaveNetworkToGenomeSpace.java
2011-06-17 21:15:50 UTC (rev 25799)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/SaveNetworkToGenomeSpace.java
2011-06-17 23:19:01 UTC (rev 25800)
@@ -20,11 +20,10 @@
import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
-import org.genomespace.client.ui.GSFileBrowserDialog;
import org.genomespace.datamanager.core.GSFileMetadata;
import org.genomespace.client.DataManagerClient;
import org.genomespace.client.GsSession;
-import org.genomespace.client.User;
+import org.genomespace.client.ui.GSFileBrowserDialog;
/**
@@ -62,7 +61,7 @@
final GSFileBrowserDialog dialog =
new GSFileBrowserDialog(Cytoscape.getDesktop(),
dataManagerClient,
acceptableExtensions,
- /* isSaveAsDialog = */
true);
+
GSFileBrowserDialog.DialogType.SAVE_AS_DIALOG);
String saveFileName = dialog.getSaveFileName();
if (saveFileName == null)
Modified:
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/SaveSessionToGenomeSpace.java
===================================================================
---
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/SaveSessionToGenomeSpace.java
2011-06-17 21:15:50 UTC (rev 25799)
+++
csplugins/trunk/ucsd/mes/genomespace-plugin/src/main/java/cytoscape/genomespace/SaveSessionToGenomeSpace.java
2011-06-17 23:19:01 UTC (rev 25800)
@@ -57,7 +57,7 @@
final GSFileBrowserDialog dialog =
new GSFileBrowserDialog(Cytoscape.getDesktop(),
dataManagerClient,
acceptableExtensions,
- /* isSaveAsDialog = */
true);
+
GSFileBrowserDialog.DialogType.SAVE_AS_DIALOG);
String saveFileName = dialog.getSaveFileName();
if (saveFileName == null)
return;
--
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.
