Author: kono
Date: 2012-03-23 14:42:16 -0700 (Fri, 23 Mar 2012)
New Revision: 28635
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractEnableSupport.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CyAction.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/StringEnableSupport.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/task/TaskFactoryTunableAction.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuBar.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenus.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMenuManager.java
Log:
Minor updates to use ServiceProperties static strings in activators.
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2012-03-23 21:35:32 UTC (rev 28634)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2012-03-23 21:42:16 UTC (rev 28635)
@@ -40,6 +40,7 @@
import javax.swing.event.PopupMenuEvent;
import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.work.ServiceProperties;
import org.cytoscape.work.TaskFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,7 +55,9 @@
* @CyAPI.Abstract.Class
*/
public abstract class AbstractCyAction extends AbstractAction implements
CyAction {
+
private static final long serialVersionUID = -2245672104075936952L;
+
private static final Logger logger =
LoggerFactory.getLogger(AbstractCyAction.class);
/**
@@ -131,7 +134,7 @@
* @param applicationManager The application manager providing context
for this action.
* @param enableFor A string declaring which states this action should
be enabled for.
*/
- public AbstractCyAction(final String name, final CyApplicationManager
applicationManager, String enableFor) {
+ public AbstractCyAction(final String name, final CyApplicationManager
applicationManager, final String enableFor) {
super(name);
this.enabler = new
StringEnableSupport(this,enableFor,applicationManager);
}
@@ -161,7 +164,7 @@
*/
public AbstractCyAction(final Map<String, String> configProps,
final CyApplicationManager applicationManager) {
- this(configProps.get("title"), applicationManager,
configProps.get("enableFor"));
+ this(configProps.get(ServiceProperties.TITLE),
applicationManager, configProps.get(ServiceProperties.ENABLE_FOR));
configFromProps( configProps );
}
@@ -230,8 +233,8 @@
public AbstractCyAction(final Map<String, String> configProps,
final CyApplicationManager applicationManager,
final TaskFactory factory) {
- super(configProps.get("title"));
- String enableFor = configProps.get("enableFor");
+ super(configProps.get(ServiceProperties.TITLE));
+ String enableFor =
configProps.get(ServiceProperties.ENABLE_FOR);
if ( enableFor == null )
this.enabler = new
TaskFactoryEnableSupport(this,factory);
else
@@ -242,7 +245,7 @@
private void configFromProps(final Map<String, String> configProps) {
- logger.debug("New CyAction with title: " +
configProps.get("title"));
+ logger.debug("New CyAction with title: " +
configProps.get(ServiceProperties.TITLE));
final String prefMenu = configProps.get("preferredMenu");
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractEnableSupport.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractEnableSupport.java
2012-03-23 21:35:32 UTC (rev 28634)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractEnableSupport.java
2012-03-23 21:42:16 UTC (rev 28635)
@@ -29,17 +29,11 @@
*/
package org.cytoscape.application.swing;
-import org.cytoscape.application.CyApplicationManager;
-
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNode;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.work.swing.DynamicSubmenuListener;
-
import javax.swing.Action;
import javax.swing.JMenuItem;
+import org.cytoscape.work.swing.DynamicSubmenuListener;
+
abstract class AbstractEnableSupport {
private final Action action;
@@ -86,8 +80,12 @@
*/
public abstract void updateEnableState();
- protected synchronized final void setEnabled(boolean b) {
+ protected void setEnabled(final boolean b) {
+
+ //System.out.println(action + ", " + menuItem + " ========>
menu enabled: " + b);
+
enableState = b;
+
if ( submenuListener != null )
submenuListener.setEnabled(enableState);
if ( action != null )
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CyAction.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CyAction.java
2012-03-23 21:35:32 UTC (rev 28634)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CyAction.java
2012-03-23 21:42:16 UTC (rev 28635)
@@ -39,11 +39,8 @@
import javax.swing.Action;
import javax.swing.KeyStroke;
-import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener;
import javax.swing.event.PopupMenuListener;
-import java.awt.event.ActionEvent;
-import java.util.List;
/**
* An interface that describes how an action should be placed within
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/StringEnableSupport.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/StringEnableSupport.java
2012-03-23 21:35:32 UTC (rev 28634)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/StringEnableSupport.java
2012-03-23 21:42:16 UTC (rev 28635)
@@ -29,17 +29,14 @@
*/
package org.cytoscape.application.swing;
-import org.cytoscape.application.CyApplicationManager;
+import javax.swing.Action;
+import javax.swing.JMenuItem;
-import org.cytoscape.model.CyEdge;
+import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.swing.DynamicSubmenuListener;
-import javax.swing.Action;
-import javax.swing.JMenuItem;
-
/**
* A class that allows the enabled state of an Action of JMenuItem to managed
in
* a consistent way.
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-03-23 21:35:32 UTC (rev 28634)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-03-23 21:42:16 UTC (rev 28635)
@@ -116,6 +116,7 @@
import org.cytoscape.view.model.events.NetworkViewDestroyedListener;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.work.ServiceProperties;
import org.cytoscape.work.SynchronousTaskManager;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.swing.DialogTaskManager;
@@ -309,13 +310,13 @@
registerService(bc, helpAboutTaskFactory, TaskFactory.class,
helpAboutTaskFactoryProps);
Properties arrangeGridTaskFactoryProps = new Properties();
- arrangeGridTaskFactoryProps.setProperty("enableFor",
"networkAndView");
+
arrangeGridTaskFactoryProps.setProperty(ServiceProperties.ENABLE_FOR,
"networkAndView");
arrangeGridTaskFactoryProps.setProperty("preferredMenu",
"View.Arrange Network Windows[110]");
arrangeGridTaskFactoryProps.setProperty("title", "Grid");
registerService(bc, arrangeGridTaskFactory, TaskFactory.class,
arrangeGridTaskFactoryProps);
Properties arrangeCascadeTaskFactoryProps = new Properties();
- arrangeCascadeTaskFactoryProps.setProperty("enableFor",
"networkAndView");
+
arrangeCascadeTaskFactoryProps.setProperty(ServiceProperties.ENABLE_FOR,
"networkAndView");
arrangeCascadeTaskFactoryProps.setProperty("preferredMenu",
"View.Arrange
Network Windows[110]");
arrangeCascadeTaskFactoryProps.setProperty("title", "Cascade");
@@ -323,7 +324,7 @@
arrangeCascadeTaskFactoryProps);
Properties arrangeHorizontalTaskFactoryProps = new Properties();
- arrangeHorizontalTaskFactoryProps.setProperty("enableFor",
"networkAndView");
+
arrangeHorizontalTaskFactoryProps.setProperty(ServiceProperties.ENABLE_FOR,
"networkAndView");
arrangeHorizontalTaskFactoryProps.setProperty("preferredMenu",
"View.Arrange
Network Windows[110]");
arrangeHorizontalTaskFactoryProps.setProperty("title",
"Horizontal");
@@ -331,7 +332,7 @@
arrangeHorizontalTaskFactoryProps);
Properties arrangeVerticalTaskFactoryProps = new Properties();
- arrangeVerticalTaskFactoryProps.setProperty("enableFor",
"networkAndView");
+
arrangeVerticalTaskFactoryProps.setProperty(ServiceProperties.ENABLE_FOR,
"networkAndView");
arrangeVerticalTaskFactoryProps.setProperty("preferredMenu",
"View.Arrange
Network Windows[110]");
arrangeVerticalTaskFactoryProps.setProperty("title",
"Vertical");
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/task/TaskFactoryTunableAction.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/task/TaskFactoryTunableAction.java
2012-03-23 21:35:32 UTC (rev 28634)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/task/TaskFactoryTunableAction.java
2012-03-23 21:42:16 UTC (rev 28635)
@@ -41,26 +41,26 @@
public class TaskFactoryTunableAction extends AbstractCyAction {
- private static final long serialVersionUID = 8009915597814265396L;
+ private static final long serialVersionUID = 8009915597814265396L;
- private final static Logger logger =
LoggerFactory.getLogger(TaskFactoryTunableAction.class);
+ private final static Logger logger =
LoggerFactory.getLogger(TaskFactoryTunableAction.class);
- final protected TaskFactory factory;
- final protected DialogTaskManager manager;
+ final protected TaskFactory factory;
+ final protected DialogTaskManager manager;
final protected CyApplicationManager applicationManager;
- public TaskFactoryTunableAction(final DialogTaskManager manager, final
TaskFactory factory, final Map<String, String> serviceProps,
- final CyApplicationManager applicationManager) {
- super(serviceProps, applicationManager, factory);
- this.manager = manager;
- this.applicationManager = applicationManager;
- this.factory = factory;
- }
+ public TaskFactoryTunableAction(final DialogTaskManager manager, final
TaskFactory factory,
+ final Map<String, String> serviceProps, final
CyApplicationManager applicationManager) {
+ super(serviceProps, applicationManager, factory);
+ this.manager = manager;
+ this.applicationManager = applicationManager;
+ this.factory = factory;
+ }
- public void actionPerformed(ActionEvent a) {
- logger.debug("About to execute task from factory: " +
factory.toString());
-
- // execute the task(s) in a separate thread
- manager.execute(factory.createTaskIterator());
- }
+ public void actionPerformed(ActionEvent a) {
+ logger.debug("About to execute task from factory: " +
factory.toString());
+
+ // execute the task(s) in a separate thread
+ manager.execute(factory.createTaskIterator());
+ }
}
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuBar.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuBar.java
2012-03-23 21:35:32 UTC (rev 28634)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenuBar.java
2012-03-23 21:42:16 UTC (rev 28635)
@@ -92,10 +92,9 @@
if (accelerator != null)
menu_item.setAccelerator(accelerator);
- ((JMenu)gravityTracker.getMenu()).addMenuListener(action);
+ ((JMenu) gravityTracker.getMenu()).addMenuListener(action);
gravityTracker.addMenuItem(menu_item, action.getMenuGravity());
- logger.debug("Inserted action for menu: " + menu_name +
- " with gravity: " + action.getMenuGravity());
+ logger.debug("Inserted action for menu: " + menu_name + " with
gravity: " + action.getMenuGravity());
actionMenuItemMap.put(action, menu_item);
revalidate();
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenus.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenus.java
2012-03-23 21:35:32 UTC (rev 28634)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeMenus.java
2012-03-23 21:42:16 UTC (rev 28635)
@@ -37,93 +37,92 @@
public class CytoscapeMenus {
- final private CytoscapeMenuBar menuBar;
- final private CytoscapeToolBar toolBar;
+ final private CytoscapeMenuBar menuBar;
+ final private CytoscapeToolBar toolBar;
- public CytoscapeMenus(CytoscapeMenuBar menuBar, CytoscapeToolBar toolBar) {
- this.menuBar = menuBar;
- this.toolBar = toolBar;
+ public CytoscapeMenus(CytoscapeMenuBar menuBar, CytoscapeToolBar
toolBar) {
+ this.menuBar = menuBar;
+ this.toolBar = toolBar;
- menuBar.addMenu("File", 0.0);
- menuBar.addMenu("File.Recent Session", 0.0);
- menuBar.addMenu("File.New", 0.5);
- menuBar.addMenu("File.New.Network", 0.0);
- menuBar.addMenu("File.Import", 5.0);
- menuBar.addMenu("File.Export", 5.1);
- menuBar.addMenu("Edit", 0.0);
- menuBar.addMenu("View", 0.0);
- menuBar.addMenu("Select", 0.0);
- menuBar.addMenu("Select.Nodes", 1.0);
- menuBar.addMenu("Select.Edges", 1.1);
- menuBar.addMenu("Layout", 0.0);
- menuBar.addMenu("Apps", 0.0);
- menuBar.addMenu("Tools", 0.0);
- menuBar.addMenu("Help", 0.0);
+ menuBar.addMenu("File", 0.0);
+ menuBar.addMenu("File.Recent Session", 0.0);
+ menuBar.addMenu("File.New", 0.5);
+ menuBar.addMenu("File.New.Network", 0.0);
+ menuBar.addMenu("File.Import", 5.0);
+ menuBar.addMenu("File.Export", 5.1);
+ menuBar.addMenu("Edit", 0.0);
+ menuBar.addMenu("View", 0.0);
+ menuBar.addMenu("Select", 0.0);
+ menuBar.addMenu("Select.Nodes", 1.0);
+ menuBar.addMenu("Select.Edges", 1.1);
+ menuBar.addMenu("Layout", 0.0);
+ menuBar.addMenu("Apps", 0.0);
+ menuBar.addMenu("Tools", 0.0);
+ menuBar.addMenu("Help", 0.0);
- menuBar.addSeparator("File", 2.0);
- menuBar.addSeparator("File", 4.0);
- menuBar.addSeparator("File", 6.0);
- if (!isMac()) {
- menuBar.addSeparator("File", 8.0);
- }
+ menuBar.addSeparator("File", 2.0);
+ menuBar.addSeparator("File", 4.0);
+ menuBar.addSeparator("File", 6.0);
+ if (!isMac())
+ menuBar.addSeparator("File", 8.0);
- menuBar.addSeparator("Edit", 2.0);
- menuBar.addSeparator("Edit", 4.0);
- menuBar.addSeparator("Edit", 6.0);
+ menuBar.addSeparator("Edit", 2.0);
+ menuBar.addSeparator("Edit", 4.0);
+ menuBar.addSeparator("Edit", 6.0);
- menuBar.addMenu("Edit.Preferences", 10.0);
+ menuBar.addMenu("Edit.Preferences", 10.0);
- menuBar.addSeparator("View", 2.0);
- menuBar.addSeparator("View", 6.0);
+ menuBar.addSeparator("View", 2.0);
+ menuBar.addSeparator("View", 6.0);
- menuBar.addSeparator("Select", 2.0);
- menuBar.addSeparator("Select", 4.0);
- menuBar.addSeparator("Select", 6.0);
+ menuBar.addSeparator("Select", 2.0);
+ menuBar.addSeparator("Select", 4.0);
+ menuBar.addSeparator("Select", 6.0);
- menuBar.addSeparator("Layout", 2.0);
- menuBar.addSeparator("Layout", 4.0);
- menuBar.addSeparator("Layout", 6.0);
+ menuBar.addSeparator("Layout", 2.0);
+ menuBar.addSeparator("Layout", 4.0);
+ menuBar.addSeparator("Layout", 6.0);
- menuBar.addSeparator("Apps", 2.0);
+ menuBar.addSeparator("Apps", 2.0);
- menuBar.addSeparator("Help", 2.0);
+ menuBar.addSeparator("Help", 2.0);
- toolBar.addSeparator(2.0f);
- toolBar.addSeparator(4.0f);
- toolBar.addSeparator(6.0f);
- toolBar.addSeparator(8.0f);
- toolBar.addSeparator(10.0f);
- }
+ toolBar.addSeparator(2.0f);
+ toolBar.addSeparator(4.0f);
+ toolBar.addSeparator(6.0f);
+ toolBar.addSeparator(8.0f);
+ toolBar.addSeparator(10.0f);
+ }
private boolean isMac() {
return System.getProperty("os.name").startsWith("Mac OS X");
}
public JMenu getJMenu(String s) {
- return menuBar.getMenu(s);
- }
+ return menuBar.getMenu(s);
+ }
- public JMenuBar getJMenuBar() {
- return menuBar;
- }
+ public JMenuBar getJMenuBar() {
+ return menuBar;
+ }
- public JToolBar getJToolBar() {
- return toolBar;
- }
+ public JToolBar getJToolBar() {
+ return toolBar;
+ }
- public void removeAction(CyAction action) {
- if (action.isInMenuBar())
- menuBar.removeAction(action);
+ public void removeAction(CyAction action) {
+ if (action.isInMenuBar())
+ menuBar.removeAction(action);
- if (action.isInToolBar())
- toolBar.removeAction(action);
- }
+ if (action.isInToolBar())
+ toolBar.removeAction(action);
+ }
- public void addAction(CyAction action) {
- if (action.isInMenuBar())
- menuBar.addAction(action);
+ public void addAction(CyAction action) {
+ if (action.isInMenuBar())
+ menuBar.addAction(action);
- if (action.isInToolBar())
- toolBar.addAction(action);
- }
+ if (action.isInToolBar())
+ toolBar.addAction(action);
+ }
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMenuManager.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMenuManager.java
2012-03-23 21:35:32 UTC (rev 28634)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMenuManager.java
2012-03-23 21:42:16 UTC (rev 28635)
@@ -83,7 +83,6 @@
this.generateValues = new JMenu("Mapping Value Generators");
this.rightClickMenu.add(generateValues);
- // modifyValues = new JMenu(modifyMenuLabel);
}
public void setIconManager(IconManager iconManager) {
@@ -165,11 +164,13 @@
mainMenu.add(menuItem);
else if(menuDef.toString().equals(CONTEXT_MENU))
edit.add(menuItem);
-
}
+
+ private void executeTask() {
+
+ }
public void removeTaskFactory(final TaskFactory taskFactory, Map
properties) {
-
}
public void addMappingGenerator(final DiscreteMappingGenerator<?>
generator, @SuppressWarnings("rawtypes") Map properties) {
--
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.
