Author: ruschein
Date: 2010-08-17 16:14:11 -0700 (Tue, 17 Aug 2010)
New Revision: 21420
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
Log:
Replaced createUI() with execUI().
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2010-08-17 23:10:04 UTC (rev 21419)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2010-08-17 23:14:11 UTC (rev 21420)
@@ -1,16 +1,8 @@
-/* vim: set ts=2:
-
+/*
File: LayoutSettingsDialog.java
- Copyright (c) 2006, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2006, 2010, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2.1 of the License, or
@@ -37,6 +29,7 @@
*/
package cytoscape.internal.layout.ui;
+
import org.cytoscape.session.CyNetworkManager;
import cytoscape.view.CySwingApplication;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
@@ -177,10 +170,8 @@
Set<String> menus = menuMgr.getLayoutMenuNames();
for (String menu : menus) {
-
- if (menus.size() > 1) {
+ if (menus.size() > 1)
algorithmSelector.addItem(menu);
- }
for (CyLayoutAlgorithm algo :
menuMgr.getLayoutsInMenu(menu)) {
// TODO might want a check here to see if
algorithm has any tunables
@@ -189,7 +180,6 @@
}
}
-
private class AlgorithmActionListener implements ActionListener {
public void actionPerformed(ActionEvent e) {
Object o = algorithmSelector.getSelectedItem();
@@ -199,8 +189,10 @@
ti.loadTunables(newLayout);
ti.setParent(algorithmPanel);
try {
- ti.createUI(newLayout);
- } catch (Exception e1) {e1.printStackTrace();}
+ ti.execUI(newLayout);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
pack();
currentLayout = newLayout;
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
2010-08-17 23:10:04 UTC (rev 21419)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
2010-08-17 23:14:11 UTC (rev 21420)
@@ -1,15 +1,8 @@
/*
File: TaskFactoryTunableAction.java
- Copyright (c) 2006, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2006, 2010, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2.1 of the License, or
@@ -34,9 +27,9 @@
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
package cytoscape.internal.task;
+
import java.awt.event.ActionEvent;
import java.util.Map;
@@ -50,6 +43,7 @@
import cytoscape.view.CytoscapeAction;
import org.cytoscape.session.CyNetworkManager;
+
public class TaskFactoryTunableAction<T extends TaskFactory> extends
CytoscapeAction {
protected T factory;
@@ -78,7 +72,7 @@
//
((HandlerController)task).controlHandlers(interceptor.getHandlers(task));
// create the UI based on the object
- if ( !interceptor.createUI(task) )
+ if ( !interceptor.execUI(task) )
return;
// execute the task in a separate thread
--
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.
