Author: kono
Date: 2012-01-09 13:53:23 -0800 (Mon, 09 Jan 2012)
New Revision: 27954
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypassMenuTaskFactory.java
Log:
fixes #555 Bypass check boxes are now recognizes VP lock state.
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
2012-01-09 20:06:54 UTC (rev 27953)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
2012-01-09 21:53:23 UTC (rev 27954)
@@ -248,7 +248,7 @@
final Object targetVisualProperty = props.get("targetVP");
boolean isSelected = false;
if(view != null) {
- if ( targetVisualProperty instanceof String ) {
+ if (targetVisualProperty != null &&
targetVisualProperty instanceof String ) {
// TODO remove this at first opportunity
whenever lookup gets refactored.
Class<?> clazz = CyNetwork.class;
if ( view.getModel() instanceof CyNode )
@@ -256,10 +256,13 @@
else if ( view.getModel() instanceof CyEdge )
clazz = CyEdge.class;
- isSelected =
view.isValueLocked(m_view.dingLexicon.lookup(clazz,
(String)targetVisualProperty));
- } else if ( targetVisualProperty instanceof
VisualProperty ) {
+ final VisualProperty<?> vp =
m_view.dingLexicon.lookup(clazz, targetVisualProperty.toString());
+ if (vp == null)
+ isSelected = false;
+ else
+ isSelected = view.isValueLocked(vp);
+ } else if ( targetVisualProperty instanceof
VisualProperty )
isSelected =
view.isValueLocked((VisualProperty<?>)targetVisualProperty);
- }
}
if ( useCheckBox != null ) {
@@ -290,7 +293,7 @@
title = pref.substring(last + 1);
pref = pref.substring(0, last);
final GravityTracker gravityTracker =
tracker.getGravityTracker(pref);
- JMenuItem item = createMenuItem(tf,
title,useCheckBoxMenuItem);
+ final JMenuItem item = createMenuItem(tf,
title,useCheckBoxMenuItem);
if (useCheckBoxMenuItem) {
final JCheckBoxMenuItem checkBox =
(JCheckBoxMenuItem)item;
checkBox.setSelected(isSelected);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
2012-01-09 20:06:54 UTC (rev 27953)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
2012-01-09 21:53:23 UTC (rev 27954)
@@ -4,7 +4,10 @@
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Map;
+import java.util.Properties;
+import javax.swing.text.View;
+
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNode;
import org.cytoscape.service.util.CyServiceRegistrar;
@@ -52,6 +55,7 @@
// Tree traversal
final VisualLexiconNode nodeRootNode =
lexicon.getVisualLexiconNode(nodeRoot);
final VisualLexiconNode edgeRootNode =
lexicon.getVisualLexiconNode(edgeRoot);
+
depthFirst(PARENT_MENU_ITEM, nodeRootNode);
depthFirst(PARENT_MENU_ITEM, edgeRootNode);
}
@@ -68,10 +72,10 @@
final String newMenu = menuText + "." +
vp.getDisplayName();
if (child.getChildren().size() == 0) {
// Leaf
- final Dictionary<String, Object> vpProp = new
Hashtable<String, Object>();
+ final Properties vpProp = new Properties();
vpProp.put(MENU_KEY, newMenu);
vpProp.put("useCheckBoxMenuItem", "true");
- vpProp.put("targetVP", vp);
+ vpProp.put("targetVP", vp.getIdString());
if
(vp.getTargetDataType().equals(CyNode.class)) {
final NodeViewTaskFactory ntf = new
NodeBypassMenuTaskFactory(null, vp,
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypassMenuTaskFactory.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypassMenuTaskFactory.java
2012-01-09 20:06:54 UTC (rev 27953)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypassMenuTaskFactory.java
2012-01-09 21:53:23 UTC (rev 27954)
@@ -10,15 +10,16 @@
import org.cytoscape.work.TaskIterator;
public class NodeBypassMenuTaskFactory extends AbstractNodeViewTaskFactory {
-
+
private final VisualProperty<?> vp;
private final ValueEditor<?> editor;
private final Component parent;
-
+
private final SelectedVisualStyleManager selectedManager;
-
- NodeBypassMenuTaskFactory(final Component parent, final
VisualProperty<?> vp, final ValueEditor<?> editor, final
SelectedVisualStyleManager selectedManager) {
+
+ NodeBypassMenuTaskFactory(final Component parent, final
VisualProperty<?> vp, final ValueEditor<?> editor,
+ final SelectedVisualStyleManager selectedManager) {
this.vp = vp;
this.editor = editor;
this.parent = parent;
--
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.
