Author: laylaoesper
Date: 2010-07-26 10:32:57 -0700 (Mon, 26 Jul 2010)
New Revision: 21025
Modified:
csplugins/trunk/soc/layla/SemanticSummary/jars/SemanticSummary.jar
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/DeleteCloudAction.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/UpdateCloudAction.java
Log:
Add warning to deleting of a cloud. Also, changed the wording when updating a
cloud to be more precise.
Modified: csplugins/trunk/soc/layla/SemanticSummary/jars/SemanticSummary.jar
===================================================================
(Binary files differ)
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/DeleteCloudAction.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/DeleteCloudAction.java
2010-07-26 17:06:33 UTC (rev 21024)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/DeleteCloudAction.java
2010-07-26 17:32:57 UTC (rev 21025)
@@ -22,9 +22,18 @@
package cytoscape.csplugins.semanticsummary;
+import java.awt.Component;
import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import javax.swing.JOptionPane;
+
import cytoscape.CyNetwork;
+import cytoscape.CyNode;
import cytoscape.Cytoscape;
import cytoscape.util.CytoscapeAction;
import cytoscape.view.CyNetworkView;
@@ -64,21 +73,40 @@
getInstance().getCurNetwork();
CloudParameters cloudParams =
SemanticSummaryManager.getInstance().getCurCloud();
- //Delete if cloud is not null
- if (cloudParams != null &&
- cloudParams !=
SemanticSummaryManager.getInstance().getNullCloudParameters())
+ int selection = confirmDelete();
+
+ if (selection == JOptionPane.YES_OPTION)
{
- String cloudName = cloudParams.getCloudName();
+
+ //Delete if cloud is not null
+ if (cloudParams != null &&
+ cloudParams !=
SemanticSummaryManager.getInstance().getNullCloudParameters())
+ {
+ String cloudName = cloudParams.getCloudName();
- //Remove cloud from list
- networkParams.getClouds().remove(cloudName);
+ //Remove cloud from list
+ networkParams.getClouds().remove(cloudName);
- //Update Current network
-
SemanticSummaryManager.getInstance().setupCurrentNetwork();
+ //Update Current network
+
SemanticSummaryManager.getInstance().setupCurrentNetwork();
- SemanticSummaryPluginAction init = new
SemanticSummaryPluginAction();
- init.loadCloudPanel();
- init.loadInputPanel();
+ SemanticSummaryPluginAction init = new
SemanticSummaryPluginAction();
+ init.loadCloudPanel();
+ init.loadInputPanel();
+ }
}
}
+
+ private int confirmDelete()
+ {
+ //Ask to continue or revert
+ Component parent = Cytoscape.getDesktop();
+ int value = JOptionPane.NO_OPTION;
+
+ value = JOptionPane.showConfirmDialog(parent,"Are you sure you
want to permanently delete the selected cloud?",
+ "Delete Cloud",
+ JOptionPane.YES_NO_OPTION);
+
+ return value;
+ }
}
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-26 17:06:33 UTC (rev 21024)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/UpdateCloudAction.java
2010-07-26 17:32:57 UTC (rev 21025)
@@ -100,8 +100,8 @@
Object[] options = { "Continue", "Revert"};
value = JOptionPane.showOptionDialog(parent,
- "Network node selection has changed
from when the cloud was created. " +
- "Continue with the current selection or
revert to the original selection?",
+ "Network node selection has changed. " +
+ "Continue with current selection or
revert to the original?",
"Node Selection Changed",
JOptionPane.WARNING_MESSAGE,
JOptionPane.YES_NO_CANCEL_OPTION,
--
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.
