diff --git a/L2J_Mobius_1.0_Ertheia/dist/db_installer/images/help.png b/L2J_Mobius_1.0_Ertheia/dist/db_installer/images/help.png
deleted file mode 100644
index 5c870176d4..0000000000
Binary files a/L2J_Mobius_1.0_Ertheia/dist/db_installer/images/help.png and /dev/null differ
diff --git a/L2J_Mobius_1.0_Ertheia/dist/db_installer/images/l2j.png b/L2J_Mobius_1.0_Ertheia/dist/db_installer/images/l2j.png
deleted file mode 100644
index 28d252208b..0000000000
Binary files a/L2J_Mobius_1.0_Ertheia/dist/db_installer/images/l2j.png and /dev/null differ
diff --git a/L2J_Mobius_1.0_Ertheia/dist/images/l2jmobius.png b/L2J_Mobius_1.0_Ertheia/dist/images/l2jmobius.png
new file mode 100644
index 0000000000..898475fad5
Binary files /dev/null and b/L2J_Mobius_1.0_Ertheia/dist/images/l2jmobius.png differ
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
index 8e5e2bf735..9fe085ca00 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
@@ -31,7 +31,6 @@ import javax.swing.SpringLayout;
import javax.swing.SwingConstants;
import com.l2jmobius.tools.dbinstaller.RunTasks;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
import com.l2jmobius.tools.dbinstaller.util.mysql.MySqlConnect;
import com.l2jmobius.tools.dbinstaller.util.swing.SpringUtilities;
@@ -53,10 +52,10 @@ public class DBConfigGUI extends JFrame
public DBConfigGUI(String db, String dir)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new SpringLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_db = db;
_dir = dir;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
index 6538f385af..bac5e4ef64 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
@@ -28,7 +28,6 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import com.l2jmobius.tools.dbinstaller.DBOutputInterface;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
/**
* @author mrTJO
@@ -41,10 +40,10 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
public DBInstallerGUI(Connection con)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new BorderLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_con = con;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
deleted file mode 100644
index 8d5b1fcf8d..0000000000
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package com.l2jmobius.tools.dbinstaller.images;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.ImageIcon;
-
-/**
- * Usage of this class causes images to be loaded and kept in memory, and therefore should only be used by helper applications.
- * Some icons from famfamfam (http://www.famfamfam.com/) credit *MUST* be given.
- * @author KenM
- */
-public class ImagesTable
-{
- private static final Map IMAGES = new HashMap<>();
-
- public static final String IMAGES_DIRECTORY = "images/";
-
- public static ImageIcon getImage(String name)
- {
- if (!IMAGES.containsKey(name))
- {
- IMAGES.put(name, new ImageIcon(IMAGES_DIRECTORY + name));
- }
- return IMAGES.get(name);
- }
-}
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/db_installer/images/help.png b/L2J_Mobius_2.5_Underground/dist/db_installer/images/help.png
deleted file mode 100644
index 5c870176d4..0000000000
Binary files a/L2J_Mobius_2.5_Underground/dist/db_installer/images/help.png and /dev/null differ
diff --git a/L2J_Mobius_2.5_Underground/dist/db_installer/images/l2j.png b/L2J_Mobius_2.5_Underground/dist/db_installer/images/l2j.png
deleted file mode 100644
index 28d252208b..0000000000
Binary files a/L2J_Mobius_2.5_Underground/dist/db_installer/images/l2j.png and /dev/null differ
diff --git a/L2J_Mobius_2.5_Underground/dist/images/l2jmobius.png b/L2J_Mobius_2.5_Underground/dist/images/l2jmobius.png
new file mode 100644
index 0000000000..898475fad5
Binary files /dev/null and b/L2J_Mobius_2.5_Underground/dist/images/l2jmobius.png differ
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
index 8e5e2bf735..9fe085ca00 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
@@ -31,7 +31,6 @@ import javax.swing.SpringLayout;
import javax.swing.SwingConstants;
import com.l2jmobius.tools.dbinstaller.RunTasks;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
import com.l2jmobius.tools.dbinstaller.util.mysql.MySqlConnect;
import com.l2jmobius.tools.dbinstaller.util.swing.SpringUtilities;
@@ -53,10 +52,10 @@ public class DBConfigGUI extends JFrame
public DBConfigGUI(String db, String dir)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new SpringLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_db = db;
_dir = dir;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
index 6538f385af..bac5e4ef64 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
@@ -28,7 +28,6 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import com.l2jmobius.tools.dbinstaller.DBOutputInterface;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
/**
* @author mrTJO
@@ -41,10 +40,10 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
public DBInstallerGUI(Connection con)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new BorderLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_con = con;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
deleted file mode 100644
index 8d5b1fcf8d..0000000000
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package com.l2jmobius.tools.dbinstaller.images;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.ImageIcon;
-
-/**
- * Usage of this class causes images to be loaded and kept in memory, and therefore should only be used by helper applications.
- * Some icons from famfamfam (http://www.famfamfam.com/) credit *MUST* be given.
- * @author KenM
- */
-public class ImagesTable
-{
- private static final Map IMAGES = new HashMap<>();
-
- public static final String IMAGES_DIRECTORY = "images/";
-
- public static ImageIcon getImage(String name)
- {
- if (!IMAGES.containsKey(name))
- {
- IMAGES.put(name, new ImageIcon(IMAGES_DIRECTORY + name));
- }
- return IMAGES.get(name);
- }
-}
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/db_installer/images/help.png b/L2J_Mobius_3.0_Helios/dist/db_installer/images/help.png
deleted file mode 100644
index 5c870176d4..0000000000
Binary files a/L2J_Mobius_3.0_Helios/dist/db_installer/images/help.png and /dev/null differ
diff --git a/L2J_Mobius_3.0_Helios/dist/db_installer/images/l2j.png b/L2J_Mobius_3.0_Helios/dist/db_installer/images/l2j.png
deleted file mode 100644
index 28d252208b..0000000000
Binary files a/L2J_Mobius_3.0_Helios/dist/db_installer/images/l2j.png and /dev/null differ
diff --git a/L2J_Mobius_3.0_Helios/dist/images/l2jmobius.png b/L2J_Mobius_3.0_Helios/dist/images/l2jmobius.png
new file mode 100644
index 0000000000..898475fad5
Binary files /dev/null and b/L2J_Mobius_3.0_Helios/dist/images/l2jmobius.png differ
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
index 8e5e2bf735..9fe085ca00 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
@@ -31,7 +31,6 @@ import javax.swing.SpringLayout;
import javax.swing.SwingConstants;
import com.l2jmobius.tools.dbinstaller.RunTasks;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
import com.l2jmobius.tools.dbinstaller.util.mysql.MySqlConnect;
import com.l2jmobius.tools.dbinstaller.util.swing.SpringUtilities;
@@ -53,10 +52,10 @@ public class DBConfigGUI extends JFrame
public DBConfigGUI(String db, String dir)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new SpringLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_db = db;
_dir = dir;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
index 6538f385af..bac5e4ef64 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
@@ -28,7 +28,6 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import com.l2jmobius.tools.dbinstaller.DBOutputInterface;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
/**
* @author mrTJO
@@ -41,10 +40,10 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
public DBInstallerGUI(Connection con)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new BorderLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_con = con;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
deleted file mode 100644
index 8d5b1fcf8d..0000000000
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package com.l2jmobius.tools.dbinstaller.images;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.ImageIcon;
-
-/**
- * Usage of this class causes images to be loaded and kept in memory, and therefore should only be used by helper applications.
- * Some icons from famfamfam (http://www.famfamfam.com/) credit *MUST* be given.
- * @author KenM
- */
-public class ImagesTable
-{
- private static final Map IMAGES = new HashMap<>();
-
- public static final String IMAGES_DIRECTORY = "images/";
-
- public static ImageIcon getImage(String name)
- {
- if (!IMAGES.containsKey(name))
- {
- IMAGES.put(name, new ImageIcon(IMAGES_DIRECTORY + name));
- }
- return IMAGES.get(name);
- }
-}
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/db_installer/images/help.png b/L2J_Mobius_4.0_GrandCrusade/dist/db_installer/images/help.png
deleted file mode 100644
index 5c870176d4..0000000000
Binary files a/L2J_Mobius_4.0_GrandCrusade/dist/db_installer/images/help.png and /dev/null differ
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/db_installer/images/l2j.png b/L2J_Mobius_4.0_GrandCrusade/dist/db_installer/images/l2j.png
deleted file mode 100644
index 28d252208b..0000000000
Binary files a/L2J_Mobius_4.0_GrandCrusade/dist/db_installer/images/l2j.png and /dev/null differ
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/images/l2jmobius.png b/L2J_Mobius_4.0_GrandCrusade/dist/images/l2jmobius.png
new file mode 100644
index 0000000000..898475fad5
Binary files /dev/null and b/L2J_Mobius_4.0_GrandCrusade/dist/images/l2jmobius.png differ
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
index 8e5e2bf735..9fe085ca00 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
@@ -31,7 +31,6 @@ import javax.swing.SpringLayout;
import javax.swing.SwingConstants;
import com.l2jmobius.tools.dbinstaller.RunTasks;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
import com.l2jmobius.tools.dbinstaller.util.mysql.MySqlConnect;
import com.l2jmobius.tools.dbinstaller.util.swing.SpringUtilities;
@@ -53,10 +52,10 @@ public class DBConfigGUI extends JFrame
public DBConfigGUI(String db, String dir)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new SpringLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_db = db;
_dir = dir;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
index 6538f385af..bac5e4ef64 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
@@ -28,7 +28,6 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import com.l2jmobius.tools.dbinstaller.DBOutputInterface;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
/**
* @author mrTJO
@@ -41,10 +40,10 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
public DBInstallerGUI(Connection con)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new BorderLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_con = con;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
deleted file mode 100644
index 8d5b1fcf8d..0000000000
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package com.l2jmobius.tools.dbinstaller.images;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.ImageIcon;
-
-/**
- * Usage of this class causes images to be loaded and kept in memory, and therefore should only be used by helper applications.
- * Some icons from famfamfam (http://www.famfamfam.com/) credit *MUST* be given.
- * @author KenM
- */
-public class ImagesTable
-{
- private static final Map IMAGES = new HashMap<>();
-
- public static final String IMAGES_DIRECTORY = "images/";
-
- public static ImageIcon getImage(String name)
- {
- if (!IMAGES.containsKey(name))
- {
- IMAGES.put(name, new ImageIcon(IMAGES_DIRECTORY + name));
- }
- return IMAGES.get(name);
- }
-}
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/images/help.png b/L2J_Mobius_C6_Interlude/dist/db_installer/images/help.png
deleted file mode 100644
index 5c870176d4..0000000000
Binary files a/L2J_Mobius_C6_Interlude/dist/db_installer/images/help.png and /dev/null differ
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/images/l2j.png b/L2J_Mobius_C6_Interlude/dist/db_installer/images/l2j.png
deleted file mode 100644
index 28d252208b..0000000000
Binary files a/L2J_Mobius_C6_Interlude/dist/db_installer/images/l2j.png and /dev/null differ
diff --git a/L2J_Mobius_C6_Interlude/dist/images/l2jmobius.png b/L2J_Mobius_C6_Interlude/dist/images/l2jmobius.png
new file mode 100644
index 0000000000..898475fad5
Binary files /dev/null and b/L2J_Mobius_C6_Interlude/dist/images/l2jmobius.png differ
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
index 1d4c2ab154..935e450d49 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
@@ -31,7 +31,6 @@ import javax.swing.SpringLayout;
import javax.swing.SwingConstants;
import com.l2jmobius.tools.dbinstaller.RunTasks;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
import com.l2jmobius.tools.dbinstaller.util.mysql.MySqlConnect;
import com.l2jmobius.tools.dbinstaller.util.swing.SpringUtilities;
@@ -53,10 +52,10 @@ public class DBConfigGUI extends JFrame
public DBConfigGUI(String db, String dir)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new SpringLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_db = db;
_dir = dir;
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
index 063f2e64ed..85280dfaa0 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
@@ -28,7 +28,6 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import com.l2jmobius.tools.dbinstaller.DBOutputInterface;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
/**
* @author mrTJO
@@ -41,10 +40,10 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
public DBInstallerGUI(Connection con)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new BorderLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_con = con;
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
deleted file mode 100644
index 275b5e0a1d..0000000000
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package com.l2jmobius.tools.dbinstaller.images;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.ImageIcon;
-
-/**
- * Usage of this class causes images to be loaded and kept in memory, and therefore should only be used by helper applications.
- * Some icons from famfamfam (http://www.famfamfam.com/) credit *MUST* be given.
- * @author KenM
- */
-public class ImagesTable
-{
- private static final Map IMAGES = new HashMap<>();
-
- public static final String IMAGES_DIRECTORY = "images/";
-
- public static ImageIcon getImage(String name)
- {
- if (!IMAGES.containsKey(name))
- {
- IMAGES.put(name, new ImageIcon(IMAGES_DIRECTORY + name));
- }
- return IMAGES.get(name);
- }
-}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/images/help.png b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/images/help.png
deleted file mode 100644
index 5c870176d4..0000000000
Binary files a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/images/help.png and /dev/null differ
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/images/l2j.png b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/images/l2j.png
deleted file mode 100644
index 28d252208b..0000000000
Binary files a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/images/l2j.png and /dev/null differ
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/images/l2jmobius.png b/L2J_Mobius_CT_2.6_HighFive/dist/images/l2jmobius.png
new file mode 100644
index 0000000000..898475fad5
Binary files /dev/null and b/L2J_Mobius_CT_2.6_HighFive/dist/images/l2jmobius.png differ
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
index 8e5e2bf735..9fe085ca00 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
@@ -31,7 +31,6 @@ import javax.swing.SpringLayout;
import javax.swing.SwingConstants;
import com.l2jmobius.tools.dbinstaller.RunTasks;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
import com.l2jmobius.tools.dbinstaller.util.mysql.MySqlConnect;
import com.l2jmobius.tools.dbinstaller.util.swing.SpringUtilities;
@@ -53,10 +52,10 @@ public class DBConfigGUI extends JFrame
public DBConfigGUI(String db, String dir)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new SpringLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_db = db;
_dir = dir;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
index 6538f385af..bac5e4ef64 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
@@ -28,7 +28,6 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import com.l2jmobius.tools.dbinstaller.DBOutputInterface;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
/**
* @author mrTJO
@@ -41,10 +40,10 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
public DBInstallerGUI(Connection con)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new BorderLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_con = con;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
deleted file mode 100644
index 8d5b1fcf8d..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package com.l2jmobius.tools.dbinstaller.images;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.ImageIcon;
-
-/**
- * Usage of this class causes images to be loaded and kept in memory, and therefore should only be used by helper applications.
- * Some icons from famfamfam (http://www.famfamfam.com/) credit *MUST* be given.
- * @author KenM
- */
-public class ImagesTable
-{
- private static final Map IMAGES = new HashMap<>();
-
- public static final String IMAGES_DIRECTORY = "images/";
-
- public static ImageIcon getImage(String name)
- {
- if (!IMAGES.containsKey(name))
- {
- IMAGES.put(name, new ImageIcon(IMAGES_DIRECTORY + name));
- }
- return IMAGES.get(name);
- }
-}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/images/help.png b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/images/help.png
deleted file mode 100644
index 5c870176d4..0000000000
Binary files a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/images/help.png and /dev/null differ
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/images/l2j.png b/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/images/l2j.png
deleted file mode 100644
index 28d252208b..0000000000
Binary files a/L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/images/l2j.png and /dev/null differ
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/images/l2jmobius.png b/L2J_Mobius_Classic_2.0_Saviors/dist/images/l2jmobius.png
new file mode 100644
index 0000000000..898475fad5
Binary files /dev/null and b/L2J_Mobius_Classic_2.0_Saviors/dist/images/l2jmobius.png differ
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
index 8e5e2bf735..9fe085ca00 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
@@ -31,7 +31,6 @@ import javax.swing.SpringLayout;
import javax.swing.SwingConstants;
import com.l2jmobius.tools.dbinstaller.RunTasks;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
import com.l2jmobius.tools.dbinstaller.util.mysql.MySqlConnect;
import com.l2jmobius.tools.dbinstaller.util.swing.SpringUtilities;
@@ -53,10 +52,10 @@ public class DBConfigGUI extends JFrame
public DBConfigGUI(String db, String dir)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new SpringLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_db = db;
_dir = dir;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
index 6538f385af..bac5e4ef64 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
@@ -28,7 +28,6 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import com.l2jmobius.tools.dbinstaller.DBOutputInterface;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
/**
* @author mrTJO
@@ -41,10 +40,10 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
public DBInstallerGUI(Connection con)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new BorderLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_con = con;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
deleted file mode 100644
index 8d5b1fcf8d..0000000000
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package com.l2jmobius.tools.dbinstaller.images;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.ImageIcon;
-
-/**
- * Usage of this class causes images to be loaded and kept in memory, and therefore should only be used by helper applications.
- * Some icons from famfamfam (http://www.famfamfam.com/) credit *MUST* be given.
- * @author KenM
- */
-public class ImagesTable
-{
- private static final Map IMAGES = new HashMap<>();
-
- public static final String IMAGES_DIRECTORY = "images/";
-
- public static ImageIcon getImage(String name)
- {
- if (!IMAGES.containsKey(name))
- {
- IMAGES.put(name, new ImageIcon(IMAGES_DIRECTORY + name));
- }
- return IMAGES.get(name);
- }
-}
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/db_installer/images/help.png b/L2J_Mobius_Classic_2.0_Zaken/dist/db_installer/images/help.png
deleted file mode 100644
index 5c870176d4..0000000000
Binary files a/L2J_Mobius_Classic_2.0_Zaken/dist/db_installer/images/help.png and /dev/null differ
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/db_installer/images/l2j.png b/L2J_Mobius_Classic_2.0_Zaken/dist/db_installer/images/l2j.png
deleted file mode 100644
index 28d252208b..0000000000
Binary files a/L2J_Mobius_Classic_2.0_Zaken/dist/db_installer/images/l2j.png and /dev/null differ
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/images/l2jmobius.png b/L2J_Mobius_Classic_2.0_Zaken/dist/images/l2jmobius.png
new file mode 100644
index 0000000000..898475fad5
Binary files /dev/null and b/L2J_Mobius_Classic_2.0_Zaken/dist/images/l2jmobius.png differ
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
index 8e5e2bf735..9fe085ca00 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/tools/dbinstaller/gui/DBConfigGUI.java
@@ -31,7 +31,6 @@ import javax.swing.SpringLayout;
import javax.swing.SwingConstants;
import com.l2jmobius.tools.dbinstaller.RunTasks;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
import com.l2jmobius.tools.dbinstaller.util.mysql.MySqlConnect;
import com.l2jmobius.tools.dbinstaller.util.swing.SpringUtilities;
@@ -53,10 +52,10 @@ public class DBConfigGUI extends JFrame
public DBConfigGUI(String db, String dir)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new SpringLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_db = db;
_dir = dir;
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
index 6538f385af..bac5e4ef64 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/tools/dbinstaller/gui/DBInstallerGUI.java
@@ -28,7 +28,6 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import com.l2jmobius.tools.dbinstaller.DBOutputInterface;
-import com.l2jmobius.tools.dbinstaller.images.ImagesTable;
/**
* @author mrTJO
@@ -41,10 +40,10 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
public DBInstallerGUI(Connection con)
{
- super("Database Installer");
+ super("Mobius - DB Installer");
setLayout(new BorderLayout());
setDefaultLookAndFeelDecorated(true);
- setIconImage(ImagesTable.getImage("l2j.png").getImage());
+ setIconImage(Toolkit.getDefaultToolkit().getImage("..\\images\\l2jmobius.png"));
_con = con;
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
deleted file mode 100644
index 8d5b1fcf8d..0000000000
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/tools/dbinstaller/images/ImagesTable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package com.l2jmobius.tools.dbinstaller.images;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.ImageIcon;
-
-/**
- * Usage of this class causes images to be loaded and kept in memory, and therefore should only be used by helper applications.
- * Some icons from famfamfam (http://www.famfamfam.com/) credit *MUST* be given.
- * @author KenM
- */
-public class ImagesTable
-{
- private static final Map IMAGES = new HashMap<>();
-
- public static final String IMAGES_DIRECTORY = "images/";
-
- public static ImageIcon getImage(String name)
- {
- if (!IMAGES.containsKey(name))
- {
- IMAGES.put(name, new ImageIcon(IMAGES_DIRECTORY + name));
- }
- return IMAGES.get(name);
- }
-}
\ No newline at end of file