Author: laylaoesper
Date: 2010-07-09 09:03:32 -0700 (Fri, 09 Jul 2010)
New Revision: 20866
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudAction.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummary.jar
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryParameters.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/UpdateCloudAction.java
Log:
Adding a check that the network parameters are up to date when creating or
updating a cloud.
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudAction.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudAction.java
2010-07-09 05:24:24 UTC (rev 20865)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudAction.java
2010-07-09 16:03:32 UTC (rev 20866)
@@ -96,7 +96,13 @@
//Get SemanticSummaryParameters or Register if necessary
if(SemanticSummaryManager.getInstance().isSemanticSummary(networkID))
+ {
params =
SemanticSummaryManager.getInstance().getParameters(networkID);
+
+ //Update if necessary
+ if (params.networkChanged(network));
+ params.updateParameters(network);
+ }
else
{
params = new SemanticSummaryParameters();
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummary.jar
===================================================================
(Binary files differ)
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryParameters.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryParameters.java
2010-07-09 05:24:24 UTC (rev 20865)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryParameters.java
2010-07-09 16:03:32 UTC (rev 20866)
@@ -261,6 +261,41 @@
}
+ /**
+ * This method will check to see if the list of nodes in this object are
+ * up to date with the supplied network. It returns true only if the
network
+ * is different than the parameters.
+ * @return boolean - whether or not this network has changed.
+ */
+ public boolean networkChanged(CyNetwork network)
+ {
+ List<CyNode> nodes = network.nodesList();
+
+ Boolean isChanged = false;
+ List<String> oldNames = this.getNetworkNodes();
+
+ //If lists are different size, they can't be the same
+ if (oldNames.size() != nodes.size())
+ return true;
+
+ else
+ {
+ //Since they are the same size, just need to check for
subset
+ for (Iterator<CyNode> iter = nodes.iterator();
iter.hasNext();)
+ {
+ String nodeName = iter.next().getIdentifier();
+ if (!oldNames.contains(nodeName))
+ {
+ isChanged = true;
+ break;
+ }
+ }
+ }
+ return isChanged;
+
+ }
+
+
//GETTERS and SETTERS
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/UpdateCloudAction.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/UpdateCloudAction.java
2010-07-09 05:24:24 UTC (rev 20865)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/UpdateCloudAction.java
2010-07-09 16:03:32 UTC (rev 20866)
@@ -83,6 +83,10 @@
CyNetwork network = Cytoscape.getCurrentNetwork();
CyNetworkView view = Cytoscape.getCurrentNetworkView();
+ //Update network if necessary
+ if (networkParams.networkChanged(network));
+ networkParams.updateParameters(network);
+
//Get set of selected and compare to saved
Set<CyNode> nodes = network.getSelectedNodes();
Boolean isDifferent = checkSelectionChange(cloudParams, nodes);
--
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.
