diff --git a/jobs-impl/src/main/java/org/cytoscape/jobs/internal/JobStatusBar.java b/jobs-impl/src/main/java/org/cytoscape/jobs/internal/JobStatusBar.java index 565deb51be..a65fdc97d8 100644 --- a/jobs-impl/src/main/java/org/cytoscape/jobs/internal/JobStatusBar.java +++ b/jobs-impl/src/main/java/org/cytoscape/jobs/internal/JobStatusBar.java @@ -27,13 +27,12 @@ public class JobStatusBar extends JPanel implements StatusBarPanelFactory { public static final String TASK_HISTORY_CLICK = "job-status-click"; - private static final int CLEAR_DELAY_MS = 5000; - public static final String ICON_RUNNING = IconManager.ICON_HOURGLASS_1; public static final String ICON_WARN = IconManager.ICON_EXCLAMATION_TRIANGLE; public static final String ICON_ERROR = IconManager.ICON_MINUS_CIRCLE; public static final String ICON_CANCELLED = IconManager.ICON_BAN; public static final String ICON_FINISHED = IconManager.ICON_CLOUD_DOWNLOAD; + public static final String ICON_JOBS = IconManager.ICON_CLOUD; public static enum JobsIcon { RUNNING(ICON_RUNNING), @@ -41,7 +40,7 @@ public static enum JobsIcon { ERROR(ICON_ERROR), CANCELLED(ICON_CANCELLED), FINISHED(ICON_FINISHED), - JOBS(IconManager.ICON_CLOUD); + JOBS(ICON_JOBS); private final String text; @@ -117,10 +116,12 @@ public void updateIcon(Collection values) { if (values != null && values.size() > 0) { for (CyJobStatus status: values) { CyJobStatus.Status jobStatus = status.getStatus(); + if (jobStatus.equals(CyJobStatus.Status.FINISHED)) { icon = JobsIcon.FINISHED; break; } + if (jobStatus.equals(CyJobStatus.Status.ERROR) || jobStatus.equals(CyJobStatus.Status.FAILED)) { icon = JobsIcon.ERROR; @@ -147,12 +148,7 @@ public void updateIcon(Collection values) { public void setIcon(final JobsIcon icon) { if (!SwingUtilities.isEventDispatchThread()) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - setIcon(icon); - } - }); + SwingUtilities.invokeLater(() -> setIcon(icon)); return; } @@ -179,12 +175,10 @@ else if (text.equals(IconManager.ICON_HOURGLASS_3)) showBtn.setForeground(iconColor); currentStatus = icon; } - } @Override public JPanel createTaskStatusPanel() { return this; } - } diff --git a/swing-application-impl/src/main/java/org/cytoscape/internal/view/MemStatusPanel.java b/swing-application-impl/src/main/java/org/cytoscape/internal/view/MemStatusPanel.java index 2cf6493e03..8c4f29cc8b 100644 --- a/swing-application-impl/src/main/java/org/cytoscape/internal/view/MemStatusPanel.java +++ b/swing-application-impl/src/main/java/org/cytoscape/internal/view/MemStatusPanel.java @@ -2,9 +2,9 @@ import static javax.swing.GroupLayout.DEFAULT_SIZE; import static javax.swing.GroupLayout.PREFERRED_SIZE; +import static org.cytoscape.util.swing.LookAndFeelUtil.makeSmall; import java.awt.Color; -import java.awt.Font; import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.image.BufferedImage; @@ -14,7 +14,6 @@ import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JButton; -import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JToggleButton; @@ -215,14 +214,4 @@ private void updateMemStatus() { memAmountLabel.setText(String.format("%.1f%% used of %s", memUsed * 100.0f, memTotalFmt)); } - - private static void makeSmall(final JComponent component) { - if (LookAndFeelUtil.isAquaLAF()) { - component.putClientProperty("JComponent.sizeVariant", "small"); - } else { - final Font font = component.getFont(); - final Font newFont = new Font(font.getFontName(), font.getStyle(), (int)LookAndFeelUtil.getSmallFontSize()); - component.setFont(newFont); - } - } } \ No newline at end of file diff --git a/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/utils/GUIDefaults.java b/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/utils/GUIDefaults.java index 18c2e58b39..23f8ad1746 100644 --- a/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/utils/GUIDefaults.java +++ b/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/utils/GUIDefaults.java @@ -65,7 +65,7 @@ public final class GUIDefaults { public static final String ICON_FINISHED = IconManager.ICON_CHECK; public static enum TaskIcon { - INFO(ICON_WARN), + INFO(ICON_INFO), WARN(ICON_WARN), ERROR(ICON_ERROR), CANCELLED(ICON_CANCELLED), diff --git a/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/view/TaskStatusBar.java b/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/view/TaskStatusBar.java index aa8fd1cc9a..19e07ea4a8 100644 --- a/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/view/TaskStatusBar.java +++ b/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/view/TaskStatusBar.java @@ -132,7 +132,7 @@ public void setTitle(final FinishStatus.Type finishType, final String title) { } } - this.setTitle(type, icon, title); + setTitle(type, icon, title); } public void setTitle(final Level level, final String title) { @@ -156,7 +156,7 @@ public void setTitle(final Level level, final String title) { } } - this.setTitle(type, icon, title); + setTitle(type, icon, title); } public void setTitle(final String type, final TaskIcon icon, final String title) {