Author: jm
Date: 2012-06-25 11:46:43 -0700 (Mon, 25 Jun 2012)
New Revision: 29681
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ArbitraryGraphicsCanvas.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
Log:
Removed unused/unnecessary reference to CyNetwork in ArbitraryGraphicsCanvas
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ArbitraryGraphicsCanvas.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ArbitraryGraphicsCanvas.java
2012-06-25 18:34:27 UTC (rev 29680)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ArbitraryGraphicsCanvas.java
2012-06-25 18:46:43 UTC (rev 29681)
@@ -49,7 +49,6 @@
import org.cytoscape.ding.impl.events.ViewportChangeListener;
import org.cytoscape.ding.impl.cyannotator.api.Annotation;
-import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
@@ -62,11 +61,6 @@
private final static long serialVersionUID = 1202416510975364L;
/**
- * Our reference to the GraphPerspective our view belongs to
- */
- private CyNetwork m_cyNetwork;
-
- /**
* Our reference to the DGraphView we live within
*/
private DGraphView m_dGraphView;
@@ -101,11 +95,10 @@
* @param isVisible boolean
* @param isOpaque boolean
*/
- public ArbitraryGraphicsCanvas(CyNetwork cyNetwork, DGraphView
dGraphView,
+ public ArbitraryGraphicsCanvas(DGraphView dGraphView,
InnerCanvas innerCanvas, Color
backgroundColor,
boolean isVisible, boolean isOpaque) {
// init members
- m_cyNetwork = cyNetwork;
m_dGraphView = dGraphView;
m_innerCanvas = innerCanvas;
m_backgroundColor = backgroundColor;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-06-25 18:34:27 UTC (rev 29680)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-06-25 18:46:43 UTC (rev 29681)
@@ -488,9 +488,9 @@
m_defaultNodeXMax = m_defaultNodeXMin + DNodeView.DEFAULT_WIDTH;
m_defaultNodeYMax = m_defaultNodeYMin +
DNodeView.DEFAULT_HEIGHT;
m_networkCanvas = new InnerCanvas(m_lock, this, undo);
- m_backgroundCanvas = new ArbitraryGraphicsCanvas(model, this,
m_networkCanvas, Color.white, true, true);
+ m_backgroundCanvas = new ArbitraryGraphicsCanvas(this,
m_networkCanvas, Color.white, true, true);
addViewportChangeListener(m_backgroundCanvas);
- m_foregroundCanvas = new ArbitraryGraphicsCanvas(model, this,
m_networkCanvas, Color.white, true, false);
+ m_foregroundCanvas = new ArbitraryGraphicsCanvas(this,
m_networkCanvas, Color.white, true, false);
addViewportChangeListener(m_foregroundCanvas);
m_selectedNodes = new LongBTree();
m_selectedEdges = new LongBTree();
--
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.
