Author: kono
Date: 2012-05-03 17:04:55 -0700 (Thu, 03 May 2012)
New Revision: 29102
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
Log:
fixes #927 ApplyVisualStyleTaskFactory is now in the Network Panel's context
menu.
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-05-03 23:47:56 UTC (rev 29101)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-05-04 00:04:55 UTC (rev 29102)
@@ -276,7 +276,7 @@
ApplyVisualStyleTaskFactoryimpl applyVisualStyleTaskFactory =
new ApplyVisualStyleTaskFactoryimpl(visualMappingManagerServiceRef,
tunableSetterServiceRef);
Properties applyVisualStyleProps = new Properties();
applyVisualStyleProps.setProperty(ID,"applyVisualStyleTaskFactory");
- applyVisualStyleProps.setProperty(TITLE, "Apply visual style");
+ applyVisualStyleProps.setProperty(TITLE, "Apply Visual Style");
applyVisualStyleProps.setProperty(COMMAND,"apply-visualstyle");
applyVisualStyleProps.setProperty(COMMAND_NAMESPACE,"vizmap");
applyVisualStyleProps.setProperty(IN_NETWORK_PANEL_CONTEXT_MENU,"true");
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-05-03 23:47:56 UTC (rev 29101)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-05-04 00:04:55 UTC (rev 29102)
@@ -111,6 +111,7 @@
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
import org.cytoscape.task.TableTaskFactory;
+import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
import org.cytoscape.task.write.SaveSessionAsTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
@@ -179,7 +180,7 @@
OpenBrowser openBrowserServiceRef = getService(bc,
OpenBrowser.class);
VisualMappingManager visualMappingManagerServiceRef =
getService(bc, VisualMappingManager.class);
-
+
UndoAction undoAction = new UndoAction(undoSupportServiceRef);
RedoAction redoAction = new RedoAction(undoSupportServiceRef);
ConfigDirPropertyWriter configDirPropertyWriter = new
ConfigDirPropertyWriter(dialogTaskManagerServiceRef,
@@ -389,6 +390,8 @@
"removeTableTaskFactory",
TableTaskFactory.class);
registerServiceListener(bc, networkViewManager,
"addPresentationFactory",
"removePresentationFactory",
RenderingEngineFactory.class);
+
+ // For Network Panel context menu
registerServiceListener(bc, networkPanel,
"addNetworkViewTaskFactory",
"removeNetworkViewTaskFactory",
NetworkViewTaskFactory.class, CONTEXT_MENU_FILTER);
registerServiceListener(bc, networkPanel,
"addNetworkTaskFactory",
@@ -399,6 +402,7 @@
registerServiceListener(bc, networkPanel,
"addNetworkCollectionTaskFactory",
"removeNetworkCollectionTaskFactory",
NetworkCollectionTaskFactory.class,
CONTEXT_MENU_FILTER);
+
registerServiceListener(bc, configDirPropertyWriter,
"addCyProperty", "removeCyProperty",
CyProperty.class);
registerServiceListener(bc, layoutMenuPopulator, "addLayout",
"removeLayout",
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2012-05-03 23:47:56 UTC (rev 29101)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2012-05-04 00:04:55 UTC (rev 29102)
@@ -84,6 +84,7 @@
import org.cytoscape.task.NetworkTaskFactory;
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
import org.cytoscape.task.NetworkViewTaskFactory;
+import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
import org.cytoscape.util.swing.JTreeTable;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
@@ -235,6 +236,7 @@
popup.addPopupMenuListener(action);
}
+
private void removeFactory(TaskFactory factory) {
JMenuItem item = popupMap.remove(factory);
if (item != null)
@@ -292,6 +294,7 @@
removeFactory(provisionerMap.remove(factory));
}
+
public void setNavigator(final Component comp) {
this.navigatorPanel.removeAll();
this.navigatorPanel.add(comp, BorderLayout.CENTER);
--
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.
