Added a ProgressBarNotification and fixed a font contrast problem in AcceptNotification

Author: spfrommer

src/com/demo/SimpleManagerDemo.java

@@ -6,6 +6,7 @@
 import com.notification.NotificationFactory.Location;
 import com.notification.types.AcceptNotification;
 import com.notification.types.IconNotification;
+import com.notification.types.ProgressBarNotification;
 import com.notification.types.TextNotification;
 import com.platform.Platform;
 import com.theme.ThemePackagePresets;
@@ -47,13 +48,18 @@ public static void main(String[] args) throws InterruptedException {
 		fade.addNotification(accept, Time.seconds(4));
 
 		boolean didAccept = accept.blockUntilReply();
-		TextNotification reply = null;
+		ProgressBarNotification reply = null;
 		if (didAccept) {
-			reply = factory.buildTextNotification("You accepted", "");
+			reply = factory.buildProgressBarNotification("You accepted");
 		} else {
-			reply = factory.buildTextNotification("You did not accept", "");
+			reply = factory.buildProgressBarNotification("You did not accept");
 		}
 		reply.setCloseOnClick(true);
 		fade.addNotification(reply, Time.infinite());
+
+		for (int i = 0; i < 100; i++) {
+			reply.setProgress(i);
+			Thread.sleep(100);
+		}
 	}
 }

src/com/demo/custom/CustomNotification.java

@@ -59,8 +59,8 @@ public void actionPerformed(ActionEvent e) {
 	}
 
 	/**
-	 * This will set the text font to that of the title font.
-	 * 
+	 * This will set the title and subtitle font and color.
+	 *
 	 * @param theme
 	 */
 	public void setTextTeme(TextTheme theme) {

src/com/notification/NotificationFactory.java

@@ -6,6 +6,7 @@
 
 import com.notification.types.AcceptNotification;
 import com.notification.types.IconNotification;
+import com.notification.types.ProgressBarNotification;
 import com.notification.types.TextNotification;
 import com.theme.ThemePackage;
 import com.theme.ThemePackagePresets;
@@ -79,19 +80,19 @@ public <T extends Notification> T build(Class<T> notificationClass) {
 	}
 
 	/**
-	 * Builds a Notification using the NotificationBuilder associated with the name.
+	 * Builds a Notification using the NotificationBuilder associated with the notification class.
 	 *
-	 * @param clazz
+	 * @param notificationClass
 	 * @param args
 	 *            the args passed to the NotificationBuilder
 	 * @return
 	 */
-	public <T extends Notification> T build(Class<T> clazz, Object... args) {
-		if (!m_builders.containsKey(clazz))
-			throw new RuntimeException("No NotificationBuilder for: " + clazz);
+	public <T extends Notification> T build(Class<T> notificationClass, Object... args) {
+		if (!m_builders.containsKey(notificationClass))
+			throw new RuntimeException("No NotificationBuilder for: " + notificationClass);
 
 		@SuppressWarnings("unchecked")
-		T note = (T) m_builders.get(clazz).buildNotification(m_pack, args);
+		T note = (T) m_builders.get(notificationClass).buildNotification(m_pack, args);
 		return note;
 	}
 
@@ -172,4 +173,18 @@ public IconNotification buildIconNotification(String title, String subtitle, Ima
 
 		return iconNote;
 	}
+
+	/**
+	 * Builds a ProgressBarNotification.
+	 *
+	 * @param title
+	 * @return
+	 */
+	public ProgressBarNotification buildProgressBarNotification(String title) {
+		ProgressBarNotification progress = new ProgressBarNotification();
+		progress.setWindowTheme(m_pack.windowTheme);
+		progress.setTextTeme(m_pack.textTheme);
+		progress.setTitle(title);
+		return progress;
+	}
 }

src/com/notification/types/AcceptNotification.java

@@ -1,14 +1,14 @@
 package com.notification.types;
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
 import javax.swing.JPanel;
 
-import com.theme.TextTheme;
 import com.theme.WindowTheme;
 
 /**
@@ -58,7 +58,7 @@ public void actionPerformed(ActionEvent e) {
 	/**
 	 * Will wait for the user to click a button (if the Notification hides, this method will act as if the user clicked
 	 * deny).
-	 * 
+	 *
 	 * @return the user's response
 	 */
 	public boolean blockUntilReply() {
@@ -73,7 +73,7 @@ public boolean blockUntilReply() {
 
 	/**
 	 * Sets the preferred size of the buttons.
-	 * 
+	 *
 	 * @param d
 	 */
 	public void setButtonDimensions(Dimension d) {
@@ -90,7 +90,7 @@ public String getAcceptText() {
 
 	/**
 	 * Sets the text on the accept button.
-	 * 
+	 *
 	 * @param acceptText
 	 */
 	public void setAcceptText(String acceptText) {
@@ -106,7 +106,7 @@ public String getDeclineText() {
 
 	/**
 	 * Sets the text on the decline button.
-	 * 
+	 *
 	 * @param declineText
 	 */
 	public void setDeclineText(String declineText) {
@@ -127,21 +127,13 @@ public void hide() {
 		}
 	}
 
-	@Override
-	public void setTextTheme(TextTheme theme) {
-		super.setTextTheme(theme);
-
-		m_accept.setForeground(theme.subtitleColor);
-		m_decline.setForeground(theme.subtitleColor);
-	}
-
 	@Override
 	public void setWindowTheme(WindowTheme theme) {
 		super.setWindowTheme(theme);
 
-		if (getTextTheme() != null) {
-			m_accept.setForeground(getTextTheme().subtitleColor);
-			m_decline.setForeground(getTextTheme().subtitleColor);
-		}
+		// override any color setting done automatically by the WindowTheme
+		// since black is the only color that looks good on buttons
+		m_accept.setForeground(Color.black);
+		m_decline.setForeground(Color.black);
 	}
 }

src/com/notification/types/IconNotification.java

@@ -14,8 +14,6 @@
  * An IconNotification displays text, but with an icon.
  */
 public class IconNotification extends BorderLayoutNotification {
-	protected TextTheme m_theme;
-
 	private String m_title;
 	private String m_subtitle;
 
@@ -24,6 +22,8 @@ public class IconNotification extends BorderLayoutNotification {
 
 	private JLabel m_iconLabel;
 
+	protected TextTheme m_theme;
+
 	public static final int ICON_PADDING = 10;
 
 	public IconNotification() {
@@ -42,7 +42,7 @@ public IconNotification() {
 
 	/**
 	 * Sets the icon to use.
-	 * 
+	 *
 	 * @param icon
 	 */
 	public void setIcon(ImageIcon icon) {
@@ -58,7 +58,7 @@ public String getTitle() {
 
 	/**
 	 * Sets the title String.
-	 * 
+	 *
 	 * @param title
 	 */
 	public void setTitle(String title) {
@@ -75,7 +75,7 @@ public String getSubtitle() {
 
 	/**
 	 * Sets the subtitle String.
-	 * 
+	 *
 	 * @param subtitle
 	 */
 	public void setSubtitle(String subtitle) {

src/com/notification/types/ProgressBarNotification.java

@@ -0,0 +1,61 @@
+package com.notification.types;
+
+import java.awt.BorderLayout;
+
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+
+import com.theme.TextTheme;
+
+public class ProgressBarNotification extends BorderLayoutNotification {
+	private JLabel m_label;
+	private JProgressBar m_progress;
+
+	public ProgressBarNotification() {
+		m_label = new JLabel();
+		m_progress = new JProgressBar();
+
+		this.addComponent(m_label, BorderLayout.NORTH);
+
+		JPanel progressPanel = new JPanel(new BorderLayout());
+		progressPanel.setBorder(BorderFactory.createEmptyBorder(15, 10, 15, 10));
+		progressPanel.add(m_progress, BorderLayout.CENTER);
+		this.addComponent(progressPanel, BorderLayout.CENTER);
+	}
+
+	/**
+	 * This will set the text font to that of the title font.
+	 *
+	 * @param theme
+	 */
+	public void setTextTeme(TextTheme theme) {
+		m_label.setFont(theme.title);
+		m_label.setForeground(theme.titleColor);
+	}
+
+	public String getTitle() {
+		return m_label.getText();
+	}
+
+	public void setTitle(String title) {
+		m_label.setText(title);
+	}
+
+	/**
+	 * Sest the progress of the progress bar, from 0 to 100.
+	 *
+	 * @param progress
+	 */
+	public void setProgress(int progress) {
+		m_progress.setValue(progress);
+	}
+
+	/**
+	 * @return the progress of the progress bar, from 0 to 100
+	 */
+	public int getProgress() {
+		return m_progress.getValue();
+	}
+}

src/com/notification/types/TextNotification.java

@@ -11,11 +11,11 @@
  * A text notification which will display a title and a subtitle.
  */
 public class TextNotification extends BorderLayoutNotification {
-	private TextTheme m_textTheme;
-
 	private JLabel m_titleLabel;
 	private JLabel m_subtitleLabel;
 
+	private TextTheme m_textTheme;
+
 	public TextNotification() {
 		m_titleLabel = new JLabel();
 		m_subtitleLabel = new JLabel();

src/com/notification/types/WindowNotification.java

@@ -19,11 +19,10 @@ public abstract class WindowNotification extends Notification {
 	private JWindow m_window;
 	private JPanel m_panel;
 	private boolean m_closeOnClick;
+	private MouseAdapter m_listener;
 
 	private WindowTheme m_theme;
 
-	private MouseAdapter m_listener;
-
 	private static final int DEFAULT_WIDTH = 300;
 	private static final int DEFAULT_HEIGHT = 100;
 
@@ -81,7 +80,7 @@ protected WindowTheme getWindowTheme() {
 	/**
 	 * Sets the theme of the WindowNotification. It is up to the subclasses how they want to interpret the "image"
 	 * attribute of the theme.
-	 * 
+	 *
 	 * @param theme
 	 */
 	public void setWindowTheme(WindowTheme theme) {
@@ -144,7 +143,7 @@ public void setSize(int width, int height) {
 
 	/**
 	 * Gets the opacity of the window between 0 and 1.
-	 * 
+	 *
 	 * @return
 	 */
 	@Override
@@ -154,7 +153,7 @@ public double getOpacity() {
 
 	/**
 	 * Sets the opacity, overriding the value given in the window theme.
-	 * 
+	 *
 	 * @param opacity
 	 *            the opacity (clamped to between 0 and 1)
 	 */