diff --git a/designer/designer.iml b/designer/designer.iml index 276f91e81..c798a6fe0 100644 --- a/designer/designer.iml +++ b/designer/designer.iml @@ -17,6 +17,5 @@ - \ No newline at end of file diff --git a/designer_base/designer_base.iml b/designer_base/designer_base.iml index 15ff9cc8c..d20642b28 100644 --- a/designer_base/designer_base.iml +++ b/designer_base/designer_base.iml @@ -1,7 +1,7 @@ - + diff --git a/designer_base/src/com/fr/design/style/background/BackgroundFactory.java b/designer_base/src/com/fr/design/style/background/BackgroundFactory.java index c41639c8a..2706f81b1 100644 --- a/designer_base/src/com/fr/design/style/background/BackgroundFactory.java +++ b/designer_base/src/com/fr/design/style/background/BackgroundFactory.java @@ -9,7 +9,7 @@ import com.fr.design.style.background.impl.*; import com.fr.general.Background; import com.fr.general.Inter; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -18,8 +18,8 @@ import java.util.Set; */ public class BackgroundFactory { - private static Map, BackgroundUIWrapper> map = new HashMap<>(); - private static Map, BackgroundUIWrapper> browser = new HashMap<>(); + private static Map, BackgroundUIWrapper> map = new LinkedHashMap<>(); + private static Map, BackgroundUIWrapper> browser = new LinkedHashMap<>(); static { registerUniversal(map); @@ -96,7 +96,7 @@ public class BackgroundFactory { return createByWrapper(wrapper); } - public static BackgroundDetailPane createBrowerIfAbsent(int index) { + public static BackgroundDetailPane createBrowserIfAbsent(int index) { for (BackgroundUIWrapper wrapper : browser.values()) { if (wrapper.getIndex() == index) { return createByWrapper(wrapper); diff --git a/designer_base/src/com/fr/design/style/background/BackgroundPane4Browser.java b/designer_base/src/com/fr/design/style/background/BackgroundPane4Browser.java index 490cb82e4..705bbc2de 100644 --- a/designer_base/src/com/fr/design/style/background/BackgroundPane4Browser.java +++ b/designer_base/src/com/fr/design/style/background/BackgroundPane4Browser.java @@ -16,7 +16,7 @@ public class BackgroundPane4Browser extends BackgroundPane { protected void initTabPane() { int index = 0; for (Class key : BackgroundFactory.browserKindsOfKey()) { - BackgroundUIWrapper wrapper = BackgroundFactory.getWrapper(key); + BackgroundUIWrapper wrapper = BackgroundFactory.getBrosweWrapper(key); wrapper.setIndex(index++); tabbedPane.addTab(Inter.getLocText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); } @@ -37,7 +37,7 @@ public class BackgroundPane4Browser extends BackgroundPane { protected BackgroundDetailPane getTabItemPaneByIndex(int index) { BackgroundDetailPane quickPane = cacheMap.get(index); if (quickPane == null) { - quickPane = BackgroundFactory.createBrowerIfAbsent(index); + quickPane = BackgroundFactory.createBrowserIfAbsent(index); tabbedPane.setComponentAt(index, quickPane); cacheMap.put(index, quickPane); quickPane.addChangeListener(backgroundChangeListener);