Author: slotia
Date: 2012-08-03 15:54:29 -0700 (Fri, 03 Aug 2012)
New Revision: 30098
Modified:
core3/impl/trunk/core-task-impl/pom.xml
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskTest.java
Log:
Added notification to LoadNetworkFileTaskFactoryImpl
Modified: core3/impl/trunk/core-task-impl/pom.xml
===================================================================
--- core3/impl/trunk/core-task-impl/pom.xml 2012-08-03 22:51:44 UTC (rev
30097)
+++ core3/impl/trunk/core-task-impl/pom.xml 2012-08-03 22:54:29 UTC (rev
30098)
@@ -127,6 +127,11 @@
<groupId>org.cytoscape</groupId>
<artifactId>datasource-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>1.2.14</version>
+ </dependency>
<!-- Test Dependencies -->
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-08-03 22:51:44 UTC (rev 30097)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-08-03 22:54:29 UTC (rev 30098)
@@ -183,6 +183,7 @@
import org.cytoscape.work.TunableSetter;
import org.cytoscape.work.undo.UndoSupport;
import org.osgi.framework.BundleContext;
+import org.osgi.service.event.EventAdmin;
public class CyActivator extends AbstractCyActivator {
@@ -225,10 +226,11 @@
CyGroupManager cyGroupManager = getService(bc,
CyGroupManager.class);
CyGroupFactory cyGroupFactory = getService(bc,
CyGroupFactory.class);
+ final EventAdmin eventAdmin = getService(bc, EventAdmin.class);
LoadVizmapFileTaskFactoryImpl loadVizmapFileTaskFactory = new
LoadVizmapFileTaskFactoryImpl(vizmapReaderManagerServiceRef,visualMappingManagerServiceRef,synchronousTaskManagerServiceRef,
tunableSetterServiceRef);
- LoadNetworkFileTaskFactoryImpl loadNetworkFileTaskFactory = new
LoadNetworkFileTaskFactoryImpl(cyNetworkReaderManagerServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef,cyPropertyServiceRef,cyNetworkNamingServiceRef,
tunableSetterServiceRef, visualMappingManagerServiceRef);
+ LoadNetworkFileTaskFactoryImpl loadNetworkFileTaskFactory = new
LoadNetworkFileTaskFactoryImpl(cyNetworkReaderManagerServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef,cyPropertyServiceRef,cyNetworkNamingServiceRef,
tunableSetterServiceRef, visualMappingManagerServiceRef, eventAdmin);
LoadNetworkURLTaskFactoryImpl loadNetworkURLTaskFactory = new
LoadNetworkURLTaskFactoryImpl(cyNetworkReaderManagerServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef,cyPropertyServiceRef,cyNetworkNamingServiceRef,streamUtilRef,
synchronousTaskManagerServiceRef, tunableSetterServiceRef,
visualMappingManagerServiceRef);
DeleteSelectedNodesAndEdgesTaskFactoryImpl
deleteSelectedNodesAndEdgesTaskFactory = new
DeleteSelectedNodesAndEdgesTaskFactoryImpl(undoSupportServiceRef,cyNetworkViewManagerServiceRef,visualMappingManagerServiceRef,cyEventHelperRef);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskFactoryImpl.java
2012-08-03 22:51:44 UTC (rev 30097)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskFactoryImpl.java
2012-08-03 22:54:29 UTC (rev 30098)
@@ -46,7 +46,10 @@
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TunableSetter;
+import org.osgi.service.event.EventAdmin;
+import org.osgi.service.event.Event;
+
/**
* Task to load a new network.
*/
@@ -61,9 +64,11 @@
private final TunableSetter tunableSetter;
private final VisualMappingManager vmm;
+ private final EventAdmin eventAdmin;
+
public LoadNetworkFileTaskFactoryImpl(CyNetworkReaderManager mgr,
CyNetworkManager netmgr,
final CyNetworkViewManager networkViewManager,
CyProperty<Properties> cyProp,
- CyNetworkNaming cyNetworkNaming, TunableSetter
tunableSetter, final VisualMappingManager vmm) {
+ CyNetworkNaming cyNetworkNaming, TunableSetter
tunableSetter, final VisualMappingManager vmm, final EventAdmin eventAdmin) {
this.mgr = mgr;
this.netmgr = netmgr;
@@ -72,10 +77,16 @@
this.cyNetworkNaming = cyNetworkNaming;
this.tunableSetter = tunableSetter;
this.vmm = vmm;
+ this.eventAdmin = eventAdmin;
}
public TaskIterator createTaskIterator() {
// Load, visualize, and layout.
+ if (eventAdmin != null) {
+ final Map<String,String> eventProps = new HashMap<String,String>();
+ eventProps.put("action", "network file task invoked");
+ eventAdmin.postEvent(new Event("org/cytoscape/gettingstarted",
eventProps));
+ }
return new TaskIterator(3, new LoadNetworkFileTask(mgr, netmgr,
networkViewManager, props, cyNetworkNaming, vmm));
}
Modified:
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskTest.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskTest.java
2012-08-03 22:51:44 UTC (rev 30097)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskTest.java
2012-08-03 22:54:29 UTC (rev 30098)
@@ -62,7 +62,7 @@
@Test
public void testRun() throws Exception {
- TaskFactory factory = new LoadNetworkFileTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil, ts, vmm);
+ TaskFactory factory = new LoadNetworkFileTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil, ts, vmm, null);
TaskIterator ti = factory.createTaskIterator();
TaskMonitor tm = mock(TaskMonitor.class);
boolean first = true;
@@ -81,7 +81,7 @@
@Test(expected = NullPointerException.class)
public void testNullFile() throws Exception {
- TaskFactory factory = new LoadNetworkFileTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil, ts, vmm);
+ TaskFactory factory = new LoadNetworkFileTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil, ts, vmm, null);
TaskIterator ti = factory.createTaskIterator();
TaskMonitor tm = mock(TaskMonitor.class);
boolean first = true;
--
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.
