Changed Util class names

This commit is contained in:
nathan 2017-07-14 18:46:42 +02:00
parent 15e7e4aba9
commit 1060a89ddc
2 changed files with 9 additions and 10 deletions

View File

@ -28,7 +28,7 @@ import javax.swing.ImageIcon;
import dorkbox.util.ActionHandler; import dorkbox.util.ActionHandler;
import dorkbox.util.LocationResolver; import dorkbox.util.LocationResolver;
import dorkbox.util.SwingUtil; import dorkbox.util.Swing;
/** /**
* Popup notification messages, similar to the popular "Growl" notification system on macosx, that display in the corner of the monitor. * Popup notification messages, similar to the popular "Growl" notification system on macosx, that display in the corner of the monitor.
@ -266,7 +266,7 @@ class Notify {
void show() { void show() {
// must be done in the swing EDT // must be done in the swing EDT
//noinspection Convert2Lambda //noinspection Convert2Lambda
SwingUtil.invokeAndWaitQuietly(new Runnable() { Swing.invokeAndWaitQuietly(new Runnable() {
@Override @Override
public public
void run() { void run() {
@ -320,7 +320,7 @@ class Notify {
if (notifyPopup != null) { if (notifyPopup != null) {
// must be done in the swing EDT // must be done in the swing EDT
//noinspection Convert2Lambda //noinspection Convert2Lambda
SwingUtil.invokeLater(new Runnable() { Swing.invokeLater(new Runnable() {
@Override @Override
public public
void run() { void run() {
@ -343,7 +343,7 @@ class Notify {
// must be done in the swing EDT // must be done in the swing EDT
//noinspection Convert2Lambda //noinspection Convert2Lambda
SwingUtil.invokeLater(new Runnable() { Swing.invokeLater(new Runnable() {
@Override @Override
public public
void run() { void run() {

View File

@ -17,7 +17,6 @@ package dorkbox.notify;
import java.awt.BasicStroke; import java.awt.BasicStroke;
import java.awt.Color; import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.GraphicsDevice; import java.awt.GraphicsDevice;
@ -48,10 +47,10 @@ import dorkbox.tweenengine.TweenCallback;
import dorkbox.tweenengine.TweenEquations; import dorkbox.tweenengine.TweenEquations;
import dorkbox.tweenengine.TweenManager; import dorkbox.tweenengine.TweenManager;
import dorkbox.util.ActionHandlerLong; import dorkbox.util.ActionHandlerLong;
import dorkbox.util.FontUtil; import dorkbox.util.Font;
import dorkbox.util.Property; import dorkbox.util.Property;
import dorkbox.util.ScreenUtil; import dorkbox.util.ScreenUtil;
import dorkbox.util.SwingUtil; import dorkbox.util.Swing;
import dorkbox.util.swing.SwingActiveRender; import dorkbox.util.swing.SwingActiveRender;
// we can't use regular popup, because if we have no owner, it won't work! // we can't use regular popup, because if we have no owner, it won't work!
@ -163,7 +162,7 @@ class NotifyPopup extends JFrame {
if (image != null) { if (image != null) {
setIconImage(image); setIconImage(image);
} else { } else {
setIconImage(SwingUtil.BLANK_ICON); setIconImage(Swing.BLANK_ICON);
} }
@ -284,7 +283,7 @@ class NotifyPopup extends JFrame {
g2.fillRect(0, 0, WIDTH, HEIGHT); g2.fillRect(0, 0, WIDTH, HEIGHT);
// Draw the title text // Draw the title text
Font titleTextFont = FontUtil.parseFont(TITLE_TEXT_FONT); java.awt.Font titleTextFont = Font.parseFont(TITLE_TEXT_FONT);
g2.setColor(titleText_FG); g2.setColor(titleText_FG);
g2.setFont(titleTextFont); g2.setFont(titleTextFont);
g2.drawString(notification.title, 5, 20); g2.drawString(notification.title, 5, 20);
@ -302,7 +301,7 @@ class NotifyPopup extends JFrame {
} }
// Draw the main text // Draw the main text
Font mainTextFont = FontUtil.parseFont(MAIN_TEXT_FONT); java.awt.Font mainTextFont = Font.parseFont(MAIN_TEXT_FONT);
String notText = notification.text; String notText = notification.text;
int length = notText.length(); int length = notText.length();
StringBuilder text = new StringBuilder(length); StringBuilder text = new StringBuilder(length);