Author: clopes
Date: 2011-09-09 12:26:37 -0700 (Fri, 09 Sep 2011)
New Revision: 26745
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyEdgeImpl.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/CySubEdgeImpl.java
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/CyTableEntryImpl.java
Log:
Implemented equals() and hashcode() in CyTableEntryImpl--it assumes a CyEdge
will never have the same SUID as a CyNode. Also added the @Override annotation
to some methods.
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyEdgeImpl.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyEdgeImpl.java
2011-09-09 19:25:53 UTC (rev 26744)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyEdgeImpl.java
2011-09-09 19:26:37 UTC (rev 26745)
@@ -59,46 +59,37 @@
}
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * @see org.cytoscape.model.CyEdge#getIndex()
*/
+ @Override
public int getIndex() {
return index;
}
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * @see org.cytoscape.model.CyEdge#getSource()
*/
+ @Override
public CyNode getSource() {
return source;
}
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * @see org.cytoscape.model.CyEdge#getTarget()
*/
+ @Override
public CyNode getTarget() {
return target;
}
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * @see org.cytoscape.model.CyEdge#isDirected()
*/
+ @Override
public boolean isDirected() {
return directed;
}
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
@Override
public String toString() {
StringBuffer sb = new StringBuffer();
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-09-09 19:25:53 UTC (rev 26744)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyNodeImpl.java
2011-09-09 19:26:37 UTC (rev 26745)
@@ -28,19 +28,16 @@
package org.cytoscape.model.internal;
+import java.util.Map;
+
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.events.SetNestedNetworkEvent;
import org.cytoscape.model.events.UnsetNestedNetworkEvent;
-import java.util.List;
-import java.util.Map;
-
class CyNodeImpl extends CyTableEntryImpl implements CyNode {
final private int index;
private CyNetwork nestedNet;
@@ -54,28 +51,25 @@
}
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * @see org.cytoscape.model.CyNode#getIndex()
*/
+ @Override
public int getIndex() {
return index;
}
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * @see org.cytoscape.model.CyNode#getNetwork()
*/
@Override
- public String toString() {
- return "Node suid: " + getSUID() + " index: " + index;
- }
-
public synchronized CyNetwork getNetwork() {
return nestedNet;
}
+ /**
+ * @see org.cytoscape.model.CyNode#setNetwork(CyNetwork)
+ */
+ @Override
public void setNetwork(final CyNetwork n) {
final CyNetwork orig;
@@ -92,4 +86,9 @@
if (nestedNet != null)
eventHelper.fireEvent(new SetNestedNetworkEvent(this,
nestedNet));
}
+
+ @Override
+ public String toString() {
+ return "Node suid: " + getSUID() + " index: " + index;
+ }
}
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubEdgeImpl.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubEdgeImpl.java
2011-09-09 19:25:53 UTC (rev 26744)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubEdgeImpl.java
2011-09-09 19:26:37 UTC (rev 26745)
@@ -28,19 +28,13 @@
package org.cytoscape.model.internal;
-import org.cytoscape.event.CyEventHelper;
+import java.util.Map;
+
import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.events.SetNestedNetworkEvent;
-import org.cytoscape.model.events.UnsetNestedNetworkEvent;
-import java.util.List;
-import java.util.Map;
-
class CySubEdgeImpl extends CyTableEntryImpl implements CyEdge {
private final CyEdgeImpl rootEdge;
@@ -52,22 +46,27 @@
this.subNodeMap = subNodeMap;
}
+ @Override
public int getIndex() {
return rootEdge.getIndex();
}
+ @Override
public String toString() {
return rootEdge.toString();
}
+ @Override
public CyNode getSource() {
return subNodeMap.get(rootEdge.getSource());
}
+ @Override
public CyNode getTarget() {
return subNodeMap.get(rootEdge.getTarget());
}
+ @Override
public boolean isDirected() {
return rootEdge.isDirected();
}
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-09-09 19:25:53 UTC (rev 26744)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNodeImpl.java
2011-09-09 19:26:37 UTC (rev 26745)
@@ -28,19 +28,13 @@
package org.cytoscape.model.internal;
-import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.model.CyEdge;
+import java.util.Map;
+
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.events.SetNestedNetworkEvent;
-import org.cytoscape.model.events.UnsetNestedNetworkEvent;
-import java.util.List;
-import java.util.Map;
-
class CySubNodeImpl extends CyTableEntryImpl implements CyNode {
private final CyNodeImpl rootNode;
@@ -50,18 +44,17 @@
this.rootNode = rootNode;
}
+ @Override
public int getIndex() {
return rootNode.getIndex();
}
- public String toString() {
- return "SUBNODE of : " + rootNode.toString();
- }
-
+ @Override
public CyNetwork getNetwork() {
return rootNode.getNetwork();
}
+ @Override
public void setNetwork(final CyNetwork n) {
rootNode.setNetwork(n);
}
@@ -69,4 +62,9 @@
public CyNode getRootNode() {
return rootNode;
}
+
+ @Override
+ public String toString() {
+ return "SUBNODE of : " + rootNode.toString();
+ }
}
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableEntryImpl.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableEntryImpl.java
2011-09-09 19:25:53 UTC (rev 26744)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableEntryImpl.java
2011-09-09 19:26:37 UTC (rev 26745)
@@ -28,16 +28,16 @@
package org.cytoscape.model.internal;
+import java.util.Map;
+
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.Identifiable;
import org.cytoscape.model.SUIDFactory;
-import java.util.Map;
-
class CyTableEntryImpl implements CyTableEntry, Identifiable {
private final long suid;
private final Map<String, CyTable> attrMgr;
@@ -55,17 +55,18 @@
this(attrMgr,SUIDFactory.getNextSUID());
}
+ /**
+ * @see org.cytoscape.model.Identifiable#getSUID()
+ */
+ @Override
final public long getSUID() {
return suid;
}
/**
- * DOCUMENT ME!
- *
- * @param namespace DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * @see org.cytoscape.model.CyTableEntry#getCyRow(String)
*/
+ @Override
final public CyRow getCyRow(final String namespace) {
if (namespace == null)
throw new NullPointerException("namespace is null");
@@ -78,11 +79,30 @@
}
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * @see org.cytoscape.model.CyTableEntry#getCyRow()
*/
+ @Override
final public CyRow getCyRow() {
return defaultRow;
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 17;
+ int result = 1;
+ result = prime * result + (int) (suid ^ (suid >>> 32));
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (! (obj instanceof CyTableEntryImpl))
+ return false;
+ CyTableEntryImpl other = (CyTableEntryImpl) obj;
+ return (suid == other.suid);
+ }
}
--
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.
