Merge pull request #80 in BA/design from ~NEIL/design:master to master

* commit 'e191733588e7646119170abf2cef0ab2f57b71fe':
  之前冲突的改回来.

designer_base/src/com/fr/design/ExtraDesignClassManager.java

@@ -130,7 +130,9 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
 
     private Set<ElementUIProvider> elementUIProviders;
 
-    private Set<WidgetAttrProvider> widgetAttrProviders;
+    private Set<WidgetPropertyUIProvider> widgetAttrProviders;
+
+    private Set<ExportAttrTabProvider> exportAttrTabProviders;
 
     private WidgetDesignHandler widgetDesignHandler;
 
@@ -748,19 +750,19 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
         elementUIProviders.add((ElementUIProvider) level);
     }
 
-    public WidgetAttrProvider[] getWidgetAttrProviders() {
+    public WidgetPropertyUIProvider[] getWidgetAttrProviders() {
         if (widgetAttrProviders == null) {
-            return new WidgetAttrProvider[0];
+            return new WidgetPropertyUIProvider[0];
         }
-        return widgetAttrProviders.toArray(new WidgetAttrProvider[widgetAttrProviders.size()]);
+        return widgetAttrProviders.toArray(new WidgetPropertyUIProvider[widgetAttrProviders.size()]);
     }
 
     public void addWidgetAttrProvider(Level level, PluginSimplify simplify) throws Exception {
         if (widgetAttrProviders == null) {
-            widgetAttrProviders = new HashSet<WidgetAttrProvider>();
+            widgetAttrProviders = new HashSet<WidgetPropertyUIProvider>();
         }
-        validAPILevel(level, WidgetAttrProvider.CURRENT_LEVEL, simplify.getPluginName());
+        validAPILevel(level, WidgetPropertyUIProvider.CURRENT_LEVEL, simplify.getPluginName());
-        widgetAttrProviders.add((WidgetAttrProvider) level);
+        widgetAttrProviders.add((WidgetPropertyUIProvider) level);
     }
 
     /**
@@ -855,10 +857,12 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
                 setTableDataSourceOPProcessor(impl, simplify);
             } else if (tagName.equals(ElementUIProvider.MARK_STRING)) {
                 addElementUIProvider(impl, simplify);
-            } else if (tagName.equals(WidgetAttrProvider.XML_TAG)) {
-                addWidgetAttrProvider(impl, simplify);
             } else if (tagName.equals(WidgetDesignHandler.XML_TAG)) {
                 setWidgetDesignHandler(impl, simplify);
+            }else if (tagName.equals(WidgetPropertyUIProvider.XML_TAG)) {
+                addWidgetAttrProvider(impl, simplify);
+            } else if (tagName.equals(ExportAttrTabProvider.XML_TAG)) {
+                addExportAttrTabProvider(impl, simplify);
             }
         } catch (PluginInvalidLevelException e) {
             PluginMessage.remindUpdate(e.getMessage());
@@ -867,6 +871,21 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
         }
     }
 
+    public ExportAttrTabProvider[] getExportAttrTabProviders() {
+        if (exportAttrTabProviders == null) {
+            return new ExportAttrTabProvider[0];
+        }
+        return exportAttrTabProviders.toArray(new ExportAttrTabProvider[exportAttrTabProviders.size()]);
+    }
+
+    public void addExportAttrTabProvider(Level level, PluginSimplify simplify) throws Exception {
+        if (exportAttrTabProviders == null) {
+            exportAttrTabProviders = new HashSet<ExportAttrTabProvider>();
+        }
+        validAPILevel(level, ExportAttrTabProvider.CURRENT_LEVEL, simplify.getPluginName());
+        exportAttrTabProviders.add((ExportAttrTabProvider) level);
+    }
+
     private void readTableDataRelated(String tagName, String className, PluginSimplify simplify) {
         if (tagName.equals(TableDataCreatorProvider.XML_TAG)) {
             setTableDataCreatorProvider(className);