Author: kono
Date: 2010-11-29 10:49:18 -0800 (Mon, 29 Nov 2010)
New Revision: 23036
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/CyNode.java
core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableFactory.java
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractColumnEvent.java
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractEdgeEvent.java
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractEdgeListEvent.java
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNestedNetworkEvent.java
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNetworkEvent.java
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNodeEvent.java
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNodeListEvent.java
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/ArrayGraph.java
Log:
Generics parameters have been added to avoid IDE warnings. (Mainly for
Class<?>.)
Modified: core3/model-api/trunk/src/main/java/org/cytoscape/model/CyNode.java
===================================================================
--- core3/model-api/trunk/src/main/java/org/cytoscape/model/CyNode.java
2010-11-29 18:48:08 UTC (rev 23035)
+++ core3/model-api/trunk/src/main/java/org/cytoscape/model/CyNode.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -28,8 +28,6 @@
package org.cytoscape.model;
-import java.util.List;
-
import org.cytoscape.model.events.SetNestedNetworkEvent;
import org.cytoscape.model.events.UnsetNestedNetworkEvent;
@@ -39,6 +37,7 @@
* of nodes and edges.
*/
public interface CyNode extends CyTableEntry {
+
/** The column name for the nested network associated with a
<code>CyNode</code> in the user table. */
final static String NESTED_NETWORK_ATTR = "NestedNetwork";
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableFactory.java
===================================================================
--- core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableFactory.java
2010-11-29 18:48:08 UTC (rev 23035)
+++ core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableFactory.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -36,7 +36,6 @@
package org.cytoscape.model;
-import java.util.List;
/**
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractColumnEvent.java
===================================================================
---
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractColumnEvent.java
2010-11-29 18:48:08 UTC (rev 23035)
+++
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractColumnEvent.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -45,7 +45,7 @@
private final String columnName;
- AbstractColumnEvent(final CyTable source, final Class listenerClass,
final String columnName) {
+ AbstractColumnEvent(final CyTable source, final Class<?> listenerClass,
final String columnName) {
super(source, listenerClass);
if ( columnName == null )
throw new NullPointerException("columnName can't be
null");
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractEdgeEvent.java
===================================================================
---
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractEdgeEvent.java
2010-11-29 18:48:08 UTC (rev 23035)
+++
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractEdgeEvent.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -45,7 +45,7 @@
class AbstractEdgeEvent extends AbstractCyEvent<CyNetwork> {
private final CyEdge edge;
- AbstractEdgeEvent(final CyNetwork source, final Class listenerClass,
final CyEdge edge) {
+ AbstractEdgeEvent(final CyNetwork source, final Class<?> listenerClass,
final CyEdge edge) {
super(source, listenerClass);
if ( edge == null )
throw new NullPointerException("edge cannot be null");
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractEdgeListEvent.java
===================================================================
---
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractEdgeListEvent.java
2010-11-29 18:48:08 UTC (rev 23035)
+++
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractEdgeListEvent.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -46,7 +46,7 @@
class AbstractEdgeListEvent extends AbstractCyEvent<CyNetwork> {
private final List<CyEdge> edges;
- AbstractEdgeListEvent(final CyNetwork source, final Class
listenerClass, final List<CyEdge> edges) {
+ AbstractEdgeListEvent(final CyNetwork source, final Class<?>
listenerClass, final List<CyEdge> edges) {
super(source, listenerClass);
if ( edges == null )
throw new NullPointerException("edge list can't be
null");
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNestedNetworkEvent.java
===================================================================
---
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNestedNetworkEvent.java
2010-11-29 18:48:08 UTC (rev 23035)
+++
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNestedNetworkEvent.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -39,7 +39,7 @@
private final CyNode node;
private final CyNetwork network;
- AbstractNestedNetworkEvent(final Class listenerClass, final CyNode
node, final CyNetwork network) {
+ AbstractNestedNetworkEvent(final Class<?> listenerClass, final CyNode
node, final CyNetwork network) {
super(node, listenerClass);
if (node == null)
throw new NullPointerException("node cannot be null!");
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNetworkEvent.java
===================================================================
---
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNetworkEvent.java
2010-11-29 18:48:08 UTC (rev 23035)
+++
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNetworkEvent.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -12,7 +12,7 @@
class AbstractNetworkEvent extends AbstractCyEvent<CyNetworkManager> {
private final CyNetwork net;
- AbstractNetworkEvent(final CyNetworkManager source, final Class
listenerClass, final CyNetwork net) {
+ AbstractNetworkEvent(final CyNetworkManager source, final Class<?>
listenerClass, final CyNetwork net) {
super(source, listenerClass);
if (net == null)
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNodeEvent.java
===================================================================
---
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNodeEvent.java
2010-11-29 18:48:08 UTC (rev 23035)
+++
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNodeEvent.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -48,7 +48,7 @@
class AbstractNodeEvent extends AbstractCyEvent<CyNetwork> {
private final CyNode node;
- AbstractNodeEvent(final CyNetwork source, final Class listenerClass,
final CyNode node) {
+ AbstractNodeEvent(final CyNetwork source, final Class<?> listenerClass,
final CyNode node) {
super(source, listenerClass);
if ( node == null )
throw new NullPointerException("node cannot be null");
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNodeListEvent.java
===================================================================
---
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNodeListEvent.java
2010-11-29 18:48:08 UTC (rev 23035)
+++
core3/model-api/trunk/src/main/java/org/cytoscape/model/events/AbstractNodeListEvent.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -46,7 +46,7 @@
class AbstractNodeListEvent extends AbstractCyEvent<CyNetwork> {
private final List<CyNode> nodes;
- AbstractNodeListEvent(final CyNetwork source, final Class
listenerClass, final List<CyNode> nodes) {
+ AbstractNodeListEvent(final CyNetwork source, final Class<?>
listenerClass, final List<CyNode> nodes) {
super(source, listenerClass);
if ( nodes == null )
throw new NullPointerException("node list can't be
null");
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
===================================================================
---
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
2010-11-29 18:48:08 UTC (rev 23035)
+++
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -28,22 +28,9 @@
package org.cytoscape.model;
-import junit.framework.Assert;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNode;
-import java.lang.RuntimeException;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
public abstract class AbstractCyEdgeTest extends TestCase {
protected CyNetwork net;
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
===================================================================
---
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
2010-11-29 18:48:08 UTC (rev 23035)
+++
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -28,29 +28,11 @@
package org.cytoscape.model;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.cytoscape.event.CyEvent;
-import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.event.CyListener;
-
-import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyRow;
-
-import java.lang.RuntimeException;
-
-import java.util.HashMap;
import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
+import junit.framework.TestCase;
+
/**
* DOCUMENT ME!
*/
Modified:
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/ArrayGraph.java
===================================================================
---
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/ArrayGraph.java
2010-11-29 18:48:08 UTC (rev 23035)
+++
core3/model-impl/trunk/impl/src/main/java/org/cytoscape/model/internal/ArrayGraph.java
2010-11-29 18:49:18 UTC (rev 23036)
@@ -29,34 +29,25 @@
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Collections;
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableManager;
-import org.cytoscape.model.CyTableFactory;
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.CyTableEntry;
+import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.SUIDFactory;
-import org.cytoscape.model.events.AboutToRemoveEdgeEvent;
-import org.cytoscape.model.events.AboutToRemoveNodeEvent;
-import org.cytoscape.model.events.AddedEdgeEvent;
-import org.cytoscape.model.events.AddedNodeEvent;
-import org.cytoscape.model.events.RemovedEdgeEvent;
-import org.cytoscape.model.events.RemovedNodeEvent;
import org.cytoscape.model.subnetwork.CyRootNetwork;
import org.cytoscape.model.subnetwork.CySubNetwork;
-import static org.cytoscape.model.CyTableEntry.*;
-
/**
A linked list implmentation of CyNetwork and CyRootNetwork.
The fundamental idea here is instead of having NodePointer (and EdgePointer)
contain
--
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.
