Author: scooter
Date: 2011-08-30 20:33:29 -0700 (Tue, 30 Aug 2011)
New Revision: 26659
Modified:
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/MetaNodeGroupViewer.java
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/data/AttributeManager.java
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/model/MetaNode.java
Log:
Add some annotations to suppress warnings
Modified:
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/MetaNodeGroupViewer.java
===================================================================
---
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/MetaNodeGroupViewer.java
2011-08-30 23:08:48 UTC (rev 26658)
+++
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/MetaNodeGroupViewer.java
2011-08-31 03:33:29 UTC (rev 26659)
@@ -315,6 +315,7 @@
}
// This method is called to create a single metanode
+ @SuppressWarnings("deprecation")
private void createMetaNode(CyGroup group, CyNetworkView view) {
// Create the metanode
MetaNode newNode = MetaNodeManager.createMetaNode(group, true);
Modified:
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/data/AttributeManager.java
===================================================================
---
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/data/AttributeManager.java
2011-08-30 23:08:48 UTC (rev 26658)
+++
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/data/AttributeManager.java
2011-08-31 03:33:29 UTC (rev 26659)
@@ -188,6 +188,7 @@
Map<String,String> attrMap =
(Map<String,String>)networkAttributes.getMapAttribute(network.getIdentifier(),
OVERRIDE_ATTRIBUTE);
attrMap.put(attribute, handlerType.toString());
networkAttributes.setMapAttribute(network.getIdentifier(), OVERRIDE_ATTRIBUTE,
attrMap);
+
networkAttributes.setUserVisible(OVERRIDE_ATTRIBUTE, false);
}
} else {
CyAttributes nodeAttributes =
Cytoscape.getNodeAttributes();
@@ -196,6 +197,7 @@
Map<String,String> attrMap =
(Map<String,String>)nodeAttributes.getMapAttribute(metaNode,
OVERRIDE_ATTRIBUTE);
attrMap.put(attribute, handlerType.toString());
nodeAttributes.setMapAttribute(metaNode,
OVERRIDE_ATTRIBUTE, attrMap);
+
nodeAttributes.setUserVisible(OVERRIDE_ATTRIBUTE, false);
}
}
}
@@ -380,10 +382,12 @@
assignAttributes(nodeAttributes, metaNodeName);
nodeAttributes.setAttribute(metaNodeName,
DESCENDENTS_ATTRIBUTE, new Integer(nDescendents));
nodeAttributes.setAttribute(metaNodeName,
ENABLE_ATTRIBUTE, Boolean.TRUE);
+ nodeAttributes.setUserVisible(ENABLE_ATTRIBUTE, false);
// System.out.println("Setting "+ENABLE_ATTRIBUTE+" for
"+metaNodeName+" to "+Boolean.TRUE);
} else {
// System.out.println("Setting "+ENABLE_ATTRIBUTE+" for
"+metaNodeName+" to "+Boolean.FALSE);
nodeAttributes.setAttribute(metaNodeName,
ENABLE_ATTRIBUTE, Boolean.FALSE);
+ nodeAttributes.setUserVisible(ENABLE_ATTRIBUTE, false);
}
// Update our special attributes
Modified:
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/model/MetaNode.java
===================================================================
---
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/model/MetaNode.java
2011-08-30 23:08:48 UTC (rev 26658)
+++
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/model/MetaNode.java
2011-08-31 03:33:29 UTC (rev 26659)
@@ -217,6 +217,7 @@
* @param view the CyNetworkView
* @param update update the display?
*/
+ @SuppressWarnings("deprecation")
public void expand(CyNetworkView view) {
logger.debug("expand "+metaGroup+": isCollapsed =
"+isCollapsed()+" isHidden = "+isHidden()+" state = "+metaGroup.getState());
if (!isCollapsed())
--
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.
