Author: kono
Date: 2011-07-26 16:40:38 -0700 (Tue, 26 Jul 2011)
New Revision: 26279
Modified:
core3/work-swing-api/trunk/src/main/java/org/cytoscape/work/swing/TunableDialog.java
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/SwingTaskMonitor.java
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/TaskDialog.java
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/tunables/GUITunableInterceptorImpl.java
Log:
refs #106 Parent references had been modified to display Tunable Dialogs always
in front.
Modified:
core3/work-swing-api/trunk/src/main/java/org/cytoscape/work/swing/TunableDialog.java
===================================================================
---
core3/work-swing-api/trunk/src/main/java/org/cytoscape/work/swing/TunableDialog.java
2011-07-26 22:27:40 UTC (rev 26278)
+++
core3/work-swing-api/trunk/src/main/java/org/cytoscape/work/swing/TunableDialog.java
2011-07-26 23:40:38 UTC (rev 26279)
@@ -4,6 +4,7 @@
import javax.swing.JPanel;
import java.awt.Component;
import java.awt.Dialog;
+import java.awt.Window;
public class TunableDialog extends JDialog {
@@ -12,7 +13,8 @@
protected JPanel parentPanel = null;
private String userInput = "";
- public TunableDialog() {
+ public TunableDialog(final Window parent) {
+ super(parent);
this.setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
initComponents();
}
Modified:
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/SwingTaskMonitor.java
===================================================================
---
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/SwingTaskMonitor.java
2011-07-26 22:27:40 UTC (rev 26278)
+++
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/SwingTaskMonitor.java
2011-07-26 23:40:38 UTC (rev 26279)
@@ -1,6 +1,7 @@
package org.cytoscape.work.internal.task;
+import java.awt.Dialog.ModalityType;
import java.awt.Window;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
@@ -41,8 +42,8 @@
dialog = new TaskDialog(parent, this);
dialog.setLocationRelativeTo(parent);
- dialog.setAlwaysOnTop(true);
+
if (title != null)
dialog.setTaskTitle(title);
if (statusMessage != null)
Modified:
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/TaskDialog.java
===================================================================
---
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/TaskDialog.java
2011-07-26 22:27:40 UTC (rev 26278)
+++
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/TaskDialog.java
2011-07-26 23:40:38 UTC (rev 26279)
@@ -129,7 +129,6 @@
public TaskDialog(final Window parentFrame, final SwingTaskMonitor
parentTaskMonitor) {
super(parentFrame);
- this.setAlwaysOnTop(true);
this.parentTaskMonitor = parentTaskMonitor;
initComponents();
initTimer();
Modified:
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/tunables/GUITunableInterceptorImpl.java
===================================================================
---
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/tunables/GUITunableInterceptorImpl.java
2011-07-26 22:27:40 UTC (rev 26278)
+++
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/tunables/GUITunableInterceptorImpl.java
2011-07-26 23:40:38 UTC (rev 26279)
@@ -2,6 +2,7 @@
import java.awt.Color;
+import java.awt.Dialog;
import java.awt.Window;
import java.util.ArrayList;
import java.util.HashMap;
@@ -127,9 +128,11 @@
*/
private boolean displayGUI(final JPanel optionPanel, Object...
proxyObjs) {
- tunnableDialog = new TunableDialog();
+ tunnableDialog = new TunableDialog(parent);
tunnableDialog.setLocationRelativeTo(parent);
tunnableDialog.setTitle("Set Parameters");
+ tunnableDialog.setModal(true);
+ tunnableDialog.setAlwaysOnTop(true);
tunnableDialog.addComponent(optionPanel);
tunnableDialog.setVisible(true);
--
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.
