diff --git a/Mage.Client/plugins/mage-theme-plugin.jar b/Mage.Client/plugins/mage-theme-plugin.jar new file mode 100644 index 0000000000..1cdfa762a8 Binary files /dev/null and b/Mage.Client/plugins/mage-theme-plugin.jar differ diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index 0ccae63239..c7a89350f9 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -37,6 +37,11 @@ jspf-core 0.9.1 + + log4j + log4j + 1.2.9 + diff --git a/Mage.Plugins/Mage.Theme.Plugin/pom.xml b/Mage.Plugins/Mage.Theme.Plugin/pom.xml index a4be97af38..eaa70c9137 100644 --- a/Mage.Plugins/Mage.Theme.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Theme.Plugin/pom.xml @@ -31,6 +31,7 @@ log4j log4j 1.2.9 + provided diff --git a/Mage.Plugins/Mage.Theme.Plugin/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java b/Mage.Plugins/Mage.Theme.Plugin/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java index fef605c690..9da06898fc 100644 --- a/Mage.Plugins/Mage.Theme.Plugin/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java +++ b/Mage.Plugins/Mage.Theme.Plugin/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java @@ -31,16 +31,16 @@ public class ThemePluginImpl implements ThemePlugin { } public String toString() { - return "[Theme plugin, version 0.1]"; + return "[Theme plugin, version 0.2]"; } public void apply(Map ui) { - log.info("Adding background..."); + //log.info("Adding background..."); try { - BufferedImage background = ImageIO.read(this.getClass().getResourceAsStream("/green.jpg")); + BufferedImage background = ImageIO.read(this.getClass().getResourceAsStream("/dk_gray.jpg")); if (background == null) - throw new FileNotFoundException("Couldn't find green.jpg in resources."); + throw new FileNotFoundException("Couldn't find dk_gray.jpg in resources."); if (ui.containsKey("gamePanel") && ui.containsKey("jLayeredPane")) { ImagePanel bgPanel = new ImagePanel(background, ImagePanel.TILED); @@ -62,7 +62,7 @@ public class ThemePluginImpl implements ThemePlugin { return; } - log.info("Done."); + //log.info("Done."); } private void unsetOpaque(JComponent c) { diff --git a/Mage.Plugins/Mage.Theme.Plugin/src/main/resources/dk_gray.jpg b/Mage.Plugins/Mage.Theme.Plugin/src/main/resources/dk_gray.jpg new file mode 100644 index 0000000000..2e0776d606 Binary files /dev/null and b/Mage.Plugins/Mage.Theme.Plugin/src/main/resources/dk_gray.jpg differ diff --git a/Mage.Plugins/Mage.Theme.Plugin/src/main/resources/log4j.properties b/Mage.Plugins/Mage.Theme.Plugin/src/main/resources/log4j.properties deleted file mode 100644 index 08d7f0e74f..0000000000 --- a/Mage.Plugins/Mage.Theme.Plugin/src/main/resources/log4j.properties +++ /dev/null @@ -1,8 +0,0 @@ -#default levels -log4j.rootLogger=debug, console - -#console log -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%-5p [%d{yyyy-MM-dd HH:mm [ss:SSS]}] %C{1}[%t]: %m%n -log4j.appender.console.Threshold=DEBUG \ No newline at end of file