Author: mes
Date: 2010-09-09 11:11:50 -0700 (Thu, 09 Sep 2010)
New Revision: 21774
Added:
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyTableEntryImpl.java
Removed:
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/GraphObjImpl.java
Modified:
core3/model-impl/trunk/
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyEdgeImpl.java
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyNodeImpl.java
Log:
Changed GraphObjImpl name to reflect CyTableEntry
Property changes on: core3/model-impl/trunk
___________________________________________________________________
Name: svn:ignore
+ .settings
eclipse_config
target
.classpath
.project
Modified:
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyEdgeImpl.java
===================================================================
---
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyEdgeImpl.java
2010-09-09 16:49:05 UTC (rev 21773)
+++
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyEdgeImpl.java
2010-09-09 18:11:50 UTC (rev 21774)
@@ -43,7 +43,7 @@
import java.util.Map;
-class CyEdgeImpl extends GraphObjImpl implements CyEdge {
+class CyEdgeImpl extends CyTableEntryImpl implements CyEdge {
final private CyNode source;
final private CyNode target;
final private int index;
Modified:
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyNodeImpl.java
===================================================================
---
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyNodeImpl.java
2010-09-09 16:49:05 UTC (rev 21773)
+++
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyNodeImpl.java
2010-09-09 18:11:50 UTC (rev 21774)
@@ -45,7 +45,7 @@
import java.util.Map;
-class CyNodeImpl extends GraphObjImpl implements CyNode {
+class CyNodeImpl extends CyTableEntryImpl implements CyNode {
final private int index;
final private CyNetwork net;
Copied:
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyTableEntryImpl.java
(from rev 21763,
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/GraphObjImpl.java)
===================================================================
---
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyTableEntryImpl.java
(rev 0)
+++
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/CyTableEntryImpl.java
2010-09-09 18:11:50 UTC (rev 21774)
@@ -0,0 +1,115 @@
+
+/*
+ Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
+
+ The Cytoscape Consortium is:
+ - Institute for Systems Biology
+ - University of California San Diego
+ - Memorial Sloan-Kettering Cancer Center
+ - Institut Pasteur
+ - Agilent Technologies
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
+ documentation provided hereunder is on an "as is" basis, and the
+ Institute for Systems Biology and the Whitehead Institute
+ have no obligations to provide maintenance, support,
+ updates, enhancements or modifications. In no event shall the
+ Institute for Systems Biology and the Whitehead Institute
+ be liable to any party for direct, indirect, special,
+ incidental or consequential damages, including lost profits, arising
+ out of the use of this software and its documentation, even if the
+ Institute for Systems Biology and the Whitehead Institute
+ have been advised of the possibility of such damage. See
+ the GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+*/
+
+package org.cytoscape.model.internal;
+
+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;
+
+ CyTableEntryImpl(final Map<String, CyTable> attrMgr) {
+ suid = SUIDFactory.getNextSUID();
+ this.attrMgr = attrMgr;
+ attrs().set("name","");
+ attrs().set("selected",Boolean.FALSE);
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public long getSUID() {
+ return suid;
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param namespace DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public CyRow getCyRow(String namespace) {
+ if (namespace == null)
+ throw new NullPointerException("namespace is null");
+
+ CyTable mgr = attrMgr.get(namespace);
+
+ if (mgr == null)
+ throw new NullPointerException("attribute manager is
null for namespace: " + namespace);
+
+ return mgr.getRow(suid);
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ public CyRow attrs() {
+ return getCyRow(CyNetwork.DEFAULT_ATTRS);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof CyTableEntryImpl))
+ return false;
+
+ CyTableEntryImpl ir = (CyTableEntryImpl) o;
+
+ if (ir.suid == this.suid)
+ return true;
+ else
+
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return (int) (suid ^ (suid >>> 32));
+ }
+}
Deleted:
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/GraphObjImpl.java
===================================================================
---
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/GraphObjImpl.java
2010-09-09 16:49:05 UTC (rev 21773)
+++
core3/model-impl/trunk/src/main/java/org/cytoscape/model/internal/GraphObjImpl.java
2010-09-09 18:11:50 UTC (rev 21774)
@@ -1,115 +0,0 @@
-
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
-
-package org.cytoscape.model.internal;
-
-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 GraphObjImpl implements CyTableEntry, Identifiable {
- private final long suid;
- private final Map<String, CyTable> attrMgr;
-
- GraphObjImpl(final Map<String, CyTable> attrMgr) {
- suid = SUIDFactory.getNextSUID();
- this.attrMgr = attrMgr;
- attrs().set("name","");
- attrs().set("selected",Boolean.FALSE);
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public long getSUID() {
- return suid;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param namespace DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public CyRow getCyRow(String namespace) {
- if (namespace == null)
- throw new NullPointerException("namespace is null");
-
- CyTable mgr = attrMgr.get(namespace);
-
- if (mgr == null)
- throw new NullPointerException("attribute manager is
null for namespace: " + namespace);
-
- return mgr.getRow(suid);
- }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public CyRow attrs() {
- return getCyRow(CyNetwork.DEFAULT_ATTRS);
- }
-
- @Override
- public boolean equals(Object o) {
- if (!(o instanceof GraphObjImpl))
- return false;
-
- GraphObjImpl ir = (GraphObjImpl) o;
-
- if (ir.suid == this.suid)
- return true;
- else
-
- return false;
- }
-
- @Override
- public int hashCode() {
- return (int) (suid ^ (suid >>> 32));
- }
-}
--
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.
