Author: kono
Date: 2011-07-15 15:50:24 -0700 (Fri, 15 Jul 2011)
New Revision: 26195
Modified:
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/ErrorPanel.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:
SetAlwaysOnTop flag had been enabled.
Modified:
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/ErrorPanel.java
===================================================================
---
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/ErrorPanel.java
2011-07-15 22:41:54 UTC (rev 26194)
+++
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/ErrorPanel.java
2011-07-15 22:50:24 UTC (rev 26195)
@@ -36,16 +36,32 @@
package org.cytoscape.work.internal.task;
-import javax.swing.*;
-import javax.swing.text.*;
-import javax.swing.border.EmptyBorder;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridLayout;
+import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import javax.swing.BoxLayout;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextPane;
+import javax.swing.JTree;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.border.EmptyBorder;
+import javax.swing.text.StyledEditorKit;
+import javax.swing.tree.DefaultMutableTreeNode;
+
/**
* Common UI element for displaying errors and stack traces.
*/
@@ -62,12 +78,12 @@
*/
private String userErrorMessage;
- /**
- * Hint to user as to how to fix the error.
- */
- private String tip;
+ /**
+ * Hint to user as to how to fix the error.
+ */
+ private String tip;
- /**
+ /**
* Flag to Show/Hide Error Details.
*/
private boolean showDetails = false;
@@ -85,7 +101,7 @@
/**
* JDialog Owner.
*/
- private JDialog owner;
+ private Window owner;
private static final String SHOW_TEXT = "Show Error Details";
private static final String HIDE_TEXT = "Hide Error Details";
@@ -96,7 +112,7 @@
* @param t Throwable Object. May be null.
* @param userErrorMessage User Readable Error Message. May be null.
*/
- ErrorPanel(JDialog owner, Throwable t, String userErrorMessage) {
+ ErrorPanel(Window owner, Throwable t, String userErrorMessage) {
if (owner == null) {
throw new IllegalArgumentException("owner parameter is
null.");
}
@@ -115,7 +131,7 @@
* @param userErrorMessage User Readable Error Message. May be null.
* @param tip Tip for user on how to recover from the error.
May be null.
*/
- ErrorPanel(JDialog owner, Throwable t, String userErrorMessage, String
tip) {
+ ErrorPanel(Window owner, Throwable t, String userErrorMessage, String
tip) {
if (owner == null) {
throw new IllegalArgumentException("owner parameter is
null.");
}
@@ -285,7 +301,7 @@
public void actionPerformed(ActionEvent
e) {
showDetails = !showDetails;
detailsPane.setVisible(showDetails);
- owner.setResizable(showDetails);
+ ((Dialog)
owner).setResizable(showDetails);
if (showDetails) {
detailsButton.setText(HIDE_TEXT);
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-15 22:41:54 UTC (rev 26194)
+++
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/SwingTaskMonitor.java
2011-07-15 22:50:24 UTC (rev 26195)
@@ -41,8 +41,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-15 22:41:54 UTC (rev 26194)
+++
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/task/TaskDialog.java
2011-07-15 22:50:24 UTC (rev 26195)
@@ -104,9 +104,9 @@
*/
static final String ELAPSED_AND_REMAINING_FORMAT = "%s elapsed, %s
remaining";
- static final String CANCEL_LABEL = " Cancel ";
+ static final String CANCEL_LABEL = "Cancel";
static final String CANCELLING_LABEL = " Cancelling... ";
- static final String CLOSE_LABEL = " Close ";
+ static final String CLOSE_LABEL = "Close";
// State variables
boolean haltRequested = false;
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-15 22:41:54 UTC (rev 26194)
+++
core3/work-swing-impl/trunk/impl/src/main/java/org/cytoscape/work/internal/tunables/GUITunableInterceptorImpl.java
2011-07-15 22:50:24 UTC (rev 26195)
@@ -10,23 +10,20 @@
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
-import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TunableHandlerFactory;
import org.cytoscape.work.TunableValidator;
import org.cytoscape.work.TunableValidator.ValidationState;
+import org.cytoscape.work.internal.tunables.utils.CollapsablePanel;
+import org.cytoscape.work.internal.tunables.utils.XorPanel;
import org.cytoscape.work.spring.SpringTunableInterceptor;
import org.cytoscape.work.swing.GUITunableHandler;
import org.cytoscape.work.swing.GUITunableInterceptor;
import org.cytoscape.work.swing.TunnableDialog;
-import org.cytoscape.work.internal.tunables.utils.CollapsablePanel;
-import org.cytoscape.work.internal.tunables.utils.XorPanel;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
--
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.
