Author: mes
Date: 2012-03-05 17:26:32 -0800 (Mon, 05 Mar 2012)
New Revision: 28434
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/TunableAbstractCyWriter.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/ViewWriter.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriter.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/CyTableWriter.java
Log:
made tunable UI a bit nicer for export, forcing users to first select a format,
then a file.
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/TunableAbstractCyWriter.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/TunableAbstractCyWriter.java
2012-03-06 01:19:07 UTC (rev 28433)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/TunableAbstractCyWriter.java
2012-03-06 01:26:32 UTC (rev 28434)
@@ -21,17 +21,6 @@
*/
public abstract class TunableAbstractCyWriter<T extends CyWriterManager>
extends AbstractCyWriter<T> implements
TunableValidator {
- /**
- * This method gets the file to be written. This method should not
- * be called directly, but rather handled by the {@link
org.cytoscape.work.Tunable}
- * processing. This method is the "getter" portion of a
- * getter/setter tunable method pair.
- * @return The file to be written.
- */
- @Tunable(description="Select the output file name")
- public File getOutputFile() {
- return outputFile;
- }
/**
* The list of file type options generated by the file types
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/ViewWriter.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/ViewWriter.java
2012-03-06 01:19:07 UTC (rev 28433)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/ViewWriter.java
2012-03-06 01:26:32 UTC (rev 28434)
@@ -47,7 +47,7 @@
return writerManager.getWriter(view,re,filter,file);
}
- @Tunable(description="Save Image As:",
params="fileCategory=image;input=false")
+ @Tunable(description="Save Image As:",
params="fileCategory=image;input=false", dependsOn="options!=")
public File getOutputFile() {
return outputFile;
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriter.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriter.java
2012-03-06 01:19:07 UTC (rev 28433)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriter.java
2012-03-06 01:26:32 UTC (rev 28434)
@@ -43,8 +43,8 @@
return writerManager.getWriter(view,filter,file);
}
- @Tunable(description="Save Network As:",
params="fileCategory=network;input=false")
- @Override public File getOutputFile() {
+ @Tunable(description="Save Network As:",
params="fileCategory=network;input=false", dependsOn="options!=")
+ public File getOutputFile() {
return outputFile;
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/CyTableWriter.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/CyTableWriter.java
2012-03-06 01:19:07 UTC (rev 28433)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/CyTableWriter.java
2012-03-06 01:26:32 UTC (rev 28434)
@@ -9,6 +9,7 @@
import org.cytoscape.model.CyTable;
import org.cytoscape.task.internal.export.TunableAbstractCyWriter;
import org.cytoscape.work.ProvidesTitle;
+import org.cytoscape.work.Tunable;
/**
* A utility Task implementation specifically for writing {@link
org.cytoscape.model.CyTable} objects.
@@ -38,6 +39,11 @@
return writerManager.getWriter(table,filter,file);
}
+
+ @Tunable(description="Save Table As:",
params="fileCategory=table;input=false", dependsOn="options!=")
+ public File getOutputFile() {
+ return outputFile;
+ }
@ProvidesTitle
public String getTitle() {
--
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.
