Author: pwang
Date: 2012-04-20 16:40:45 -0700 (Fri, 20 Apr 2012)
New Revision: 28934
Removed:
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/datasource/internal/CyActivator.java
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/datasource/internal/DataSourceManagerImpl.java
Log:
Fixed bug#885
Deleted:
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/datasource/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/datasource/internal/CyActivator.java
2012-04-20 23:28:49 UTC (rev 28933)
+++
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/datasource/internal/CyActivator.java
2012-04-20 23:40:45 UTC (rev 28934)
@@ -1,35 +0,0 @@
-package org.cytoscape.datasource.internal;
-
-import java.util.Properties;
-import java.util.Set;
-
-import
org.cytoscape.io.datasource.internal.bookmarks.BookmarkDataSourceBuilder;
-import org.cytoscape.io.datasource.DataSource;
-import org.cytoscape.io.datasource.DataSourceManager;
-import org.cytoscape.property.CyProperty;
-import org.cytoscape.property.bookmark.Bookmarks;
-import org.cytoscape.property.bookmark.BookmarksUtil;
-import org.cytoscape.service.util.AbstractCyActivator;
-import org.osgi.framework.BundleContext;
-
-public class CyActivator extends AbstractCyActivator {
- public CyActivator() {
- super();
- }
-
- public void start(BundleContext bc) {
- // Import required Services
- CyProperty<Bookmarks> bookmarkServiceRef = getService(bc,
CyProperty.class, "(cyPropertyName=bookmarks)");
- BookmarksUtil bookmarksUtilServiceRef = getService(bc,
BookmarksUtil.class);
-
- DataSourceManager dataSourceManager = new
DataSourceManagerImpl();
- registerService(bc, dataSourceManager, DataSourceManager.class,
new Properties());
- registerServiceListener(bc, dataSourceManager, "addDataSource",
"removeDataSource", DataSource.class);
-
- BookmarkDataSourceBuilder bkBuilder = new
BookmarkDataSourceBuilder(bookmarkServiceRef, bookmarksUtilServiceRef);
- final Set<DataSource> bkDataSources =
bkBuilder.getDataSources();
- for (final DataSource ds : bkDataSources)
- registerService(bc, ds, DataSource.class, new
Properties());
-
- }
-}
\ No newline at end of file
Deleted:
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/datasource/internal/DataSourceManagerImpl.java
===================================================================
---
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/datasource/internal/DataSourceManagerImpl.java
2012-04-20 23:28:49 UTC (rev 28933)
+++
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/datasource/internal/DataSourceManagerImpl.java
2012-04-20 23:40:45 UTC (rev 28934)
@@ -1,68 +0,0 @@
-package org.cytoscape.datasource.internal;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.cytoscape.io.DataCategory;
-import org.cytoscape.io.datasource.DataSource;
-import org.cytoscape.io.datasource.DataSourceManager;
-
-public final class DataSourceManagerImpl implements DataSourceManager {
-
-
- private final Map<String, DataSource> dataSourceMap;
-
- DataSourceManagerImpl() {
- this.dataSourceMap = new HashMap<String, DataSource>();
- }
-
- /**
- * Will be used by OSGi services
- * @param datasource
- */
- public void addDataSource(final DataSource datasource, Map metadata) {
- if(datasource == null)
- return;
-
- dataSourceMap.put(datasource.getName(), datasource);
- }
-
- public void removeDataSource(final DataSource datasource, Map metadata)
{
- if(datasource == null)
- return;
-
- dataSourceMap.remove(datasource.getName());
- }
-
-
- @Override
- public Collection<DataSource> getDataSources(DataCategory category) {
- final Set<DataSource> sources = new HashSet<DataSource>();
- for(DataSource source: dataSourceMap.values()) {
- if(source.getDataCategory() == category)
- sources.add(source);
- }
-
- return sources;
- }
-
- @Override
- public Collection<DataSource> getDataSources(String providerName) {
- final Set<DataSource> sources = new HashSet<DataSource>();
- for(DataSource source: dataSourceMap.values()) {
- if(source.getProvider().equals(providerName))
- sources.add(source);
- }
-
- return sources;
- }
-
- @Override
- public Collection<DataSource> getAllDataSources() {
- return dataSourceMap.values();
- }
-
-}
--
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.
