Author: slotia
Date: 2012-08-09 18:05:06 -0700 (Thu, 09 Aug 2012)
New Revision: 30152
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/layout/ApplyPreferredLayoutTaskFactoryImpl.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:
Removal of EventAdmin stuff
Modified: core3/impl/trunk/core-task-impl/pom.xml
===================================================================
--- core3/impl/trunk/core-task-impl/pom.xml 2012-08-10 00:29:46 UTC (rev
30151)
+++ core3/impl/trunk/core-task-impl/pom.xml 2012-08-10 01:05:06 UTC (rev
30152)
@@ -127,12 +127,6 @@
<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 -->
<dependency>
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-10 00:29:46 UTC (rev 30151)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-08-10 01:05:06 UTC (rev 30152)
@@ -183,7 +183,6 @@
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 {
@@ -226,11 +225,10 @@
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, eventAdmin);
+ LoadNetworkFileTaskFactoryImpl loadNetworkFileTaskFactory = new
LoadNetworkFileTaskFactoryImpl(cyNetworkReaderManagerServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef,cyPropertyServiceRef,cyNetworkNamingServiceRef,
tunableSetterServiceRef, visualMappingManagerServiceRef);
LoadNetworkURLTaskFactoryImpl loadNetworkURLTaskFactory = new
LoadNetworkURLTaskFactoryImpl(cyNetworkReaderManagerServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef,cyPropertyServiceRef,cyNetworkNamingServiceRef,streamUtilRef,
synchronousTaskManagerServiceRef, tunableSetterServiceRef,
visualMappingManagerServiceRef);
DeleteSelectedNodesAndEdgesTaskFactoryImpl
deleteSelectedNodesAndEdgesTaskFactory = new
DeleteSelectedNodesAndEdgesTaskFactoryImpl(undoSupportServiceRef,cyNetworkViewManagerServiceRef,visualMappingManagerServiceRef,cyEventHelperRef);
@@ -280,7 +278,7 @@
ExportNetworkImageTaskFactoryImpl exportNetworkImageTaskFactory
= new
ExportNetworkImageTaskFactoryImpl(viewWriterManagerServiceRef,cyApplicationManagerServiceRef);
ExportNetworkViewTaskFactoryImpl exportNetworkViewTaskFactory =
new ExportNetworkViewTaskFactoryImpl(networkViewWriterManagerServiceRef,
tunableSetterServiceRef);
ExportSelectedTableTaskFactoryImpl
exportCurrentTableTaskFactory = new
ExportSelectedTableTaskFactoryImpl(cyTableWriterManagerRef,
cyTableManagerServiceRef, cyNetworkManagerServiceRef);
- ApplyPreferredLayoutTaskFactoryImpl
applyPreferredLayoutTaskFactory = new
ApplyPreferredLayoutTaskFactoryImpl(cyLayoutsServiceRef,cyPropertyServiceRef,
eventAdmin);
+ ApplyPreferredLayoutTaskFactoryImpl
applyPreferredLayoutTaskFactory = new
ApplyPreferredLayoutTaskFactoryImpl(cyLayoutsServiceRef,cyPropertyServiceRef);
DeleteColumnTaskFactoryImpl deleteColumnTaskFactory = new
DeleteColumnTaskFactoryImpl(undoSupportServiceRef);
RenameColumnTaskFactoryImpl renameColumnTaskFactory = new
RenameColumnTaskFactoryImpl(undoSupportServiceRef, tunableSetterServiceRef);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/ApplyPreferredLayoutTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/ApplyPreferredLayoutTaskFactoryImpl.java
2012-08-10 00:29:46 UTC (rev 30151)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/ApplyPreferredLayoutTaskFactoryImpl.java
2012-08-10 01:05:06 UTC (rev 30152)
@@ -13,35 +13,20 @@
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.TaskIterator;
-import org.osgi.service.event.EventAdmin;
-import org.osgi.service.event.Event;
-
public class ApplyPreferredLayoutTaskFactoryImpl extends
AbstractNetworkViewCollectionTaskFactory implements
ApplyPreferredLayoutTaskFactory {
private final CyLayoutAlgorithmManager layouts;
private final Properties props;
- private final EventAdmin eventAdmin;
public ApplyPreferredLayoutTaskFactoryImpl(final
CyLayoutAlgorithmManager layouts, final CyProperty<Properties> p) {
- this(layouts, p, null);
- }
-
- public ApplyPreferredLayoutTaskFactoryImpl(final
CyLayoutAlgorithmManager layouts, final CyProperty<Properties> p, final
EventAdmin eventAdmin) {
this.layouts = layouts;
this.props = p.getProperties();
- this.eventAdmin = eventAdmin;
}
@Override
public TaskIterator createTaskIterator(final Collection<CyNetworkView>
networkViews) {
- if (eventAdmin != null) {
- final Map<String,String> eventProps = new HashMap<String,String>();
- eventProps.put("action", "apply preferred layout invoked");
- final Event event = new Event("org/cytoscape/gettingstarted",
eventProps);
- eventAdmin.postEvent(event);
- }
return new TaskIterator(2, new
ApplyPreferredLayoutTask(networkViews, layouts, props));
}
}
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-10 00:29:46 UTC (rev 30151)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskFactoryImpl.java
2012-08-10 01:05:06 UTC (rev 30152)
@@ -46,10 +46,6 @@
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.
*/
@@ -64,11 +60,10 @@
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, final EventAdmin eventAdmin) {
+ CyNetworkNaming cyNetworkNaming, TunableSetter
tunableSetter, final VisualMappingManager vmm) {
this.mgr = mgr;
this.netmgr = netmgr;
@@ -77,16 +72,10 @@
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-10 00:29:46 UTC (rev 30151)
+++
core3/impl/trunk/core-task-impl/src/test/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTaskTest.java
2012-08-10 01:05:06 UTC (rev 30152)
@@ -62,7 +62,7 @@
@Test
public void testRun() throws Exception {
- TaskFactory factory = new LoadNetworkFileTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil, ts, vmm, null);
+ TaskFactory factory = new LoadNetworkFileTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil, ts, vmm);
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, null);
+ TaskFactory factory = new LoadNetworkFileTaskFactoryImpl(mgr,
netmgr, networkViewManager, props, namingUtil, ts, vmm);
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.
