Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into dev

designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java

@@ -222,16 +222,16 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
         return ChartTypeManager.getInstance().containsPlot(plotID);
     }
 
+
     /**
      * 把所有的pane加到list里
      *
      * @param paneList pane容器
      */
     public void addPlotTypePaneList(List<FurtherBasicBeanPane<? extends Chart>> paneList) {
-        Iterator iterator = chartTypeInterfaces.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry entry = (Map.Entry) iterator.next();
-            String priority = (String) entry.getKey();
+        List<Integer> priorityList = getPriorityInOrder();
+        for (int i = 0; i < priorityList.size(); i++){
+            String priority = String.valueOf(priorityList.get(i));
             Iterator chartUIIterator = chartTypeInterfaces.get(priority).entrySet().iterator();
             while (chartUIIterator.hasNext()) {
                 Map.Entry chartUIEntry = (Map.Entry) chartUIIterator.next();
@@ -276,22 +276,20 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
     }
 
     private String[] getTitle4PopupWindow(){
-        List<Integer> priorityList = new ArrayList<Integer>();
+        List<Integer> priorityList = getPriorityInOrder();
+
+        if (priorityList.size() == 0){
+            return new String[0];
+        }
+
         int size = 0;
-        if (chartTypeInterfaces != null){
-            Iterator iterator = chartTypeInterfaces.entrySet().iterator();
-            while (iterator.hasNext()){
-                Map.Entry entry = (Map.Entry) iterator.next();
-                String priority = (String) entry.getKey();
-                priorityList.add(Integer.valueOf(priority));
-                size += getChartSize(priority);
+        //获取总得图表格式
+        for (int i = 0; i < priorityList.size(); i++) {
+            size += getChartSize(String.valueOf(priorityList.get(i)));
         }
         String[] names = new String[size];
 
-            priorityList = ChartTypeManager.orderInPriority(priorityList);
-
         int index = 0;
-
         for (int i = 0; i < priorityList.size(); i++){
             String priority = String.valueOf(priorityList.get(i));
             Iterator chartUI = chartTypeInterfaces.get(priority).entrySet().iterator();
@@ -301,7 +299,17 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
         return names;
     }
 
-        return new String[0];
+    private List<Integer> getPriorityInOrder() {
+        List<Integer> priorityList = new ArrayList<Integer>();
+        if (chartTypeInterfaces != null) {
+            Iterator iterator = chartTypeInterfaces.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry entry = (Map.Entry) iterator.next();
+                String priority = (String) entry.getKey();
+                priorityList.add(Integer.valueOf(priority));
+            }
+        }
+        return ChartTypeManager.orderInPriority(priorityList);
     }
 
     private int fetchNames(Iterator chartUI, String[] names, int index) {

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

@@ -2,9 +2,19 @@ package com.fr.design.designer.creator;
 
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRAbsoluteBodyLayoutAdapter;
+import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
+import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
+import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
+import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer;
+import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.container.WAbsoluteBodyLayout;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.Inter;
+import com.fr.stable.core.PropertyChangeAdapter;
 
 import java.awt.*;
+import java.beans.IntrospectionException;
 
 /**
  * Created by zhouping on 2016/10/14.
@@ -52,4 +62,33 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
     public boolean isSupportDrag() {
         return false;
     }
+
+    /**
+     * 得到属性名
+     *
+     * @return 属性名
+     * @throws java.beans.IntrospectionException
+     */
+    @Override
+    public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+        return  new CRPropertyDescriptor[] {
+                new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter
+                        .getLocText("FR-Designer_Form-Widget_Name")),
+                new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
+                        WLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName(
+                        Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+                        .setPropertyChangeListener(new PropertyChangeAdapter() {
+
+                            @Override
+                            public void propertyChange() {
+                                initStyle();
+                            }
+                        })
+        };
+    }
+
+    @Override
+    protected void initStyle() {
+        initBorderStyle();
+    }
 }

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

@@ -657,7 +657,8 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
      * @return 是则返回true
      */
     public boolean isSelectRootPane() {
-        return formDesign.getRootComponent() == formDesign.getSelectionModel().getSelection().getSelectedCreator();
+        return (formDesign.getRootComponent() == formDesign.getSelectionModel().getSelection().getSelectedCreator())
+                || (formDesign.getSelectionModel().getSelection().getSelectedCreator().acceptType(XWAbsoluteBodyLayout.class));
 
     }