Author: mes
Date: 2010-11-20 15:28:01 -0800 (Sat, 20 Nov 2010)
New Revision: 22964
Added:
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/java/org/cytoscape/editor/internal/DropNodeViewTask.java
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNodeViewTaskFactoryImpl.java
Removed:
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropListener.java
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropListenerTask.java
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.xml
Log:
got drop working
Deleted:
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropListener.java
===================================================================
---
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropListener.java
2010-11-20 23:19:40 UTC (rev 22963)
+++
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropListener.java
2010-11-20 23:28:01 UTC (rev 22964)
@@ -1,30 +0,0 @@
-package org.cytoscape.editor.internal;
-
-
-import java.awt.Point;
-import java.awt.datatransfer.Transferable;
-
-import org.cytoscape.dnd.DropTaskFactory;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.work.TaskIterator;
-
-
-public class DropListener implements DropTaskFactory {
- private CyNetworkView view;
- private Transferable t;
- private Point pt;
-
- public void setDropInformation(CyNetworkView view, Transferable t,
Point pt) {
- System.out.println("Got drop: " + t);
- this.pt = pt;
- this.t = t;
- this.view = view;
- }
-
-
- public TaskIterator getTaskIterator() {
- // TODO Auto-generated method stub
- return new TaskIterator(new DropListenerTask(view, t, pt));
- }
-
-}
Deleted:
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropListenerTask.java
===================================================================
---
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropListenerTask.java
2010-11-20 23:19:40 UTC (rev 22963)
+++
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropListenerTask.java
2010-11-20 23:28:01 UTC (rev 22964)
@@ -1,45 +0,0 @@
-package org.cytoscape.editor.internal;
-
-
-import java.awt.Point;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-
-import org.cytoscape.task.AbstractNetworkViewTask;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.work.TaskMonitor;
-
-
-public class DropListenerTask extends AbstractNetworkViewTask {
- Transferable t;
- Point pt;
-
- public DropListenerTask(final CyNetworkView view) {
- super(view);
- }
-
- public DropListenerTask(CyNetworkView view, Transferable t, Point pt) {
- super(view);
- this.t = t;
- this.pt = pt;
- }
-
- @Override
- public void run(TaskMonitor tm) throws Exception {
- System.out.println ("DropListenerTask: transferrable = " + t +
- ", location = " + pt);
-
- DataFlavor[] dfl = t.getTransferDataFlavors();
-
- for (DataFlavor d : dfl) {
- System.out.println("Item dropped of Mime Type: " +
d.getMimeType());
- System.out.println("Mime subtype is: " +
d.getSubType());
- System.out.println("Mime class is: " +
d.getRepresentationClass());
-
- Class<?> mimeClass = d.getRepresentationClass();
- }
- }
- @Override
- public void cancel() {
- }
-}
Added:
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
(rev 0)
+++
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTask.java
2010-11-20 23:28:01 UTC (rev 22964)
@@ -0,0 +1,40 @@
+package org.cytoscape.editor.internal;
+
+
+import java.awt.Point;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+
+import org.cytoscape.task.AbstractNetworkViewTask;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.work.TaskMonitor;
+
+
+public class DropNetworkViewTask extends AbstractNetworkViewTask {
+
+ private final Transferable t;
+ private final Point pt;
+
+ public DropNetworkViewTask(CyNetworkView view, Transferable t, Point
pt) {
+ super(view);
+ this.t = t;
+ this.pt = pt;
+ }
+
+ @Override
+ public void run(TaskMonitor tm) throws Exception {
+ System.out.println ("DropNetworkViewTask: transferrable = " + t
+
+ ", location = " + pt);
+ /*
+ DataFlavor[] dfl = t.getTransferDataFlavors();
+
+ for (DataFlavor d : dfl) {
+ System.out.println("Item dropped of Mime Type: " +
d.getMimeType());
+ System.out.println("Mime subtype is: " +
d.getSubType());
+ System.out.println("Mime class is: " +
d.getRepresentationClass());
+
+ Class<?> mimeClass = d.getRepresentationClass();
+ }
+ */
+ }
+}
Added:
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
(rev 0)
+++
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNetworkViewTaskFactoryImpl.java
2010-11-20 23:28:01 UTC (rev 22964)
@@ -0,0 +1,29 @@
+package org.cytoscape.editor.internal;
+
+
+import java.awt.Point;
+import java.awt.datatransfer.Transferable;
+
+import org.cytoscape.dnd.DropNetworkViewTaskFactory;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.work.TaskIterator;
+
+
+public class DropNetworkViewTaskFactoryImpl implements
DropNetworkViewTaskFactory {
+ private CyNetworkView view;
+ private Transferable t;
+ private Point pt;
+
+ public void setNetworkView(CyNetworkView view) {
+ this.view = view;
+ }
+
+ public void setDropInformation(Transferable t, Point pt) {
+ this.pt = pt;
+ this.t = t;
+ }
+
+ public TaskIterator getTaskIterator() {
+ return new TaskIterator(new DropNetworkViewTask(view, t, pt));
+ }
+}
Added:
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNodeViewTask.java
===================================================================
---
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNodeViewTask.java
(rev 0)
+++
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNodeViewTask.java
2010-11-20 23:28:01 UTC (rev 22964)
@@ -0,0 +1,42 @@
+package org.cytoscape.editor.internal;
+
+
+import java.awt.Point;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+
+import org.cytoscape.task.AbstractNodeViewTask;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.work.TaskMonitor;
+
+
+public class DropNodeViewTask extends AbstractNodeViewTask {
+
+ private final Transferable t;
+ private final Point pt;
+
+ public DropNodeViewTask(View<CyNode> nv, CyNetworkView view,
Transferable t, Point pt) {
+ super(nv,view);
+ this.t = t;
+ this.pt = pt;
+ }
+
+ @Override
+ public void run(TaskMonitor tm) throws Exception {
+ System.out.println ("DropNodeViewTask: transferrable = " + t +
+ ", location = " + pt);
+ /*
+ DataFlavor[] dfl = t.getTransferDataFlavors();
+
+ for (DataFlavor d : dfl) {
+ System.out.println("Item dropped of Mime Type: " +
d.getMimeType());
+ System.out.println("Mime subtype is: " +
d.getSubType());
+ System.out.println("Mime class is: " +
d.getRepresentationClass());
+
+ Class<?> mimeClass = d.getRepresentationClass();
+ }
+ */
+ }
+}
Added:
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNodeViewTaskFactoryImpl.java
===================================================================
---
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNodeViewTaskFactoryImpl.java
(rev 0)
+++
core3/editor-impl/trunk/src/main/java/org/cytoscape/editor/internal/DropNodeViewTaskFactoryImpl.java
2010-11-20 23:28:01 UTC (rev 22964)
@@ -0,0 +1,33 @@
+package org.cytoscape.editor.internal;
+
+
+import java.awt.Point;
+import java.awt.datatransfer.Transferable;
+
+import org.cytoscape.dnd.DropNodeViewTaskFactory;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.View;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.work.TaskIterator;
+
+
+public class DropNodeViewTaskFactoryImpl implements DropNodeViewTaskFactory {
+ private View<CyNode> nv;
+ private CyNetworkView view;
+ private Transferable t;
+ private Point pt;
+
+ public void setNodeView(View<CyNode> nv, CyNetworkView view) {
+ this.view = view;
+ this.nv = nv;
+ }
+
+ public void setDropInformation(Transferable t, Point pt) {
+ this.pt = pt;
+ this.t = t;
+ }
+
+ public TaskIterator getTaskIterator() {
+ return new TaskIterator(new DropNodeViewTask(nv, view, t, pt));
+ }
+}
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
2010-11-20 23:19:40 UTC (rev 22963)
+++
core3/editor-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-11-20 23:28:01 UTC (rev 22964)
@@ -15,10 +15,17 @@
</osgi:service-properties>
</osgi:service>
- <osgi:service id="dropListenerService" ref="dropListener"
- interface="org.cytoscape.dnd.DropTaskFactory">
+ <osgi:service id="dropNetworkViewTaskFactoryService"
ref="dropNetworkViewTaskFactory"
+ interface="org.cytoscape.dnd.DropNetworkViewTaskFactory">
<osgi:service-properties>
- <entry key="title" value="Drop Listener Service" />
+ <entry key="title" value="Drop NetworkView TaskFactory Service" />
</osgi:service-properties>
</osgi:service>
+
+ <osgi:service id="dropNodeViewTaskFactoryService"
ref="dropNodeViewTaskFactory"
+ interface="org.cytoscape.dnd.DropNodeViewTaskFactory">
+ <osgi:service-properties>
+ <entry key="title" value="Drop NodeView TaskFactory Service" />
+ </osgi:service-properties>
+ </osgi:service>
</beans>
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
2010-11-20 23:19:40 UTC (rev 22963)
+++
core3/editor-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-11-20 23:28:01 UTC (rev 22964)
@@ -13,9 +13,12 @@
class="org.cytoscape.editor.internal.SIFInterpreterTaskFactory">
</bean>
- <bean id="dropListener"
- class="org.cytoscape.editor.internal.DropListener">
+ <bean id="dropNetworkViewTaskFactory"
+
class="org.cytoscape.editor.internal.DropNetworkViewTaskFactoryImpl">
</bean>
+ <bean id="dropNodeViewTaskFactory"
+
class="org.cytoscape.editor.internal.DropNodeViewTaskFactoryImpl">
+ </bean>
</beans>
--
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.
