Author: scooter
Date: 2011-08-06 16:23:08 -0700 (Sat, 06 Aug 2011)
New Revision: 26489
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/ui/HeatMapView.java
Log:
Cleaned up some missing generic specifications
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/ui/HeatMapView.java
===================================================================
---
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/ui/HeatMapView.java
2011-08-06 00:22:35 UTC (rev 26488)
+++
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/ui/HeatMapView.java
2011-08-06 23:23:08 UTC (rev 26489)
@@ -129,8 +129,8 @@
public HeatMapView() {
super();
// setExitOnWindowsClosed(false);
- selectedNodes = new ArrayList();
- selectedArrays = new ArrayList();
+ selectedNodes = new ArrayList<CyNode>();
+ selectedArrays = new ArrayList<CyNode>();
myLogger = CyLogger.getLogger(HeatMapView.class);
clusterProperties = new ClusterProperties(getShortName());
pcs = new PropertyChangeSupport(new Object());
@@ -139,8 +139,8 @@
public HeatMapView(PropertyConfig propConfig) {
super(propConfig);
- selectedNodes = new ArrayList();
- selectedArrays = new ArrayList();
+ selectedNodes = new ArrayList<CyNode>();
+ selectedArrays = new ArrayList<CyNode>();
// setExitOnWindowsClosed(false);
myLogger = CyLogger.getLogger(TreeView.class);
clusterProperties = new ClusterProperties(getShortName());
@@ -207,7 +207,7 @@
nodeArray[index++] =
((CyNode)node).getIdentifier();
} else {
if (attributeArray.length == 1 &&
attributeArray[0].startsWith("edge.")) {
- HashMap<CyNode,CyNode>nodeMap = new HashMap();
+ HashMap<CyNode,CyNode>nodeMap = new
HashMap<CyNode, CyNode>();
for (Object edge:myNetwork.getSelectedEdges()) {
CyNode node1 =
(CyNode)((CyEdge)edge).getSource();
CyNode node2 =
(CyNode)((CyEdge)edge).getTarget();
@@ -416,7 +416,7 @@
myView.removeGraphViewChangeListener(this); // For efficiency
reasons, remove our listener for now
myNetwork.unselectAllEdges();
- HashMap<CyEdge,CyEdge>edgesToSelect = new HashMap();
+ HashMap<CyEdge,CyEdge>edgesToSelect = new HashMap<CyEdge,
CyEdge>();
for (CyNode node1: selectedNodes) {
int [] nodes = new int[2];
nodes[0] = node1.getRootGraphIndex();
--
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.
