Author: jflesch
Date: 2007-01-03 00:00:46 +0000 (Wed, 03 Jan 2007)
New Revision: 11546
Modified:
trunk/apps/Thaw/src/thaw/core/SplashScreen.java
Log:
Fix NPEs
Modified: trunk/apps/Thaw/src/thaw/core/SplashScreen.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/SplashScreen.java 2007-01-02 22:24:00 UTC
(rev 11545)
+++ trunk/apps/Thaw/src/thaw/core/SplashScreen.java 2007-01-03 00:00:46 UTC
(rev 11546)
@@ -92,14 +92,17 @@
* @param progress In pourcent
*/
public void setProgression(final int progress) {
- if(progressBar != null)
+ if(progressBar != null && splashScreen != null) {
progressBar.setValue(progress);
-
- splashScreen.getContentPane().validate();
+ splashScreen.getContentPane().validate();
+ }
}
public void addIcon(ImageIcon icon) {
+ if (splashScreen == null)
+ return;
+
JLabel lb = new JLabel(icon);
lb.setHorizontalAlignment(JLabel.CENTER);
@@ -125,10 +128,10 @@
public void setStatus(final String status) {
- if(progressBar != null)
+ if(progressBar != null && splashScreen != null) {
progressBar.setString(status);
-
- splashScreen.getContentPane().validate();
+ splashScreen.getContentPane().validate();
+ }
}
public void setProgressionAndStatus(final int progress, final String
status) {
