Author: ruschein
Date: 2010-02-09 14:02:11 -0800 (Tue, 09 Feb 2010)
New Revision: 19274
Modified:
csplugins/trunk/ucsd/pwang/jActiveModules3/src/csplugins/jActiveModules/ActiveModulesUI.java
csplugins/trunk/ucsd/pwang/jActiveModules3/src/csplugins/jActiveModules/dialogs/ActivePathsParametersPopupDialog.java
Log:
Unified button menu, labelling and layout with that of other module finding
plugins.
Modified:
csplugins/trunk/ucsd/pwang/jActiveModules3/src/csplugins/jActiveModules/ActiveModulesUI.java
===================================================================
---
csplugins/trunk/ucsd/pwang/jActiveModules3/src/csplugins/jActiveModules/ActiveModulesUI.java
2010-02-09 21:29:25 UTC (rev 19273)
+++
csplugins/trunk/ucsd/pwang/jActiveModules3/src/csplugins/jActiveModules/ActiveModulesUI.java
2010-02-09 22:02:11 UTC (rev 19274)
@@ -34,28 +34,13 @@
protected ThreadExceptionHandler xHandler;
public ActiveModulesUI() {
- System.err.println("Starting jActiveModules plugin!\n");
- /* initialize variables */
- // JMenu topMenu = new JMenu("jActiveModules");
- JMenuItem jActiveModulesMenuItem = new JMenuItem(
- new SetParametersAction());
- Cytoscape.getDesktop().getCyMenus().getOperationsMenu().add(
- jActiveModulesMenuItem);
+ System.out.println("Starting jActiveModules plugin!\n");
- /* Add function calls to Cytoscape menus */
- // topMenu.add ( new SetParametersAction() );
- // topMenu.add ( new FindActivePathsAction () );
- // topMenu.add ( new ScoreSubComponentAction () );
- // topMenu.add ( new RandomizeAndRunAction () );
- // cytoscapeWindow.getCyMenus().getOperationsMenu().add ( new
- // ScoreSubComponentAction () );
- // cytoscapeWindow.getCyMenus().getOperationsMenu().add ( new
- // RandomizeAndRunAction () );
- /* check for command line arguments to run right away */
- // String [] args = CytoscapeInit.getArgs();
- // ActivePathsCommandLineParser parser = new
- // ActivePathsCommandLineParser(null);
- // apfParams = parser.getActivePathFinderParameters();
+ final JMenuItem menuItem = new JMenuItem("jActiveModules...");
+ menuItem.addActionListener(new SetParametersAction());
+
Cytoscape.getDesktop().getCyMenus().getMenuBar().getMenu("Plugins.Module
Finders...").add(menuItem);
+
+ /* initialize variables */
apfParams = new ActivePathFinderParameters(CytoscapeInit
.getProperties());
apfParams.reloadExpressionAttributes();
Modified:
csplugins/trunk/ucsd/pwang/jActiveModules3/src/csplugins/jActiveModules/dialogs/ActivePathsParametersPopupDialog.java
===================================================================
---
csplugins/trunk/ucsd/pwang/jActiveModules3/src/csplugins/jActiveModules/dialogs/ActivePathsParametersPopupDialog.java
2010-02-09 21:29:25 UTC (rev 19273)
+++
csplugins/trunk/ucsd/pwang/jActiveModules3/src/csplugins/jActiveModules/dialogs/ActivePathsParametersPopupDialog.java
2010-02-09 22:02:11 UTC (rev 19274)
@@ -192,7 +192,7 @@
// /////////////////////////////////////////
JPanel buttonPanel = new JPanel();
- JButton helpButton = new JButton(new AbstractAction("Help")
+ JButton helpButton = new JButton(new AbstractAction("?")
{
public void actionPerformed(ActionEvent e)
{
@@ -200,11 +200,11 @@
}
});
buttonPanel.add(helpButton, BorderLayout.EAST);
+ findModulesButton = new JButton(new FindModulesAction());
+ buttonPanel.add(findModulesButton, BorderLayout.EAST);
JButton dismissButton = new JButton("Close");
dismissButton.addActionListener(new DismissAction());
- buttonPanel.add(dismissButton, BorderLayout.EAST);
- findModulesButton = new JButton(new FindModulesAction());
- buttonPanel.add(findModulesButton, BorderLayout.WEST);
+ buttonPanel.add(dismissButton, BorderLayout.WEST);
c.gridx = 0; c.gridy = 2;
childPanel.add(buttonPanel,c);
@@ -1283,7 +1283,7 @@
public class FindModulesAction extends AbstractAction {
public FindModulesAction() {
- super("Find Modules");
+ super("Search");
}
public void actionPerformed(ActionEvent 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.
