Author: mes
Date: 2011-06-21 15:37:57 -0700 (Tue, 21 Jun 2011)
New Revision: 25851
Modified:
core3/editor-impl/trunk/pom.xml
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTask.java
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTaskFactoryImpl.java
core3/editor-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/editor-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
updated to for event-api changes that rely on payload events instead of
microlisteners
Modified: core3/editor-impl/trunk/pom.xml
===================================================================
--- core3/editor-impl/trunk/pom.xml 2011-06-21 22:37:40 UTC (rev 25850)
+++ core3/editor-impl/trunk/pom.xml 2011-06-21 22:37:57 UTC (rev 25851)
@@ -99,8 +99,13 @@
<!-- Cytoscape modules -->
<dependency>
<groupId>org.cytoscape</groupId>
+ <artifactId>event-api</artifactId>
+ <version>3.0.0-alpha6-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
- <version>3.0.0-alpha3</version>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTask.java
===================================================================
---
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTask.java
2011-06-21 22:37:40 UTC (rev 25850)
+++
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTask.java
2011-06-21 22:37:57 UTC (rev 25851)
@@ -15,6 +15,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.dnd.DropUtil;
+import org.cytoscape.event.CyEventHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -23,13 +24,15 @@
private final Transferable t;
private final Point2D xformPt;
+ private final CyEventHelper eh;
private static final Logger logger =
LoggerFactory.getLogger(DropNetworkViewTask.class);
- public DropNetworkViewTask(CyNetworkView view, Transferable t, Point2D
xformPt) {
+ public DropNetworkViewTask(CyNetworkView view, Transferable t, Point2D
xformPt, CyEventHelper eh) {
super(view);
this.t = t;
this.xformPt = xformPt;
+ this.eh = eh;
}
@Override
@@ -41,6 +44,7 @@
CyNetwork net = view.getModel();
CyNode n = net.addNode();
+ eh.flushPayloadEvents();
View<CyNode> nv = view.getNodeView(n);
nv.setVisualProperty(MinimalVisualLexicon.NODE_X_LOCATION,xformPt.getX());
nv.setVisualProperty(MinimalVisualLexicon.NODE_Y_LOCATION,xformPt.getY());
Modified:
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTaskFactoryImpl.java
===================================================================
---
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTaskFactoryImpl.java
2011-06-21 22:37:40 UTC (rev 25850)
+++
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTaskFactoryImpl.java
2011-06-21 22:37:57 UTC (rev 25851)
@@ -5,6 +5,7 @@
import java.awt.datatransfer.Transferable;
import org.cytoscape.dnd.DropNetworkViewTaskFactory;
+import org.cytoscape.event.CyEventHelper;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.TaskIterator;
@@ -14,6 +15,11 @@
private Transferable t;
private Point2D javaPt;
private Point2D xformPt;
+ private final CyEventHelper eh;
+
+ public DropNetworkViewTaskFactoryImpl(CyEventHelper eh) {
+ this.eh = eh;
+ }
public void setNetworkView(CyNetworkView view) {
this.view = view;
@@ -26,6 +32,6 @@
}
public TaskIterator getTaskIterator() {
- return new TaskIterator(new DropNetworkViewTask(view, t,
xformPt));
+ return new TaskIterator(new DropNetworkViewTask(view, t,
xformPt, eh));
}
}
Modified:
core3/editor-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/editor-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-06-21 22:37:40 UTC (rev 25850)
+++
core3/editor-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-06-21 22:37:57 UTC (rev 25851)
@@ -13,6 +13,9 @@
<osgi:reference id="newEmptyNetworkViewFactoryServiceRef"
interface="org.cytoscape.task.creation.NewEmptyNetworkViewFactory"/>
+
+ <osgi:reference id="cyEventHelperServiceRef"
+ interface="org.cytoscape.event.CyEventHelper"/>
<osgi:service id="editorCytoPanelComponentService"
ref="editorCytoPanelComponent"
interface="org.cytoscape.application.swing.CytoPanelComponent"/>
Modified:
core3/editor-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/editor-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-21 22:37:40 UTC (rev 25850)
+++
core3/editor-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-21 22:37:57 UTC (rev 25851)
@@ -15,6 +15,7 @@
<bean id="dropNetworkViewTaskFactory"
class="org.cytoscape.editor.internal.DropNetworkViewTaskFactoryImpl">
+ <constructor-arg ref="cyEventHelperServiceRef" />
</bean>
<bean id="dropNodeViewTaskFactory"
--
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.
