Author: jm
Date: 2012-03-14 13:03:10 -0700 (Wed, 14 Mar 2012)
New Revision: 28536
Modified:
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/AbstractLayoutAlgorithm.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/UndoSupportTaskFactory.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
Log:
Fixes #782: Fixed submenu support for node/edge attributes for layouts
Modified:
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/AbstractLayoutAlgorithm.java
===================================================================
---
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/AbstractLayoutAlgorithm.java
2012-03-14 19:02:12 UTC (rev 28535)
+++
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/AbstractLayoutAlgorithm.java
2012-03-14 20:03:10 UTC (rev 28536)
@@ -273,11 +273,11 @@
}
public void setSubmenuOptions(ListSingleSelection<String> opts) {
- configureLayoutFromSubmenuSelection();
+ configureLayoutFromSubmenuSelection(opts);
}
- protected void configureLayoutFromSubmenuSelection() {
- String selectedMenu = submenuDef.getSelectedValue();
+ protected void
configureLayoutFromSubmenuSelection(ListSingleSelection<String> opts) {
+ String selectedMenu = opts.getSelectedValue();
if (selectedMenu == null || selectedMenu == "")
return;
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/UndoSupportTaskFactory.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/UndoSupportTaskFactory.java
2012-03-14 19:02:12 UTC (rev 28535)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/layout/ui/UndoSupportTaskFactory.java
2012-03-14 20:03:10 UTC (rev 28536)
@@ -1,16 +1,19 @@
package org.cytoscape.internal.layout.ui;
+import java.util.List;
+import java.util.Set;
+
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.view.layout.AbstractLayoutAlgorithm;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.undo.UndoSupport;
+import org.cytoscape.work.util.ListSingleSelection;
public class UndoSupportTaskFactory extends AbstractLayoutAlgorithm {
- private NetworkViewTaskFactory delegate;
+ private AbstractLayoutAlgorithm delegate;
private UndoSupport undo;
private CyEventHelper eventHelper;
private String name;
@@ -39,4 +42,34 @@
super.setNetworkView(netView);
delegate.setNetworkView(netView);
}
+
+ @Override
+ public Set<Class<?>> supportsEdgeAttributes() {
+ return delegate.supportsEdgeAttributes();
+ }
+
+ @Override
+ public Set<Class<?>> supportsNodeAttributes() {
+ return delegate.supportsNodeAttributes();
+ }
+
+ @Override
+ public List<String> getInitialAttributeList() {
+ return delegate.getInitialAttributeList();
+ }
+
+ @Override
+ public void setLayoutAttribute(String attributeName) {
+ delegate.setLayoutAttribute(attributeName);
+ }
+
+ @Override
+ public void setSelectedOnly(boolean selectedOnly) {
+ delegate.setSelectedOnly(selectedOnly);
+ }
+
+ @Override
+ public void setSubmenuOptions(ListSingleSelection<String> opts) {
+ delegate.setSubmenuOptions(opts);
+ }
}
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
2012-03-14 19:02:12 UTC (rev 28535)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
2012-03-14 20:03:10 UTC (rev 28536)
@@ -66,8 +66,10 @@
public void chosenMenu(String s) {
try {
final ListSingleSelection<String> listSingleSelection =
(ListSingleSelection<String>)getValue();
- if ( listSingleSelection != null )
+ if ( listSingleSelection != null ) {
listSingleSelection.setSelectedValue(s);
+ setValue(listSingleSelection);
+ }
} catch (Exception e) {
logger.debug("problem registering the chosen menu :" +
s, e);
}
--
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.
