Author: jm
Date: 2012-07-05 13:28:38 -0700 (Thu, 05 Jul 2012)
New Revision: 29771
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ChangeAnnotationCanvasTaskFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/EditAnnotationTaskFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/LayerAnnotationTaskFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/MoveAnnotationTaskFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/RemoveAnnotationTaskFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ResizeAnnotationTaskFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/SelectAnnotationTaskFactory.java
Log:
Fixes #1217: Fixed CyAnnotator leaks
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ChangeAnnotationCanvasTaskFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ChangeAnnotationCanvasTaskFactory.java
2012-07-05 20:28:08 UTC (rev 29770)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ChangeAnnotationCanvasTaskFactory.java
2012-07-05 20:28:38 UTC (rev 29771)
@@ -2,21 +2,15 @@
import java.awt.geom.Point2D;
-import java.awt.datatransfer.Transferable;
+import org.cytoscape.ding.impl.DGraphView;
+import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
+import org.cytoscape.ding.impl.cyannotator.api.Annotation;
import org.cytoscape.task.NetworkViewLocationTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.TaskIterator;
-import org.cytoscape.ding.impl.DGraphView;
-import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
-import org.cytoscape.ding.impl.cyannotator.api.Annotation;
-import org.cytoscape.ding.impl.cyannotator.api.ImageAnnotation;
-import org.cytoscape.ding.impl.cyannotator.api.ShapeAnnotation;
-
public class ChangeAnnotationCanvasTaskFactory implements
NetworkViewLocationTaskFactory {
- private CyAnnotator cyAnnotator;
- private Annotation annotation;
private String canvas;
public ChangeAnnotationCanvasTaskFactory(String canvas) {
@@ -25,16 +19,16 @@
@Override
public TaskIterator createTaskIterator(CyNetworkView networkView,
Point2D javaPt, Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
return new TaskIterator(new
ChangeAnnotationCanvasTask(networkView, annotation, canvas));
}
@Override
public boolean isReady(CyNetworkView networkView, Point2D javaPt,
Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
if (annotation == null) return false;
if (!annotation.getCanvasName().equals(canvas))
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/EditAnnotationTaskFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/EditAnnotationTaskFactory.java
2012-07-05 20:28:08 UTC (rev 29770)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/EditAnnotationTaskFactory.java
2012-07-05 20:28:38 UTC (rev 29771)
@@ -2,33 +2,29 @@
import java.awt.geom.Point2D;
-import java.awt.datatransfer.Transferable;
+import org.cytoscape.ding.impl.DGraphView;
+import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
+import org.cytoscape.ding.impl.cyannotator.api.Annotation;
import org.cytoscape.task.NetworkViewLocationTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.TaskIterator;
-import org.cytoscape.ding.impl.DGraphView;
-import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
-import org.cytoscape.ding.impl.cyannotator.api.Annotation;
-
public class EditAnnotationTaskFactory implements
NetworkViewLocationTaskFactory {
- private CyAnnotator cyAnnotator;
- private Annotation annotation;
@Override
public TaskIterator createTaskIterator(CyNetworkView networkView,
Point2D javaPt, Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
return new TaskIterator(new EditAnnotationTask(networkView,
annotation, javaPt));
}
@Override
public boolean isReady(CyNetworkView networkView, Point2D javaPt,
Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
if (annotation != null)
return true;
return false;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/LayerAnnotationTaskFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/LayerAnnotationTaskFactory.java
2012-07-05 20:28:08 UTC (rev 29770)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/LayerAnnotationTaskFactory.java
2012-07-05 20:28:38 UTC (rev 29771)
@@ -2,23 +2,17 @@
import java.awt.geom.Point2D;
-import java.awt.datatransfer.Transferable;
import javax.swing.JComponent;
+import org.cytoscape.ding.impl.DGraphView;
+import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
+import org.cytoscape.ding.impl.cyannotator.api.Annotation;
import org.cytoscape.task.NetworkViewLocationTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.TaskIterator;
-import org.cytoscape.ding.impl.DGraphView;
-import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
-import org.cytoscape.ding.impl.cyannotator.api.Annotation;
-import org.cytoscape.ding.impl.cyannotator.api.ImageAnnotation;
-import org.cytoscape.ding.impl.cyannotator.api.ShapeAnnotation;
-
public class LayerAnnotationTaskFactory implements
NetworkViewLocationTaskFactory {
- private CyAnnotator cyAnnotator;
- private Annotation annotation;
private int offset;
private int newZorder;
@@ -28,16 +22,16 @@
@Override
public TaskIterator createTaskIterator(CyNetworkView networkView,
Point2D javaPt, Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
return new TaskIterator(new LayerAnnotationTask(networkView,
annotation, newZorder));
}
@Override
public boolean isReady(CyNetworkView networkView, Point2D javaPt,
Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
if (annotation == null) return false;
JComponent canvas = annotation.getCanvas();
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/MoveAnnotationTaskFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/MoveAnnotationTaskFactory.java
2012-07-05 20:28:08 UTC (rev 29770)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/MoveAnnotationTaskFactory.java
2012-07-05 20:28:38 UTC (rev 29771)
@@ -2,34 +2,28 @@
import java.awt.geom.Point2D;
-import java.awt.datatransfer.Transferable;
+import org.cytoscape.ding.impl.DGraphView;
+import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
+import org.cytoscape.ding.impl.cyannotator.api.Annotation;
import org.cytoscape.task.NetworkViewLocationTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.TaskIterator;
-import org.cytoscape.ding.impl.DGraphView;
-import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
-import org.cytoscape.ding.impl.cyannotator.api.Annotation;
-import org.cytoscape.ding.impl.cyannotator.api.ImageAnnotation;
-import org.cytoscape.ding.impl.cyannotator.api.ShapeAnnotation;
-
public class MoveAnnotationTaskFactory implements
NetworkViewLocationTaskFactory {
- private CyAnnotator cyAnnotator;
- private Annotation annotation;
@Override
public TaskIterator createTaskIterator(CyNetworkView networkView,
Point2D javaPt, Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
return new TaskIterator(new MoveAnnotationTask(networkView,
annotation, javaPt));
}
@Override
public boolean isReady(CyNetworkView networkView, Point2D javaPt,
Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
if (annotation != null)
return true;
return false;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/RemoveAnnotationTaskFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/RemoveAnnotationTaskFactory.java
2012-07-05 20:28:08 UTC (rev 29770)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/RemoveAnnotationTaskFactory.java
2012-07-05 20:28:38 UTC (rev 29771)
@@ -2,34 +2,28 @@
import java.awt.geom.Point2D;
-import java.awt.datatransfer.Transferable;
+import org.cytoscape.ding.impl.DGraphView;
+import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
+import org.cytoscape.ding.impl.cyannotator.api.Annotation;
import org.cytoscape.task.NetworkViewLocationTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.TaskIterator;
-import org.cytoscape.ding.impl.DGraphView;
-import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
-import org.cytoscape.ding.impl.cyannotator.api.Annotation;
-import org.cytoscape.ding.impl.cyannotator.api.ImageAnnotation;
-import org.cytoscape.ding.impl.cyannotator.api.ShapeAnnotation;
-
public class RemoveAnnotationTaskFactory implements
NetworkViewLocationTaskFactory {
- private CyAnnotator cyAnnotator;
- private Annotation annotation;
@Override
public TaskIterator createTaskIterator(CyNetworkView networkView,
Point2D javaPt, Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
return new TaskIterator(new RemoveAnnotationTask(networkView,
annotation));
}
@Override
public boolean isReady(CyNetworkView networkView, Point2D javaPt,
Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
if (annotation != null)
return true;
return false;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ResizeAnnotationTaskFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ResizeAnnotationTaskFactory.java
2012-07-05 20:28:08 UTC (rev 29770)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ResizeAnnotationTaskFactory.java
2012-07-05 20:28:38 UTC (rev 29771)
@@ -2,34 +2,30 @@
import java.awt.geom.Point2D;
-import java.awt.datatransfer.Transferable;
-import org.cytoscape.task.NetworkViewLocationTaskFactory;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.work.TaskIterator;
-
import org.cytoscape.ding.impl.DGraphView;
import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
import org.cytoscape.ding.impl.cyannotator.api.Annotation;
import org.cytoscape.ding.impl.cyannotator.api.ImageAnnotation;
import org.cytoscape.ding.impl.cyannotator.api.ShapeAnnotation;
+import org.cytoscape.task.NetworkViewLocationTaskFactory;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.work.TaskIterator;
public class ResizeAnnotationTaskFactory implements
NetworkViewLocationTaskFactory {
- private CyAnnotator cyAnnotator;
- private Annotation annotation;
@Override
public TaskIterator createTaskIterator(CyNetworkView networkView,
Point2D javaPt, Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
return new TaskIterator(new ResizeAnnotationTask(networkView,
annotation, javaPt));
}
@Override
public boolean isReady(CyNetworkView networkView, Point2D javaPt,
Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
if (annotation != null &&
(annotation instanceof ShapeAnnotation || annotation
instanceof ImageAnnotation))
return true;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/SelectAnnotationTaskFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/SelectAnnotationTaskFactory.java
2012-07-05 20:28:08 UTC (rev 29770)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/SelectAnnotationTaskFactory.java
2012-07-05 20:28:38 UTC (rev 29771)
@@ -2,7 +2,6 @@
import java.awt.geom.Point2D;
-import java.awt.datatransfer.Transferable;
import org.cytoscape.task.NetworkViewLocationTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
@@ -11,25 +10,21 @@
import org.cytoscape.ding.impl.DGraphView;
import org.cytoscape.ding.impl.cyannotator.CyAnnotator;
import org.cytoscape.ding.impl.cyannotator.api.Annotation;
-import org.cytoscape.ding.impl.cyannotator.api.ImageAnnotation;
-import org.cytoscape.ding.impl.cyannotator.api.ShapeAnnotation;
public class SelectAnnotationTaskFactory implements
NetworkViewLocationTaskFactory {
- private CyAnnotator cyAnnotator;
- private Annotation annotation;
@Override
public TaskIterator createTaskIterator(CyNetworkView networkView,
Point2D javaPt, Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
return new TaskIterator(new SelectAnnotationTask(networkView,
annotation));
}
@Override
public boolean isReady(CyNetworkView networkView, Point2D javaPt,
Point2D xformPt) {
- this.cyAnnotator = ((DGraphView)networkView).getCyAnnotator();
- annotation = cyAnnotator.getAnnotationAt(javaPt);
+ CyAnnotator cyAnnotator =
((DGraphView)networkView).getCyAnnotator();
+ Annotation annotation = cyAnnotator.getAnnotationAt(javaPt);
if (annotation != null)
return true;
return false;
--
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.
