Merge pull request #29 in PF/design from ~JU/co-pf-9.0-design:9.0 to 9.0

* commit '7195e9f19b2811cad3515576734ecf91b192a6e3':
  fix
  监听包含FormParaWidgetPane接口的插件

designer_form/src/com/fr/design/designer/creator/XCreatorUtils.java

@@ -5,13 +5,9 @@ package com.fr.design.designer.creator;
 
 import com.fr.base.FRContext;
 import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.designer.creator.cardlayout.XCardAddButton;
+import com.fr.design.designer.creator.cardlayout.*;
-import com.fr.design.designer.creator.cardlayout.XCardSwitchButton;
+import com.fr.design.fun.FormWidgetOptionProvider;
-import com.fr.design.designer.creator.cardlayout.XWCardLayout;
+import com.fr.design.fun.ParameterWidgetOptionProvider;
-import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
-import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
-import com.fr.design.designer.creator.cardlayout.XWCardTitleLayout;
-import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.parameter.FormSubmitButton;
@@ -24,7 +20,13 @@ import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.form.ui.container.cardlayout.WCardTitleLayout;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
+import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
+import com.fr.plugin.context.PluginContext;
+import com.fr.plugin.injectable.PluginModule;
+import com.fr.plugin.manage.PluginFilter;
+import com.fr.plugin.observer.PluginEvent;
+import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -40,9 +42,64 @@ import java.lang.reflect.Constructor;
 public class XCreatorUtils {
     
     public static java.util.Map<Class<? extends Widget>, Class<?>> objectMap = new java.util.HashMap<Class<? extends Widget>, Class<?>>();
+    
+    private static java.util.Map<Class<? extends Widget>, Class<?>> extraObjectMap = new java.util.HashMap<Class<? extends Widget>, Class<?>>();
+    
     public static java.util.Map<Class<? extends Widget>, Class<?>> xLayoutMap = new java.util.HashMap<Class<? extends Widget>, Class<?>>();
     
     static {
+        init();
+        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+            
+            @Override
+            public void on(PluginEvent event) {
+                
+                reInitExtra();
+            }
+        }, new PluginFilter() {
+            
+            @Override
+            public boolean accept(PluginContext context) {
+                
+                return context.contain(PluginModule.ExtraDesign, ParameterWidgetOptionProvider.XML_TAG)
+                    || context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG);
+            }
+        });
+    }
+    
+    private static void init() {
+        
+        putDefault();
+        putExtraEditor();
+        putDefaultLayouts();
+        reInitExtra();
+    }
+    
+    private static void putDefaultLayouts() {
+        
+        xLayoutMap.put(WAbsoluteLayout.class, XWAbsoluteLayout.class);
+        xLayoutMap.put(WParameterLayout.class, XWParameterLayout.class);
+        xLayoutMap.put(WAbsoluteBodyLayout.class, XWAbsoluteBodyLayout.class);
+        xLayoutMap.put(WAbsoluteLayout.class, XWAbsoluteLayout.class);
+        xLayoutMap.put(WHorizontalBoxLayout.class, XWHorizontalBoxLayout.class);
+        xLayoutMap.put(WBorderLayout.class, XWBorderLayout.class);
+        xLayoutMap.put(WCardLayout.class, XWCardLayout.class);
+        xLayoutMap.put(WVerticalBoxLayout.class, XWVerticalBoxLayout.class);
+        xLayoutMap.put(WHorizontalSplitLayout.class, XWHorizontalSplitLayout.class);
+        xLayoutMap.put(WVerticalSplitLayout.class, XWVerticalSplitLayout.class);
+        xLayoutMap.put(WGridLayout.class, XWGridLayout.class);
+        
+        xLayoutMap.put(WFitLayout.class, XWFitLayout.class);
+        xLayoutMap.put(WScaleLayout.class, XWScaleLayout.class);
+        xLayoutMap.put(WTitleLayout.class, XWTitleLayout.class);
+        xLayoutMap.put(WCardTagLayout.class, XWCardTagLayout.class);
+        xLayoutMap.put(WCardTitleLayout.class, XWCardTitleLayout.class);
+        xLayoutMap.put(WTabFitLayout.class, XWTabFitLayout.class);
+        xLayoutMap.put(WCardMainBorderLayout.class, XWCardMainBorderLayout.class);
+    }
+    
+    private static void putDefault() {
+        
         objectMap.put(TextEditor.class, XTextEditor.class);
         objectMap.put(TextArea.class, XTextArea.class);
         objectMap.put(NumberEditor.class, XNumberEditor.class);
@@ -73,30 +130,13 @@ public class XCreatorUtils {
         objectMap.put(NameWidget.class, XNameWidget.class);
         objectMap.put(CardSwitchButton.class, XCardSwitchButton.class);
         objectMap.put(CardAddButton.class, XCardAddButton.class);
-        putExtraEditor();
+    }
-
-        xLayoutMap.put(WAbsoluteLayout.class, XWAbsoluteLayout.class);
-        xLayoutMap.put(WParameterLayout.class, XWParameterLayout.class);
-        xLayoutMap.put(WAbsoluteBodyLayout.class, XWAbsoluteBodyLayout.class);
-        xLayoutMap.put(WAbsoluteLayout.class, XWAbsoluteLayout.class);
-        xLayoutMap.put(WHorizontalBoxLayout.class, XWHorizontalBoxLayout.class);
-        xLayoutMap.put(WBorderLayout.class, XWBorderLayout.class);
-        xLayoutMap.put(WCardLayout.class, XWCardLayout.class);
-        xLayoutMap.put(WVerticalBoxLayout.class, XWVerticalBoxLayout.class);
-        xLayoutMap.put(WHorizontalSplitLayout.class, XWHorizontalSplitLayout.class);
-        xLayoutMap.put(WVerticalSplitLayout.class, XWVerticalSplitLayout.class);
-        xLayoutMap.put(WGridLayout.class, XWGridLayout.class);
     
-        xLayoutMap.put(WFitLayout.class, XWFitLayout.class);
+    private static void reInitExtra() {
-        xLayoutMap.put(WScaleLayout.class, XWScaleLayout.class);
-        xLayoutMap.put(WTitleLayout.class, XWTitleLayout.class);
-        xLayoutMap.put(WCardTagLayout.class, XWCardTagLayout.class);
-        xLayoutMap.put(WCardTitleLayout.class, XWCardTitleLayout.class);
-        xLayoutMap.put(WTabFitLayout.class, XWTabFitLayout.class);
-        xLayoutMap.put(WCardMainBorderLayout.class, XWCardMainBorderLayout.class);
         
-        objectMap.putAll(ExtraDesignClassManager.getInstance().getParameterWidgetOptionsMap());
+        extraObjectMap.clear();
-        objectMap.putAll(ExtraDesignClassManager.getInstance().getFormWidgetOptionsMap());
+        extraObjectMap.putAll(ExtraDesignClassManager.getInstance().getParameterWidgetOptionsMap());
+        extraObjectMap.putAll(ExtraDesignClassManager.getInstance().getFormWidgetOptionsMap());
     }
     
     private static void putExtraEditor() {
@@ -105,8 +145,13 @@ public class XCreatorUtils {
         }
     }
     
+    @SuppressWarnings("unchecked")
     private static Class<? extends XCreator> searchXCreatorClass(Class<? extends Widget> clazz) {
+        
         Class<? extends XCreator> xClazz = (Class<? extends XCreator>) objectMap.get(clazz);
+        if (xClazz == null) {
+            xClazz = (Class<? extends XCreator>) extraObjectMap.get(clazz);
+        }
         if (xClazz == null) {
             xClazz = (Class<? extends XCreator>) xLayoutMap.get(clazz);
         }

designer_form/src/com/fr/design/mainframe/FormParaWidgetPane.java

@@ -6,6 +6,7 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.beans.events.DesignerEditListener;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.fun.FormWidgetOptionProvider;
 import com.fr.design.gui.core.FormWidgetOption;
 import com.fr.design.gui.core.UserDefinedWidgetOption;
 import com.fr.design.gui.core.WidgetOption;
@@ -16,7 +17,13 @@ import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.*;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
+import com.fr.plugin.context.PluginContext;
+import com.fr.plugin.injectable.PluginModule;
+import com.fr.plugin.manage.PluginFilter;
+import com.fr.plugin.observer.PluginEvent;
+import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.ArrayUtils;
 
 import javax.swing.*;
@@ -56,7 +63,27 @@ public class FormParaWidgetPane extends JPanel {
 
     private FormDesigner designer;
     
-    public static final FormParaWidgetPane getInstance(FormDesigner designer) {
+    static {
+        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+            
+            @Override
+            public void on(PluginEvent event) {
+                
+                synchronized (FormParaWidgetPane.class) {
+                    THIS = null;
+                }
+            }
+        }, new PluginFilter() {
+            
+            @Override
+            public boolean accept(PluginContext context) {
+                
+                return context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG);
+            }
+        });
+    }
+    
+    public static synchronized final FormParaWidgetPane getInstance(FormDesigner designer) {
         if (THIS == null) {
             THIS = new FormParaWidgetPane();
         }