Author: pwang
Date: 2012-08-20 16:02:59 -0700 (Mon, 20 Aug 2012)
New Revision: 30237
Modified:
core3/api/trunk/datasource-api/src/main/java/org/cytoscape/io/datasource/DataSourceManager.java
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/io/datasource/internal/DataSourceManagerImpl.java
Log:
Add a new method
Modified:
core3/api/trunk/datasource-api/src/main/java/org/cytoscape/io/datasource/DataSourceManager.java
===================================================================
---
core3/api/trunk/datasource-api/src/main/java/org/cytoscape/io/datasource/DataSourceManager.java
2012-08-20 22:47:53 UTC (rev 30236)
+++
core3/api/trunk/datasource-api/src/main/java/org/cytoscape/io/datasource/DataSourceManager.java
2012-08-20 23:02:59 UTC (rev 30237)
@@ -35,8 +35,14 @@
* @return all data sources
*/
Collection<DataSource> getAllDataSources();
-
+
/**
+ * Returns all data categories
+ * @return all Data Categories
+ */
+ Collection<DataCategory> getAllCategories();
+
+ /**
* Remove a DataSource from the DataSourceManager
* @return true if the dataSource is removed successfully
*/
Modified:
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/io/datasource/internal/DataSourceManagerImpl.java
===================================================================
---
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/io/datasource/internal/DataSourceManagerImpl.java
2012-08-20 22:47:53 UTC (rev 30236)
+++
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/io/datasource/internal/DataSourceManagerImpl.java
2012-08-20 23:02:59 UTC (rev 30237)
@@ -55,6 +55,9 @@
@Override
public Collection<DataSource> getDataSources(DataCategory category) {
+ if (this.dataSourceMap.get(category) == null){
+ return new HashSet<DataSource>();
+ }
return this.dataSourceMap.get(category).values();
}
@@ -92,6 +95,11 @@
return sources;
}
+ @Override
+ public Collection<DataCategory> getAllCategories(){
+ return this.dataSourceMap.keySet();
+ }
+
@Override
public boolean deleteDataSource(DataSource pDataSource){
--
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.
