Author: kono
Date: 2012-07-30 15:28:42 -0700 (Mon, 30 Jul 2012)
New Revision: 30043
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/network/CyNetworkViewWriter.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTask.java
Log:
Default values are set for List Tunables.
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-07-30 21:34:55 UTC (rev 30042)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/TunableAbstractCyWriter.java
2012-07-30 22:28:42 UTC (rev 30043)
@@ -2,13 +2,13 @@
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import org.cytoscape.io.CyFileFilter;
+import org.cytoscape.io.write.CyWriterFactory;
import org.cytoscape.io.write.CyWriterManager;
-import org.cytoscape.io.write.CyWriterFactory;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.TunableValidator;
import org.cytoscape.work.util.ListSingleSelection;
@@ -42,7 +42,8 @@
*/
public TunableAbstractCyWriter(T writerManager) {
super(writerManager);
- options = new ListSingleSelection<String>(new
ArrayList<String>(getFileFilterDescriptions()));
+ final List<String> availableFormats = new
ArrayList<String>(getFileFilterDescriptions());
+ options = new ListSingleSelection<String>(availableFormats);
}
@Override
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-07-30 21:34:55 UTC (rev 30042)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriter.java
2012-07-30 22:28:42 UTC (rev 30043)
@@ -30,7 +30,15 @@
if (view == null)
throw new NullPointerException("View is null.");
+
this.view = view;
+ // Pick SIF as a default file format
+ for(String fileTypeDesc: this.getFileFilterDescriptions()) {
+ if(fileTypeDesc.contains("SIF")) {
+ this.options.setSelectedValue(fileTypeDesc);
+ break;
+ }
+ }
}
/**
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
2012-07-30 21:34:55 UTC (rev 30042)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
2012-07-30 22:28:42 UTC (rev 30043)
@@ -43,7 +43,7 @@
if(tableType == null)
throw new IllegalArgumentException("The specified type
" + type + " is not acceptable.");
ListSingleSelection<TableType> tableTypes = new
ListSingleSelection<TableType>(tableType);
- tableTypes.setSelectedValue( tableType);
+ tableTypes.setSelectedValue(tableType);
List<String> networkNames = new ArrayList<String>();
for(CyNetwork net: networksList){
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTask.java
2012-07-30 21:34:55 UTC (rev 30042)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/vizmap/ApplyVisualStyleTask.java
2012-07-30 22:28:42 UTC (rev 30043)
@@ -34,7 +34,7 @@
final List<VisualStyle> vsList = new
ArrayList<VisualStyle>(vmm.getAllVisualStyles());
styles = new ListSingleSelection<VisualStyle>(vsList);
- if (vsList.size() > 0)
+ if (!vsList.isEmpty())
styles.setSelectedValue(vsList.get(0));
}
--
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.
