Author: mes
Date: 2011-11-23 17:07:30 -0800 (Wed, 23 Nov 2011)
New Revision: 27600
Modified:
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyNode.java
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyNodeTest.java
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/DummyCyNode.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNestedNetworkTask.java
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyNodeImpl.java
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNodeImpl.java
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/AttributeBasedNetworkMerge.java
Log:
renamed CyNode.getNetwork to CyNode.getNetworkPointer and setNetworkPointer
Modified:
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyNode.java
===================================================================
--- core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyNode.java
2011-11-24 01:00:28 UTC (rev 27599)
+++ core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyNode.java
2011-11-24 01:07:30 UTC (rev 27600)
@@ -55,7 +55,7 @@
* @return A reference to a CyNetwork if one exists,
* returns null otherwise.
*/
- CyNetwork getNetwork();
+ CyNetwork getNetworkPointer();
/**
* Allows a network reference for this node to be set. Only one
@@ -71,5 +71,5 @@
* {@link UnsetNestedNetworkEvent} will be fired and if a new network
will be set a
* {@link SetNestedNetworkEvent} will be fired.
*/
- void setNetwork(CyNetwork network);
+ void setNetworkPointer(CyNetwork network);
}
Modified:
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyNodeTest.java
===================================================================
---
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyNodeTest.java
2011-11-24 01:00:28 UTC (rev 27599)
+++
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyNodeTest.java
2011-11-24 01:07:30 UTC (rev 27600)
@@ -72,25 +72,25 @@
@Test
public void testInitGetNestedNetwork() {
CyNode n1 = net.addNode();
- assertNull(n1.getNetwork());
+ assertNull(n1.getNetworkPointer());
}
@Test
public void testSetNestedNetwork() {
CyNode n1 = net.addNode();
CyNetwork net2 = mock(CyNetwork.class);
- n1.setNetwork( net2 );
- assertNotNull(n1.getNetwork());
- assertEquals(net2, n1.getNetwork());
+ n1.setNetworkPointer( net2 );
+ assertNotNull(n1.getNetworkPointer());
+ assertEquals(net2, n1.getNetworkPointer());
}
// self nested networks are allowed
@Test
public void testSetSelfNestedNetwork() {
CyNode n1 = net.addNode();
- n1.setNetwork( net );
- assertNotNull(n1.getNetwork());
- assertEquals(net, n1.getNetwork());
+ n1.setNetworkPointer( net );
+ assertNotNull(n1.getNetworkPointer());
+ assertEquals(net, n1.getNetworkPointer());
}
// null nested networks are allowed
@@ -100,13 +100,13 @@
// put a real network here first
CyNetwork net2 = mock(CyNetwork.class);
- n1.setNetwork( net2 );
- assertNotNull(n1.getNetwork());
- assertEquals(net2, n1.getNetwork());
+ n1.setNetworkPointer( net2 );
+ assertNotNull(n1.getNetworkPointer());
+ assertEquals(net2, n1.getNetworkPointer());
// now put a null network to verify that we've "unset" things
- n1.setNetwork( null );
- assertNull(n1.getNetwork());
+ n1.setNetworkPointer( null );
+ assertNull(n1.getNetworkPointer());
}
@Test
Modified:
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/DummyCyNode.java
===================================================================
---
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/DummyCyNode.java
2011-11-24 01:00:28 UTC (rev 27599)
+++
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/DummyCyNode.java
2011-11-24 01:07:30 UTC (rev 27600)
@@ -65,11 +65,11 @@
return new ArrayList<CyEdge>();
}
- public CyNetwork getNetwork() {
+ public CyNetwork getNetworkPointer() {
return nested;
}
- public void setNetwork(CyNetwork n) {
+ public void setNetworkPointer(CyNetwork n) {
nested = n;
}
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2011-11-24 01:00:28 UTC (rev 27599)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2011-11-24 01:07:30 UTC (rev 27600)
@@ -1072,7 +1072,7 @@
synchronized (graphView.m_lock) {
++nestedNetworkPaintingDepth;
try {
- if (nestedNetworkPaintingDepth > 1 ||
getModel().getNetwork() == null
+ if (nestedNetworkPaintingDepth > 1 ||
getModel().getNetworkPointer() == null
|| !nestedNetworkVisible)
return null;
Modified:
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNestedNetworkTask.java
===================================================================
---
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNestedNetworkTask.java
2011-11-24 01:00:28 UTC (rev 27599)
+++
core3/impl/trunk/editor-impl/src/main/java/org/cytoscape/editor/internal/AddNestedNetworkTask.java
2011-11-24 01:07:30 UTC (rev 27600)
@@ -47,7 +47,7 @@
}
CyNode n = nodeView.getModel();
- n.setNetwork( nestedNetwork.getSelectedValue() );
+ n.setNetworkPointer( nestedNetwork.getSelectedValue() );
netView.updateView();
}
}
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyNodeImpl.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyNodeImpl.java
2011-11-24 01:00:28 UTC (rev 27599)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyNodeImpl.java
2011-11-24 01:07:30 UTC (rev 27600)
@@ -59,18 +59,18 @@
}
/**
- * @see org.cytoscape.model.CyNode#getNetwork()
+ * @see org.cytoscape.model.CyNode#getNetworkPointer()
*/
@Override
- public synchronized CyNetwork getNetwork() {
+ public synchronized CyNetwork getNetworkPointer() {
return nestedNet;
}
/**
- * @see org.cytoscape.model.CyNode#setNetwork(CyNetwork)
+ * @see org.cytoscape.model.CyNode#setNetworkPointer(CyNetwork)
*/
@Override
- public void setNetwork(final CyNetwork n) {
+ public void setNetworkPointer(final CyNetwork n) {
final CyNetwork orig;
synchronized (this) {
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNodeImpl.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNodeImpl.java
2011-11-24 01:00:28 UTC (rev 27599)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNodeImpl.java
2011-11-24 01:07:30 UTC (rev 27600)
@@ -50,13 +50,13 @@
}
@Override
- public CyNetwork getNetwork() {
- return rootNode.getNetwork();
+ public CyNetwork getNetworkPointer() {
+ return rootNode.getNetworkPointer();
}
@Override
- public void setNetwork(final CyNetwork n) {
- rootNode.setNetwork(n);
+ public void setNetworkPointer(final CyNetwork n) {
+ rootNode.setNetworkPointer(n);
}
public CyNode getRootNode() {
Modified:
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/AttributeBasedNetworkMerge.java
===================================================================
---
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/AttributeBasedNetworkMerge.java
2011-11-24 01:00:28 UTC (rev 27599)
+++
core3/impl/trunk/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/AttributeBasedNetworkMerge.java
2011-11-24 01:07:30 UTC (rev 27600)
@@ -124,8 +124,8 @@
return true;
}
- CyColumn attr1 =
matchingAttribute.getAttributeForMatching(n1.getNetwork());
- CyColumn attr2 =
matchingAttribute.getAttributeForMatching(n2.getNetwork());
+ CyColumn attr1 =
matchingAttribute.getAttributeForMatching(n1.getNetworkPointer());
+ CyColumn attr2 =
matchingAttribute.getAttributeForMatching(n2.getNetworkPointer());
if (attr1==null || attr2==null) {
throw new java.lang.IllegalArgumentException("Please specify the
matching attribute first");
--
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.
