Author: mes
Date: 2010-11-20 15:19:07 -0800 (Sat, 20 Nov 2010)
New Revision: 22962
Added:
core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropNetworkViewTaskFactory.java
core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropNodeViewTaskFactory.java
Removed:
core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropTaskFactory.java
Modified:
core3/dnd-api/trunk/pom.xml
Log:
clarified DnD api
Modified: core3/dnd-api/trunk/pom.xml
===================================================================
--- core3/dnd-api/trunk/pom.xml 2010-11-20 01:19:42 UTC (rev 22961)
+++ core3/dnd-api/trunk/pom.xml 2010-11-20 23:19:07 UTC (rev 22962)
@@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.cytoscape</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
</parent>
<properties>
@@ -31,23 +31,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <optimize>true</optimize>
- <showWarnings>true</showWarnings>
- <showDeprecation>true</showDeprecation>
- <compilerArguments>
- <Xlint:all></Xlint:all>
- <Xlint:-path></Xlint:-path>
- <Xmaxwarns>10000</Xmaxwarns>
- <Xmaxerrs>10000</Xmaxerrs>
- </compilerArguments>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
@@ -59,7 +42,6 @@
<version>1.4</version>
<extensions>true</extensions>
</plugin>
- <!-- Generates the OSGi metadata based on the osgi.bnd
file. -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -108,24 +90,9 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>work-api</artifactId>
+ <artifactId>core-task-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
-
-
- <!-- dependencies specifically for unit testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>test-support</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Copied:
core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropNetworkViewTaskFactory.java
(from rev 22836,
core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropTaskFactory.java)
===================================================================
---
core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropNetworkViewTaskFactory.java
(rev 0)
+++
core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropNetworkViewTaskFactory.java
2010-11-20 23:19:07 UTC (rev 22962)
@@ -0,0 +1,23 @@
+
+package org.cytoscape.dnd;
+
+
+import java.awt.Point;
+import java.awt.datatransfer.Transferable;
+
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.task.NetworkViewTaskFactory;
+
+/**
+ * An extension of TaskFactory that provides support for
+ * tasks to deal with drag and drop.
+ */
+public interface DropNetworkViewTaskFactory extends NetworkViewTaskFactory {
+
+ /**
+ * Sets the drop information for a TaskFactory.
+ * @param t The transferable object that was dropped.
+ * @param pt The point at which the object was dropped.
+ */
+ public void setDropInformation (Transferable t, Point pt);
+}
Added:
core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropNodeViewTaskFactory.java
===================================================================
---
core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropNodeViewTaskFactory.java
(rev 0)
+++
core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropNodeViewTaskFactory.java
2010-11-20 23:19:07 UTC (rev 22962)
@@ -0,0 +1,22 @@
+
+package org.cytoscape.dnd;
+
+
+import java.awt.Point;
+import java.awt.datatransfer.Transferable;
+
+import org.cytoscape.task.NodeViewTaskFactory;
+
+/**
+ * An extension of TaskFactory that provides support for
+ * tasks to deal with drag and drop.
+ */
+public interface DropNodeViewTaskFactory extends NodeViewTaskFactory {
+
+ /**
+ * Sets the drop information for a TaskFactory.
+ * @param t The transferable object that was dropped.
+ * @param pt The point at which the object was dropped.
+ */
+ public void setDropInformation (Transferable t, Point pt);
+}
Deleted:
core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropTaskFactory.java
===================================================================
--- core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropTaskFactory.java
2010-11-20 01:19:42 UTC (rev 22961)
+++ core3/dnd-api/trunk/src/main/java/org/cytoscape/dnd/DropTaskFactory.java
2010-11-20 23:19:07 UTC (rev 22962)
@@ -1,28 +0,0 @@
-
-package org.cytoscape.dnd;
-
-
-import java.awt.Point;
-import java.awt.datatransfer.Transferable;
-
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.work.TaskFactory;
-
-/**
- * APIs in Cytoscape 3.x are defined by their interfaces. Java interfaces
- * are used by OSGi to define services. Any Java interface can define a
- * service, meaning any class that implements an interface, can be registered
- * as a service. Using objects as services through their interfaces rather
- * than through their implementation class directly helps ensure that we
- * write modular and extensible code.
- */
-public interface DropTaskFactory extends TaskFactory {
-
- /**
- *
- *t
- * @param n The network to be analyzed.
- * @return A collection of "analyzed" nodes.
- */
- public void setDropInformation (CyNetworkView view, Transferable t,
Point pt);
-}
--
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.
