Author: ruschein
Date: 2010-08-17 15:35:58 -0700 (Tue, 17 Aug 2010)
New Revision: 21418
Modified:
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TFWrapper.java
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TaskExecutor.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
core3/work-api/branches/JR-tunables-cleanup/src/main/java/org/cytoscape/work/TunableInterceptor.java
core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
core3/work-api/trunk/src/main/java/org/cytoscape/work/TunableInterceptor.java
core3/work-headless-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/CLTunableInterceptor.java
core3/work-spring-hack/trunk/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java
core3/work-swing-impl/branches/JR-tunables-cleanup/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LoadPropsInterceptor.java
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StorePropsInterceptor.java
Log:
Renamed createUI() to execUI().
Modified:
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TFWrapper.java
===================================================================
---
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TFWrapper.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TFWrapper.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -1,5 +1,6 @@
package org.cytoscape.cmdline.internal;
+
import org.apache.commons.cli.Option;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TaskManager;
@@ -92,12 +93,4 @@
public TaskFactory getT(){
return factory;
}
-
-// public void executeTask() {
-// Task task = factory.getTask();
-// ti.loadTunables(task);
-// if ( !ti.createUI(task) )
-// return;
-// taskManager.execute(task);
-// }
}
Modified:
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TaskExecutor.java
===================================================================
---
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TaskExecutor.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TaskExecutor.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -1,5 +1,6 @@
package org.cytoscape.cmdline.internal;
+
import org.cytoscape.work.SuperTask;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskFactory;
@@ -51,7 +52,7 @@
this.tm = tm;
Task task = tf.getTask();
ti.loadTunables(task);
- if ( !ti.createUI(task) )
+ if (!ti.execUI(task))
return;
tasks[numberTasks]=task;
numberTasks++;
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -1,14 +1,6 @@
-
/*
- Copyright (c) 2009, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2009, 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
@@ -249,7 +241,7 @@
private void executeTask(TaskFactory tf) {
Task task = tf.getTask();
m_view.interceptor.loadTunables(task);
- if ( !m_view.interceptor.createUI(task) )
+ if (!m_view.interceptor.execUI(task))
return;
m_view.manager.execute(task);
}
Modified:
core3/work-api/branches/JR-tunables-cleanup/src/main/java/org/cytoscape/work/TunableInterceptor.java
===================================================================
---
core3/work-api/branches/JR-tunables-cleanup/src/main/java/org/cytoscape/work/TunableInterceptor.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/work-api/branches/JR-tunables-cleanup/src/main/java/org/cytoscape/work/TunableInterceptor.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -3,7 +3,6 @@
import java.util.Map;
-
/**
* Provides methods to intercept the Objects annotated as
<code>@Tunable</code>, use, and display them.
* Intended to be used as an OSGi server.
@@ -47,7 +46,7 @@
* @param obs Object[] which contains classes with
<code>Tunables</code> that need to be displayed to a user.
* @return newValuesSet True if at least one value has been modified,
false if not.
*/
- boolean createUI(Object... obs);//TODO: should this be called something
like execUI() instead?
+ boolean execUI(Object... obs);//TODO: should this be called something
like execUI() instead?
/**
Modified:
core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
===================================================================
---
core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTunableInterceptor.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -291,7 +291,7 @@
*
* @return DOCUMENT ME!
*/
- public abstract boolean createUI(Object... objs);
+ public abstract boolean execUI(Object... objs);
public abstract void setParent(Object o);
public abstract boolean handle();
}
Modified:
core3/work-api/trunk/src/main/java/org/cytoscape/work/TunableInterceptor.java
===================================================================
---
core3/work-api/trunk/src/main/java/org/cytoscape/work/TunableInterceptor.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/work-api/trunk/src/main/java/org/cytoscape/work/TunableInterceptor.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -2,6 +2,7 @@
import java.util.Map;
+import javax.swing.JPanel;
/**
@@ -32,8 +33,12 @@
*/
Map<String, TH> getHandlers(Object o);
-
+
/**
+ */
+ JPanel getUI();
+
+ /**
* Display the identified tunables to a user in order to allow her/him
to modify their values.
* <p><pre>
* Create the UI with JPanels for each <code>GUIHandler</code>, and
display it to the user :
@@ -47,7 +52,7 @@
* @param obs Object[] which contains classes with
<code>Tunables</code> that need to be displayed to a user.
* @return newValuesSet True if at least one value has been modified,
false if not.
*/
- boolean createUI(Object... obs);//TODO: should this be called something
like execUI() instead?
+ boolean execUI(Object... obs);
/**
Modified:
core3/work-headless-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/CLTunableInterceptor.java
===================================================================
---
core3/work-headless-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/CLTunableInterceptor.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/work-headless-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/CLTunableInterceptor.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -1,5 +1,6 @@
package org.cytoscape.work.internal.tunables;
+
import java.util.ArrayList;
import java.util.List;
@@ -12,6 +13,7 @@
import org.cytoscape.work.AbstractTunableInterceptor;
import org.cytoscape.cmdline.launcher.CommandLineProvider;
+
/**
* Interceptor of <code>Tunable</code> that will be applied on
<code>CLHandlers</code>.
*
@@ -70,7 +72,7 @@
*
* @param an Object Array that contains <code>Tasks</code>
*/
- public boolean createUI(Object ... objs) {
+ public boolean execUI(Object ... objs) {
List<CLHandler> lh = new ArrayList<CLHandler>();
Modified:
core3/work-spring-hack/trunk/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java
===================================================================
---
core3/work-spring-hack/trunk/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/work-spring-hack/trunk/src/main/java/org/cytoscape/work/spring/SpringTunableInterceptor.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -40,5 +40,5 @@
return objs;
}
- public abstract boolean createUI(Object... obj);
+ public abstract boolean execUI(Object... obj);
}
Modified:
core3/work-swing-impl/branches/JR-tunables-cleanup/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
===================================================================
---
core3/work-swing-impl/branches/JR-tunables-cleanup/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/work-swing-impl/branches/JR-tunables-cleanup/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -1,5 +1,6 @@
package org.cytoscape.work.internal.tunables;
+
import java.awt.Color;
import java.awt.Component;
import java.util.ArrayList;
@@ -102,7 +103,7 @@
*
* @return if new values has been successfully set
*/
- public boolean createUI(Object... proxyObjs){
+ public boolean execUI(Object... proxyObjs){
this.objs = convertSpringProxyObjs( proxyObjs );
lh = new ArrayList<Guihandler>();
for ( Object o : objs ) {
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -2,6 +2,7 @@
import java.awt.Color;
+import java.awt.Container;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -50,7 +51,7 @@
*/
public class GuiTunableInterceptor extends
SpringTunableInterceptor<GUIHandler> {
private JPanel parentPanel = null;
- private Map<List<GUIHandler>, JPanel> panelMap;
+ private Map<List<GUIHandler>, Container> panelMap;
private List<GUIHandler> handlers;
private boolean newValuesSet;
private Object[] objectsWithTunables;
@@ -62,7 +63,7 @@
*/
public GuiTunableInterceptor(final HandlerFactory<GUIHandler> factory) {
super(factory);
- panelMap = new HashMap<java.util.List<GUIHandler>, JPanel>();
+ panelMap = new HashMap<List<GUIHandler>, Container>();
logger = LoggerFactory.getLogger(getClass());
}
@@ -109,7 +110,7 @@
*
* @return if new values has been successfully set
*/
- public boolean createUI(Object... proxyObjs) {
+ public boolean execUI(Object... proxyObjs) {
this.objectsWithTunables = convertSpringProxyObjs(proxyObjs);
handlers = new ArrayList<GUIHandler>();
JPanel providedGUI = null;
@@ -150,7 +151,7 @@
if (providedGUI != null) {
//if no parentPanel is defined, then create a new
JDialog to display the Tunables' panels
if (parentPanel == null) {
- displayOptionPanel(providedGUI);
+ displayGUI(providedGUI);
return newValuesSet;
} else { //else add them to the "parentPanel" JPanel
parentPanel.removeAll();
@@ -171,7 +172,7 @@
if (!panelMap.containsKey(handlers)) {
final String MAIN = " ";
- Map<String, JPanel> panels = new HashMap<String,
JPanel>();
+ Map<String, Container> panels = new HashMap<String,
Container>();
final JPanel topLevel = createSimplePanel(MAIN, null,
Param.hidden);
panels.put(MAIN, topLevel);
@@ -244,7 +245,7 @@
//if no parentPanel is defined, then create a new JDialog to
display the Tunables' panels
if (parentPanel == null) {
- displayOptionPanel(panelMap.get(handlers));
+ displayGUI(panelMap.get(handlers));
return newValuesSet;
} else { //else add them to the "parentPanel" JPanel
parentPanel.removeAll();
@@ -342,24 +343,42 @@
* Set the new <i>"value"</i> to <code>Tunable</code> object if the
user clicked on
* <i>OK</i>, and if the validate method from
<code>TunableValidator</code> interface succeeded.
*/
- private void displayOptionPanel(final JPanel optionPanel) {
+ private void displayGUI(final Container container) {
+ if (container instanceof JPanel) {
+ try {
+ displayGUI((JPanel)container);
+ } catch (final Exception e) {
+ logger.error("This should never happen!\n" + e);
+ }
+ } else { // Assume we're dealing with a JDialog.
+ try {
+ displayGUI((JDialog)container);
+ } catch (final Exception e) {
+ logger.error("This should never happen!\n" + e);
+ }
+ }
+ }
+
+ private void displayGUI(final JPanel optionPanel) {
Object[] buttons = {"OK", "Cancel"};
- int n = JOptionPane.showOptionDialog(parentPanel, optionPanel,
- "Set Parameters",
- JOptionPane.YES_NO_CANCEL_OPTION,
- JOptionPane.PLAIN_MESSAGE,
- null,
- buttons,
- buttons[0]);
- if (n == JOptionPane.OK_OPTION) {
+ int result = JOptionPane.showOptionDialog(parentPanel,
optionPanel,
+ "Set Parameters",
+
JOptionPane.YES_NO_CANCEL_OPTION,
+
JOptionPane.PLAIN_MESSAGE,
+ null,
+ buttons,
+ buttons[0]);
+ if (result == JOptionPane.OK_OPTION) {
for (final GUIHandler h : handlers)
h.handleDependents();
validateTunableInput();
- }
- else
+ } else
newValuesSet = false;
}
+ private void displayGUI(final JDialog optionDialog) {
+ }
+
/**
* Check if the conditions set in validate method from
<code>TunableValidator</code> are met
*
@@ -379,7 +398,7 @@
"Input
Validation Problem",
JOptionPane.ERROR_MESSAGE);
if (parentPanel == null)
-
displayOptionPanel(panelMap.get(handlers));
+
displayGUI(panelMap.get(handlers));
return false;
}
} catch (Exception e) {
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LoadPropsInterceptor.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LoadPropsInterceptor.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/LoadPropsInterceptor.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -13,7 +13,7 @@
this.inputProps = inputProps;
}
- public boolean createUI(Object... pobjs) {
+ public boolean execUI(Object... pobjs) {
Object[] objs = convertSpringProxyObjs(pobjs);
//java.util.List<PropHandler> lh = new ArrayList<PropHandler>();
for ( Object o : objs ) {
@@ -25,14 +25,10 @@
for ( PropHandler p : lh ) {
p.setProps( inputProps );
}
-// lh.addAll( handlerMap.get(o).values() );
}
-// for (PropHandler p : lh) {
-// p.add(inputProps);
-// }
return true;
}
- public boolean handle(){return false;}
- public void setParent(Object o) {};
+ public boolean handle(){ return false; }
+ public void setParent(Object o) { }
}
Modified:
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StorePropsInterceptor.java
===================================================================
---
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StorePropsInterceptor.java
2010-08-17 22:23:39 UTC (rev 21417)
+++
core3/work-tunable-props-impl/trunk/src/main/java/org/cytoscape/work/internal/props/StorePropsInterceptor.java
2010-08-17 22:35:58 UTC (rev 21418)
@@ -14,7 +14,7 @@
this.inputProps = inputProps;
}
- public boolean createUI(Object... pobjs) {
+ public boolean execUI(Object... pobjs) {
Object[] objs = convertSpringProxyObjs(pobjs);
for ( Object o : objs ) {
if ( !handlerMap.containsKey( o ) )
@@ -22,17 +22,12 @@
Collection<PropHandler> lh = handlerMap.get(o).values();
- for ( PropHandler p : lh ) {
- inputProps.putAll( p.getProps() );
- }
-// lh.addAll( handlerMap.get(o).values() );
+ for (final PropHandler p : lh)
+ inputProps.putAll(p.getProps());
}
-// for (PropHandler p : lh) {
-// inputProps.putAll(p.getProps());
-// }
return true;
}
- public boolean handle(){return false;};
- public void setParent(Object o){};
+ public boolean handle() { return false; }
+ public void setParent(Object o) { }
}
--
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.
