import java.awt.event.MouseMotionAdapter;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.beans.PropertyVetoException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
private static boolean interactiveMode = true;
- public static final Callable<Void> NULLCALLABLE = () -> {
- return null;
+ public static final Runnable NULLCALLABLE = () -> {
};
private Component parentComponent;
private JDialog dialog = null;
- private Map<Object, Callable<Void>> callbacks = new HashMap<>();
+ private Map<Object, Runnable> callbacks = new HashMap<>();
/*
* JalviewJS reports user choice in the dialog as the selected option (text);
initialValueButton = jb;
int buttonAction = buttonActions[i];
- Callable<Void> action = callbacks.get(buttonAction);
+ Runnable action = callbacks.get(buttonAction);
jb.setText((String) o);
jb.addActionListener(new ActionListener()
{
JOptionPane joptionpane = (JOptionPane) joptionpaneObject;
joptionpane.setValue(buttonAction);
if (action != null)
- getExecutor().submit(action);
+ new Thread(action).start();
joptionpane.transferFocusBackward();
joptionpane.setVisible(false);
// put focus and raise parent window if possible, unless cancel or
{
Object o = options[i];
int buttonAction = buttonActions[i];
- Callable<Void> action = callbacks.get(buttonAction);
+ Runnable action = callbacks.get(buttonAction);
JButton jb = new JButton();
jb.setText((String) o);
jb.addActionListener(new ActionListener()
{
joptionpane.setValue(buttonAction);
if (action != null)
- getExecutor().submit(action);
+ new Thread(action).start();
// joptionpane.transferFocusBackward();
joptionpane.transferFocusBackward();
joptionpane.setVisible(false);
@Override
public void internalFrameActivated(InternalFrameEvent arg0)
{
+ System.err.println("##### internalFrameActivated");
}
@Override
public void internalFrameClosed(InternalFrameEvent arg0)
{
+ System.err.println("##### internalFrameClosed");
JvOptionPane.this.internalDialogHandleResponse();
}
@Override
public void internalFrameClosing(InternalFrameEvent arg0)
{
+ System.err.println("##### internalFrameClosing");
}
@Override
public void internalFrameDeactivated(InternalFrameEvent arg0)
{
+ System.err.println("##### internalFrameDeactivated");
}
@Override
public void internalFrameDeiconified(InternalFrameEvent arg0)
{
+ System.err.println("##### internalFrameDeiconified");
}
@Override
public void internalFrameIconified(InternalFrameEvent arg0)
{
+ System.err.println("##### internalFrameIconified");
}
@Override
public void internalFrameOpened(InternalFrameEvent arg0)
{
+ System.err.println("##### internalFrameOpened");
}
});
jif.setVisible(true);
* }
*/
@Override
- public JvOptionPane setResponseHandler(Object response,
- Callable<Void> action)
+ public JvOptionPane setResponseHandler(Object response, Runnable action)
{
if (action == null)
{
return this;
}
- public ExecutorService getExecutor()
- {
- if (executor == null)
- executor = Executors.newCachedThreadPool();
- return executor;
- }
-
- public void setExecutor(ExecutorService es)
- {
- executor = es;
- }
-
public void setDialog(JDialog d)
{
dialog = d;
{
return;
}
- Callable<Void> action = callbacks.get(response);
+ Runnable action = callbacks.get(response);
if (action != null)
{
try
{
- getExecutor().submit(action).get();
+ new Thread(action).start();
// action.call();
} catch (Exception e)
{
{
Object o = options[i];
int buttonAction = buttonActions[i];
- Callable<Void> action = callbacks.get(buttonAction);
+ Runnable action = callbacks.get(buttonAction);
JButton jb;
if (buttons != null && buttons.length > i && buttons[i] != null)
{
{
joptionpane.setValue(buttonAction);
if (action != null)
- getExecutor().submit(action);
+ new Thread(action).start();
// joptionpane.transferFocusBackward();
joptionpane.transferFocusBackward();
joptionpane.setVisible(false);
EventQueue queue = Toolkit.getDefaultToolkit().getSystemEventQueue();
try
{
- while (!f.isClosed())
+ boolean stillModal = true;
+ while (!f.isClosed() && stillModal)
{
if (EventQueue.isDispatchThread())
{
// This mimics EventQueue.dispatchEvent(). We can't use
// EventQueue.dispatchEvent() directly, because it is
// protected, unfortunately.
+ System.out.println(
+ "##### ev source=" + ev.getSource().getClass() + "");
if (ev instanceof ActiveEvent)
+ {
+ System.err.println("##### 1");
((ActiveEvent) ev).dispatch();
- else if (ev.getSource() instanceof Component)
- ((Component) ev.getSource()).dispatchEvent(ev);
+ }
else if (ev.getSource() instanceof MenuComponent)
+ {
+ System.err.println("##### 2");
((MenuComponent) ev.getSource()).dispatchEvent(ev);
+ }
+ else if (ev.getSource() instanceof Component)
+ {
+ System.err.println("##### 3");
+ if (ev.getSource().equals(Desktop.getDesktop().getRootPane()))
+ {
+ stillModal = false;
+ }
+ else
+ {
+ ((Component) ev.getSource()).dispatchEvent(ev);
+ }
+ }
// Other events are ignored as per spec in
// EventQueue.dispatchEvent
+ System.err.println("##### 4");
}
else
{
// Give other threads a chance to become active.
+ System.err.println("##### 5");
Thread.yield();
}
}
} catch (InterruptedException ex)
{
// If we get interrupted, then leave the modal state.
+ System.err.println("##### 6");
} finally
{
+ System.err.println("##### 7");
// Clean up the modal interceptor.
lp.remove(modalInterceptor);
+ f.setVisible(false);
+
+ try
+ {
+ f.setClosed(true);
+ } catch (PropertyVetoException e)
+ {
+ f.doDefaultCloseAction();
+ }
+
// Remove the internal frame from its parent, so it is no longer
// lurking around and clogging memory.
Container parent = f.getParent();
if (parent != null)
+ {
parent.remove(f);
+ }
}
}
public static JvOptionPane frameDialog(Object message, String title,
int messageType, String[] buttonsTextS, String defaultButtonS,
- List<Callable<Void>> handlers, boolean modal)
+ List<Runnable> handlers, boolean modal)
{
JFrame parent = new JFrame();
JvOptionPane jvop = JvOptionPane.newOptionDialog();
}
final int dt = dialogType;
- jvop.getExecutor().execute(() -> {
+ new Thread(() -> {
jvop.showDialog(message, title, dt, messageType, null, buttonsText,
defaultButton, modal, buttons);
- });
+ }).start();
return jvop;
}
git://source.jalview.org / jalview.git / blobdiff