Merge pull request #68 in BA/design from ~RICHIE/design:dev to dev

* commit '24bac75f1533c7f67632669abcbbc3f52d33e7aa':
  接口命名规范
  接口命名规范

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

@@ -130,7 +130,7 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
 
     private Set<ElementUIProvider> elementUIProviders;
 
-    private Set<WidgetAttrProvider> widgetAttrProviders;
+    private Set<WidgetPropertyUIProvider> widgetAttrProviders;
 
     private Set<ExportAttrTabProvider> exportAttrTabProviders;
 
@@ -740,19 +740,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);
     }
 
     public ExportAttrTabProvider[] getExportAttrTabProviders() {
@@ -862,7 +862,7 @@ 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)) {
+            } else if (tagName.equals(WidgetPropertyUIProvider.XML_TAG)) {
                 addWidgetAttrProvider(impl, simplify);
             } else if (tagName.equals(ExportAttrTabProvider.XML_TAG)) {
                 addExportAttrTabProvider(impl, simplify);

designer_base/src/com/fr/design/fun/WidgetPropertyUIProvider.java

@@ -7,8 +7,8 @@ import com.fr.stable.fun.Level;
 /**
  * Created by vito on 16/4/27.
  */
-public interface WidgetAttrProvider extends Level {
+public interface WidgetPropertyUIProvider extends Level {
-    String XML_TAG = "WidgetAttrProvider";
+    String XML_TAG = "WidgetPropertyUIProvider";
 
     int CURRENT_LEVEL = 1;
 

designer_base/src/com/fr/design/fun/impl/AbstractWidgetPropertyUIProvider.java

@@ -1,13 +1,13 @@
 package com.fr.design.fun.impl;
 
-import com.fr.design.fun.WidgetAttrProvider;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.stable.fun.impl.AbstractProvider;
 
 
 /**
  * Created by vito on 16/4/27.
  */
-public abstract class AbstractWidgetAttrProvider extends AbstractProvider implements WidgetAttrProvider {
+public abstract class AbstractWidgetPropertyUIProvider extends AbstractProvider implements WidgetPropertyUIProvider {
 
     @Override
     public int currentAPILevel() {

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

@@ -8,7 +8,7 @@ import javax.swing.*;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.fun.WidgetAttrProvider;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.general.Inter;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -88,8 +88,8 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
         tabbedPane.addTab(Inter.getLocText("Form-Properties"), psp);
         tabbedPane.addTab(Inter.getLocText("Form-Events"), esp);
 
-        WidgetAttrProvider[] widgetAttrProviders = ExtraDesignClassManager.getInstance().getWidgetAttrProviders();
+        WidgetPropertyUIProvider[] widgetAttrProviders = ExtraDesignClassManager.getInstance().getWidgetAttrProviders();
-        for (WidgetAttrProvider widgetAttrProvider : widgetAttrProviders) {
+        for (WidgetPropertyUIProvider widgetAttrProvider : widgetAttrProviders) {
             AbstractPropertyTable propertyTable = widgetAttrProvider.createWidgetAttrTable();
             widgetPropertyTables.add(propertyTable);
             designer.addDesignerEditListener(new WidgetPropertyDesignerAdapter(propertyTable));