From ceb7b13a8e8e5e217be509b14b28ffc48802f837 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sun, 5 Jan 2014 15:50:13 +0000
Subject: [PATCH] Refactor ComponentSkin.skins to compSkins in FSkin

---
 .../main/java/forge/gui/toolbox/FSkin.java    | 50 +++++++++----------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java
index 772526ebb82..a578dd77a49 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java
@@ -78,14 +78,6 @@ public enum FSkin {
 
 
     public static class ComponentSkin<T extends Component> {
-        private static final HashMap<Component, ComponentSkin<?>> skins = new HashMap<Component, ComponentSkin<?>>();
-
-        private static void reapplyAll() {
-            for (ComponentSkin<?> compSkin : skins.values()) {
-                compSkin.reapply();
-            }
-        }
-
         protected T comp;
         private SkinColor foreground, background;
         private SkinFont font;
@@ -458,75 +450,77 @@ public enum FSkin {
         }
     }
 
+    private static final HashMap<Component, ComponentSkin<?>> compSkins = new HashMap<Component, ComponentSkin<?>>();
+
     @SuppressWarnings("unchecked")
     public static <T extends Component> ComponentSkin<T> get(T comp) {
-        ComponentSkin<T> compSkin = (ComponentSkin<T>) ComponentSkin.skins.get(comp);
+        ComponentSkin<T> compSkin = (ComponentSkin<T>) compSkins.get(comp);
         if (compSkin == null) {
             compSkin = new ComponentSkin<T>(comp);
-            ComponentSkin.skins.put(comp, compSkin);
+            compSkins.put(comp, compSkin);
         }
         return compSkin;
     }
     @SuppressWarnings("unchecked")
     public static <T extends Window> WindowSkin<T> get(T comp) {
-        WindowSkin<T> compSkin = (WindowSkin<T>) ComponentSkin.skins.get(comp);
+        WindowSkin<T> compSkin = (WindowSkin<T>) compSkins.get(comp);
         if (compSkin == null) {
             compSkin = new WindowSkin<T>(comp);
-            ComponentSkin.skins.put(comp, compSkin);
+            compSkins.put(comp, compSkin);
         }
         return compSkin;
     }
     @SuppressWarnings("unchecked")
     public static <T extends JComponent> JComponentSkin<T> get(T comp) {
-        JComponentSkin<T> compSkin = (JComponentSkin<T>) ComponentSkin.skins.get(comp);
+        JComponentSkin<T> compSkin = (JComponentSkin<T>) compSkins.get(comp);
         if (compSkin == null) {
             compSkin = new JComponentSkin<T>(comp);
-            ComponentSkin.skins.put(comp, compSkin);
+            compSkins.put(comp, compSkin);
         }
         return compSkin;
     }
     @SuppressWarnings("unchecked")
     public static <T extends JLabel> JLabelSkin<T> get(T comp) {
-        JLabelSkin<T> compSkin = (JLabelSkin<T>) ComponentSkin.skins.get(comp);
+        JLabelSkin<T> compSkin = (JLabelSkin<T>) compSkins.get(comp);
         if (compSkin == null) {
             compSkin = new JLabelSkin<T>(comp);
-            ComponentSkin.skins.put(comp, compSkin);
+            compSkins.put(comp, compSkin);
         }
         return compSkin;
     }
     @SuppressWarnings("unchecked")
     public static <T extends AbstractButton> AbstractButtonSkin<T> get(T comp) {
-        AbstractButtonSkin<T> compSkin = (AbstractButtonSkin<T>) ComponentSkin.skins.get(comp);
+        AbstractButtonSkin<T> compSkin = (AbstractButtonSkin<T>) compSkins.get(comp);
         if (compSkin == null) {
             compSkin = new AbstractButtonSkin<T>(comp);
-            ComponentSkin.skins.put(comp, compSkin);
+            compSkins.put(comp, compSkin);
         }
         return compSkin;
     }
     @SuppressWarnings("unchecked")
     public static <T extends JTextComponent> JTextComponentSkin<T> get(T comp) {
-        JTextComponentSkin<T> compSkin = (JTextComponentSkin<T>) ComponentSkin.skins.get(comp);
+        JTextComponentSkin<T> compSkin = (JTextComponentSkin<T>) compSkins.get(comp);
         if (compSkin == null) {
             compSkin = new JTextComponentSkin<T>(comp);
-            ComponentSkin.skins.put(comp, compSkin);
+            compSkins.put(comp, compSkin);
         }
         return compSkin;
     }
     @SuppressWarnings("unchecked")
     public static <T extends JTable> JTableSkin<T> get(T comp) {
-        JTableSkin<T> compSkin = (JTableSkin<T>) ComponentSkin.skins.get(comp);
+        JTableSkin<T> compSkin = (JTableSkin<T>) compSkins.get(comp);
         if (compSkin == null) {
             compSkin = new JTableSkin<T>(comp);
-            ComponentSkin.skins.put(comp, compSkin);
+            compSkins.put(comp, compSkin);
         }
         return compSkin;
     }
     @SuppressWarnings("unchecked")
     public static <T extends FPanel> FPanelSkin<T> get(T comp) {
-        FPanelSkin<T> compSkin = (FPanelSkin<T>) ComponentSkin.skins.get(comp);
+        FPanelSkin<T> compSkin = (FPanelSkin<T>) compSkins.get(comp);
         if (compSkin == null) {
             compSkin = new FPanelSkin<T>(comp);
-            ComponentSkin.skins.put(comp, compSkin);
+            compSkins.put(comp, compSkin);
         }
         return compSkin;
     }
@@ -535,10 +529,10 @@ public enum FSkin {
         if (comp instanceof IDisposable) { //dispose component itself if possible 
             ((IDisposable)comp).dispose();
         }
-        ComponentSkin<?> compSkin = ComponentSkin.skins.get(comp);
+        ComponentSkin<?> compSkin = compSkins.get(comp);
         if (compSkin != null) {
             compSkin.comp = null;
-            ComponentSkin.skins.remove(comp);
+            compSkins.remove(comp);
         }
         if (comp instanceof Container) {
             //dispose skins for child components
@@ -1741,7 +1735,9 @@ public enum FSkin {
         loadFull(false);
 
         //reapply skin to all skinned components
-        ComponentSkin.reapplyAll();
+        for (ComponentSkin<?> compSkin : compSkins.values()) {
+            compSkin.reapply();
+        }
 
         //refresh certain components skinned via look and feel
         Singletons.getControl().getForgeMenu().refresh();