Author: slotia
Date: 2012-08-06 14:52:12 -0700 (Mon, 06 Aug 2012)
New Revision: 30106
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/layout/ApplyPreferredLayoutTaskFactoryImpl.java
Log:
Added notification of applied preferred layout
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-06 21:43:34 UTC (rev 30105)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-08-06 21:52:12 UTC (rev 30106)
@@ -280,7 +280,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);
+ ApplyPreferredLayoutTaskFactoryImpl
applyPreferredLayoutTaskFactory = new
ApplyPreferredLayoutTaskFactoryImpl(cyLayoutsServiceRef,cyPropertyServiceRef,
eventAdmin);
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-06 21:43:34 UTC (rev 30105)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/ApplyPreferredLayoutTaskFactoryImpl.java
2012-08-06 21:52:12 UTC (rev 30106)
@@ -2,6 +2,8 @@
import java.util.Collection;
import java.util.Properties;
+import java.util.Map;
+import java.util.HashMap;
import org.cytoscape.property.CyProperty;
import org.cytoscape.task.AbstractNetworkViewCollectionTaskFactory;
@@ -11,20 +13,35 @@
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));
}
}
--
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.
