lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

There is no need to store parent frame locally.

Browse Source
This commit is contained in:
MobiusDev 2018-05-03 05:33:50 +00:00
parent d34457b8fe
commit cdcd780e7a
8 changed files with 40 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/SplashScreen.java
View File

@ -34,7 +34,6 @@ import javax.swing.JWindow;
public class SplashScreen extends JWindow public class SplashScreen extends JWindow
{ {
Image image; Image image;
JFrame parentFrame;
/** /**
* @param path of image file * @param path of image file
@ -43,7 +42,6 @@ public class SplashScreen extends JWindow
*/ */
public SplashScreen(String path, long time, JFrame parent) public SplashScreen(String path, long time, JFrame parent)
{ {
parentFrame = parent;
setBackground(new Color(0, 255, 0, 0)); // Transparency. setBackground(new Color(0, 255, 0, 0)); // Transparency.
image = Toolkit.getDefaultToolkit().getImage(path); image = Toolkit.getDefaultToolkit().getImage(path);
ImageIcon imageIcon = new ImageIcon(image); ImageIcon imageIcon = new ImageIcon(image);
@ -58,14 +56,14 @@ public class SplashScreen extends JWindow
public void run() public void run()
{ {
setVisible(false); setVisible(false);
if (parentFrame != null) if (parent != null)
{ {
// Make parent visible. // Make parent visible.
parentFrame.setVisible(true); parent.setVisible(true);
// Focus parent window. // Focus parent window.
parentFrame.toFront(); parent.toFront();
parentFrame.setState(Frame.ICONIFIED); parent.setState(Frame.ICONIFIED);
parentFrame.setState(Frame.NORMAL); parent.setState(Frame.NORMAL);
} }
dispose(); dispose();
} }

12
L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/SplashScreen.java
View File

@ -34,7 +34,6 @@ import javax.swing.JWindow;
public class SplashScreen extends JWindow public class SplashScreen extends JWindow
{ {
Image image; Image image;
JFrame parentFrame;
/** /**
* @param path of image file * @param path of image file
@ -43,7 +42,6 @@ public class SplashScreen extends JWindow
*/ */
public SplashScreen(String path, long time, JFrame parent) public SplashScreen(String path, long time, JFrame parent)
{ {
parentFrame = parent;
setBackground(new Color(0, 255, 0, 0)); // Transparency. setBackground(new Color(0, 255, 0, 0)); // Transparency.
image = Toolkit.getDefaultToolkit().getImage(path); image = Toolkit.getDefaultToolkit().getImage(path);
ImageIcon imageIcon = new ImageIcon(image); ImageIcon imageIcon = new ImageIcon(image);
@ -58,14 +56,14 @@ public class SplashScreen extends JWindow
public void run() public void run()
{ {
setVisible(false); setVisible(false);
if (parentFrame != null) if (parent != null)
{ {
// Make parent visible. // Make parent visible.
parentFrame.setVisible(true); parent.setVisible(true);
// Focus parent window. // Focus parent window.
parentFrame.toFront(); parent.toFront();
parentFrame.setState(Frame.ICONIFIED); parent.setState(Frame.ICONIFIED);
parentFrame.setState(Frame.NORMAL); parent.setState(Frame.NORMAL);
} }
dispose(); dispose();
} }

12
L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/SplashScreen.java
View File

@ -34,7 +34,6 @@ import javax.swing.JWindow;
public class SplashScreen extends JWindow public class SplashScreen extends JWindow
{ {
Image image; Image image;
JFrame parentFrame;
/** /**
* @param path of image file * @param path of image file
@ -43,7 +42,6 @@ public class SplashScreen extends JWindow
*/ */
public SplashScreen(String path, long time, JFrame parent) public SplashScreen(String path, long time, JFrame parent)
{ {
parentFrame = parent;
setBackground(new Color(0, 255, 0, 0)); // Transparency. setBackground(new Color(0, 255, 0, 0)); // Transparency.
image = Toolkit.getDefaultToolkit().getImage(path); image = Toolkit.getDefaultToolkit().getImage(path);
ImageIcon imageIcon = new ImageIcon(image); ImageIcon imageIcon = new ImageIcon(image);
@ -58,14 +56,14 @@ public class SplashScreen extends JWindow
public void run() public void run()
{ {
setVisible(false); setVisible(false);
if (parentFrame != null) if (parent != null)
{ {
// Make parent visible. // Make parent visible.
parentFrame.setVisible(true); parent.setVisible(true);
// Focus parent window. // Focus parent window.
parentFrame.toFront(); parent.toFront();
parentFrame.setState(Frame.ICONIFIED); parent.setState(Frame.ICONIFIED);
parentFrame.setState(Frame.NORMAL); parent.setState(Frame.NORMAL);
} }
dispose(); dispose();
} }

12
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/SplashScreen.java
View File

@ -34,7 +34,6 @@ import javax.swing.JWindow;
public class SplashScreen extends JWindow public class SplashScreen extends JWindow
{ {
Image image; Image image;
JFrame parentFrame;
/** /**
* @param path of image file * @param path of image file
@ -43,7 +42,6 @@ public class SplashScreen extends JWindow
*/ */
public SplashScreen(String path, long time, JFrame parent) public SplashScreen(String path, long time, JFrame parent)
{ {
parentFrame = parent;
setBackground(new Color(0, 255, 0, 0)); // Transparency. setBackground(new Color(0, 255, 0, 0)); // Transparency.
image = Toolkit.getDefaultToolkit().getImage(path); image = Toolkit.getDefaultToolkit().getImage(path);
ImageIcon imageIcon = new ImageIcon(image); ImageIcon imageIcon = new ImageIcon(image);
@ -58,14 +56,14 @@ public class SplashScreen extends JWindow
public void run() public void run()
{ {
setVisible(false); setVisible(false);
if (parentFrame != null) if (parent != null)
{ {
// Make parent visible. // Make parent visible.
parentFrame.setVisible(true); parent.setVisible(true);
// Focus parent window. // Focus parent window.
parentFrame.toFront(); parent.toFront();
parentFrame.setState(Frame.ICONIFIED); parent.setState(Frame.ICONIFIED);
parentFrame.setState(Frame.NORMAL); parent.setState(Frame.NORMAL);
} }
dispose(); dispose();
} }

12
L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/util/SplashScreen.java
View File

@ -34,7 +34,6 @@ import javax.swing.JWindow;
public class SplashScreen extends JWindow public class SplashScreen extends JWindow
{ {
Image image; Image image;
JFrame parentFrame;
/** /**
* @param path of image file * @param path of image file
@ -43,7 +42,6 @@ public class SplashScreen extends JWindow
*/ */
public SplashScreen(String path, long time, JFrame parent) public SplashScreen(String path, long time, JFrame parent)
{ {
parentFrame = parent;
setBackground(new Color(0, 255, 0, 0)); // Transparency. setBackground(new Color(0, 255, 0, 0)); // Transparency.
image = Toolkit.getDefaultToolkit().getImage(path); image = Toolkit.getDefaultToolkit().getImage(path);
ImageIcon imageIcon = new ImageIcon(image); ImageIcon imageIcon = new ImageIcon(image);
@ -58,14 +56,14 @@ public class SplashScreen extends JWindow
public void run() public void run()
{ {
setVisible(false); setVisible(false);
if (parentFrame != null) if (parent != null)
{ {
// Make parent visible. // Make parent visible.
parentFrame.setVisible(true); parent.setVisible(true);
// Focus parent window. // Focus parent window.
parentFrame.toFront(); parent.toFront();
parentFrame.setState(Frame.ICONIFIED); parent.setState(Frame.ICONIFIED);
parentFrame.setState(Frame.NORMAL); parent.setState(Frame.NORMAL);
} }
dispose(); dispose();
} }

12
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/SplashScreen.java
View File

@ -34,7 +34,6 @@ import javax.swing.JWindow;
public class SplashScreen extends JWindow public class SplashScreen extends JWindow
{ {
Image image; Image image;
JFrame parentFrame;
/** /**
* @param path of image file * @param path of image file
@ -43,7 +42,6 @@ public class SplashScreen extends JWindow
*/ */
public SplashScreen(String path, long time, JFrame parent) public SplashScreen(String path, long time, JFrame parent)
{ {
parentFrame = parent;
setBackground(new Color(0, 255, 0, 0)); // Transparency. setBackground(new Color(0, 255, 0, 0)); // Transparency.
image = Toolkit.getDefaultToolkit().getImage(path); image = Toolkit.getDefaultToolkit().getImage(path);
ImageIcon imageIcon = new ImageIcon(image); ImageIcon imageIcon = new ImageIcon(image);
@ -58,14 +56,14 @@ public class SplashScreen extends JWindow
public void run() public void run()
{ {
setVisible(false); setVisible(false);
if (parentFrame != null) if (parent != null)
{ {
// Make parent visible. // Make parent visible.
parentFrame.setVisible(true); parent.setVisible(true);
// Focus parent window. // Focus parent window.
parentFrame.toFront(); parent.toFront();
parentFrame.setState(Frame.ICONIFIED); parent.setState(Frame.ICONIFIED);
parentFrame.setState(Frame.NORMAL); parent.setState(Frame.NORMAL);
} }
dispose(); dispose();
} }

12
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/SplashScreen.java
View File

@ -34,7 +34,6 @@ import javax.swing.JWindow;
public class SplashScreen extends JWindow public class SplashScreen extends JWindow
{ {
Image image; Image image;
JFrame parentFrame;
/** /**
* @param path of image file * @param path of image file
@ -43,7 +42,6 @@ public class SplashScreen extends JWindow
*/ */
public SplashScreen(String path, long time, JFrame parent) public SplashScreen(String path, long time, JFrame parent)
{ {
parentFrame = parent;
setBackground(new Color(0, 255, 0, 0)); // Transparency. setBackground(new Color(0, 255, 0, 0)); // Transparency.
image = Toolkit.getDefaultToolkit().getImage(path); image = Toolkit.getDefaultToolkit().getImage(path);
ImageIcon imageIcon = new ImageIcon(image); ImageIcon imageIcon = new ImageIcon(image);
@ -58,14 +56,14 @@ public class SplashScreen extends JWindow
public void run() public void run()
{ {
setVisible(false); setVisible(false);
if (parentFrame != null) if (parent != null)
{ {
// Make parent visible. // Make parent visible.
parentFrame.setVisible(true); parent.setVisible(true);
// Focus parent window. // Focus parent window.
parentFrame.toFront(); parent.toFront();
parentFrame.setState(Frame.ICONIFIED); parent.setState(Frame.ICONIFIED);
parentFrame.setState(Frame.NORMAL); parent.setState(Frame.NORMAL);
} }
dispose(); dispose();
} }

12
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/SplashScreen.java
View File

@ -34,7 +34,6 @@ import javax.swing.JWindow;
public class SplashScreen extends JWindow public class SplashScreen extends JWindow
{ {
Image image; Image image;
JFrame parentFrame;
/** /**
* @param path of image file * @param path of image file
@ -43,7 +42,6 @@ public class SplashScreen extends JWindow
*/ */
public SplashScreen(String path, long time, JFrame parent) public SplashScreen(String path, long time, JFrame parent)
{ {
parentFrame = parent;
setBackground(new Color(0, 255, 0, 0)); // Transparency. setBackground(new Color(0, 255, 0, 0)); // Transparency.
image = Toolkit.getDefaultToolkit().getImage(path); image = Toolkit.getDefaultToolkit().getImage(path);
ImageIcon imageIcon = new ImageIcon(image); ImageIcon imageIcon = new ImageIcon(image);
@ -58,14 +56,14 @@ public class SplashScreen extends JWindow
public void run() public void run()
{ {
setVisible(false); setVisible(false);
if (parentFrame != null) if (parent != null)
{ {
// Make parent visible. // Make parent visible.
parentFrame.setVisible(true); parent.setVisible(true);
// Focus parent window. // Focus parent window.
parentFrame.toFront(); parent.toFront();
parentFrame.setState(Frame.ICONIFIED); parent.setState(Frame.ICONIFIED);
parentFrame.setState(Frame.NORMAL); parent.setState(Frame.NORMAL);
} }
dispose(); dispose();
} }