Merging in latest from upstream (BA/design:refs/heads/dev)

* commit 'e956d3a9c0bff532a4617528a64e51276effa27d':
  界面按钮顺序修改了，预览图片的顺序也要相应修改
  调整移动端属性->自适应->双向自适应按钮和不自适应按钮顺序
  解决国际化文件冲突之后“app”忘记去掉
  增加了移动端属性->双向自适应选项
  rt
  rt
  oracle 存储过程问题
  解决冲突
  将“app自适应”改成“自适应”

designer/src/com/fr/design/report/mobile/AppFitBrowserPane.java

@@ -75,7 +75,7 @@ public class AppFitBrowserPane extends BasicBeanPane<ElementCaseMobileAttr> {
 
     @Override
     protected String title4PopupWindow() {
-        return Inter.getLocText("FR-Designer_Fit-App");
+        return Inter.getLocText("FR-Designer_Fit");
     }
 
     private ActionListener getAppPreviewActionListener() {

designer/src/com/fr/design/report/mobile/AppFitPreviewPane.java

@@ -35,10 +35,12 @@ public class AppFitPreviewPane extends BasicPane{
         cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V1.png")));
         cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V2.png")));
         cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V3.png")));
+        cachedVerticalPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/V4.png")));
         cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H0.png")));
         cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H1.png")));
         cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H2.png")));
         cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H3.png")));
+        cachedHorizonPreviewImage.add(new ImageIcon(IOUtils.readImage("/com/fr/design/images/dialog/appfit/H4.png")));
     }
 
     private void initComponents() {

designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java

@@ -1,11 +1,11 @@
 package com.fr.design.report.mobile;
 
+import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -28,22 +28,22 @@ public class MobileRadioGroupPane extends BasicBeanPane<MobileFitAttrState>{
     private void initComponents(String title) {
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p};
-        double[] columnSize = {p, p, p, p, p};
+        double[] columnSize = {p, p, p, p, p, p};
 
         UIRadioButton defaultRadio = new UIRadioButton(MobileFitAttrState.DEFAULT.description());
         defaultRadio.setSelected(true);
         UIRadioButton horizonRadio = new UIRadioButton(MobileFitAttrState.HORIZONTAL.description());
         UIRadioButton verticalRadio = new UIRadioButton(MobileFitAttrState.VERTICAL.description());
+        UIRadioButton bidirectionalRadio = new UIRadioButton(MobileFitAttrState.BIDIRECTIONAL.description());
         UIRadioButton notFitRadio = new UIRadioButton(MobileFitAttrState.NONE.description());
 
-        addToButtonGroup(defaultRadio, horizonRadio, verticalRadio, notFitRadio);
+        addToButtonGroup(defaultRadio, horizonRadio, verticalRadio, notFitRadio, bidirectionalRadio);
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(title), defaultRadio, horizonRadio, verticalRadio, notFitRadio}
+                new Component[]{new UILabel(title), defaultRadio, horizonRadio, verticalRadio, notFitRadio, bidirectionalRadio}
         };
         JPanel fitOpsPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         fitOpsPane.setBorder(BorderFactory.createEmptyBorder(10, 13, 10, 10));
-
         this.add(fitOpsPane);
     }
 

designer/src/com/fr/design/report/mobile/ReportMobileAttrPane.java

@@ -65,6 +65,6 @@ public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr>{
 
     @Override
     protected String title4PopupWindow() {
-        return Inter.getLocText("FR-Designer_Fit-App");
+        return Inter.getLocText("FR-Designer_Mobile-Attr");
     }
 }

designer_base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java

@@ -299,7 +299,6 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
             text = StringUtils.EMPTY;
         }
         text = text.trim();
-        String[] tableName = text.split("\\.");
         String connectionname = this.connectionTableProcedurePane.getSelectedDatabaseConnnectonName();
         try {
             String procedureText = FRContext.getCurrentEnv().getProcedureText(this.connectionTableProcedurePane.getSelectedDatabaseConnnectonName(), text);
@@ -307,16 +306,16 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
             // 获取参数默认值，例如：NAME in varchar2 default 'SCOTT'，默认值为SCOTT
             String parameterDefaultValue = "";
             if (StringUtils.isNotEmpty(procedureText)) {
-            	int index_begin = procedureText.indexOf("BEGIN");
-            	
-            	//from sam: 默认值只会在begin之前声明, 不然会把所有的存储过程里带'xx'的都作为默认值
-            	String defaulValueStr = index_begin == -1 ? procedureText : procedureText.substring(0, index_begin);
-            	String[] strs = defaulValueStr.split("\'");
+                int index_begin = procedureText.indexOf("BEGIN");
+
+                //from sam: 默认值只会在begin之前声明, 不然会把所有的存储过程里带'xx'的都作为默认值
+                String defaulValueStr = index_begin == -1 ? procedureText : procedureText.substring(0, index_begin);
+                String[] strs = defaulValueStr.split("\'");
                 parameterDefaultValue = strs.length > 1 ? strs[1] : parameterDefaultValue;
             }
 
             StoreProcedureParameter[] newparameters;
-            newparameters = FRContext.getCurrentEnv().getStoreProcedureDeclarationParameters(connectionname, tableName[tableName.length - 1], parameterDefaultValue);
+            newparameters = FRContext.getCurrentEnv().getStoreProcedureDeclarationParameters(connectionname, text, parameterDefaultValue);
 
 
             editorPane.populate(newparameters);

designer_base/src/com/fr/design/locale/designer.properties

@@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=
 FR-Designer_File=
 FR-Designer_Filter_Conditions=
 FR-Designer_Finish-Modify-Share=
-FR-Designer_Fit-App=
+FR-Designer_Fit=
 FR-Designer_Font-Family=
 FR-Designer_Font-Size=
 FR-Designer_Forbid_Drag_into_Adapt_Pane=Forbid Drag into Para Pane

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=Close other templates
 FR-Designer_File=file
 FR-Designer_Filter_Conditions=Filter condition
 FR-Designer_Finish-Modify-Share=Finish Modification And Share
-FR-Designer_Fit-App=App self-adaption
+FR-Designer_Fit=self-adaption
 FR-Designer_Font-Family=Font name
 FR-Designer_Font-Size=Font size
 FR-Designer_Forbid_Drag_into_Adapt_Pane=Form body  cannot be dragged  into the object 

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=\u305D\u306E\u4ED6\u30C6\u30F3\u30D7\u30EC\
 FR-Designer_File=\u30D5\u30A1\u30A4\u30EB
 FR-Designer_Filter_Conditions=\u9078\u5225\u6761\u4EF6
 FR-Designer_Finish-Modify-Share=\u4FEE\u6B63\u3092\u5B8C\u4E86\u3057\u3066\u30B7\u30A7\u30A2
-FR-Designer_Fit-App=App\u81EA\u9069\u5FDC
+FR-Designer_Fit=\u81EA\u9069\u5FDC
 FR-Designer_Font-Family=\u30D5\u30A9\u30F3\u30C8\u540D\u79F0
 FR-Designer_Font-Size=\u30D5\u30A9\u30F3\u30C8\u5927\u5C0F
 FR-Designer_Forbid_Drag_into_Adapt_Pane=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u30D5\u30A9\u30FC\u30E0\u672C\u6587\u3092\u30C9\u30E9\u30C3\u30B0\u3059\u308B\u3053\u3068\u306F\u8A31\u3055\u308C\u306A\u3044

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=\uAE30\uD0C0\uD15C\uD50C\uB9BF\uB2EB\uAE30
 FR-Designer_File=\uD30C\uC77C
 FR-Designer_Filter_Conditions=\uD544\uD130\uC870\uAC74
 FR-Designer_Finish-Modify-Share=\uC218\uC815\uC644\uB8CC\uBC0F\uACF5\uC720
-FR-Designer_Fit-App=App\uC790\uAE30\uC801\uC751
+FR-Designer_Fit=\uC790\uAE30\uC801\uC751
 FR-Designer_Font-Family=\uAE00\uAF34\uBA85\uCE6D
 FR-Designer_Font-Size=\uAE00\uAF34\uD06C\uAE30
 FR-Designer_Forbid_Drag_into_Adapt_Pane=\uD574\uB2F9\uAC1D\uCCB4\uB294\uD3FC\uD14C\uC774\uBE14\uBC14\uB514\uB4DC\uB798\uADF8\uB97C\uD5C8\uC6A9\uD558\uC9C0\uC54A\uC2B5\uB2C8\uB2E4.

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=\u5173\u95ED\u5176\u4ED6\u6A21\u677F
 FR-Designer_File=\u6587\u4EF6
 FR-Designer_Filter_Conditions=\u8FC7\u6EE4\u6761\u4EF6
 FR-Designer_Finish-Modify-Share=\u5B8C\u6210\u4FEE\u6539\u5E76\u5206\u4EAB
-FR-Designer_Fit-App=App\u81EA\u9002\u5E94
+FR-Designer_Fit=\u81EA\u9002\u5E94
 FR-Designer_Font-Family=\u5B57\u4F53\u540D\u79F0
 FR-Designer_Font-Size=\u5B57\u4F53\u5927\u5C0F
 FR-Designer_Forbid_Drag_into_Adapt_Pane=\u8BE5\u5BF9\u8C61\u4E0D\u5141\u8BB8\u62D6\u5165\u8868\u5355\u4E3B\u4F53
@@ -422,7 +422,7 @@ FR-Designer-Website_Url=http\://www.finereport.com/
 FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u5F55\u540E\u624D\u80FD\u4E0B\u8F7D
 FR-Designer-App_ReLayout=\u624B\u673A\u91CD\u5E03\u5C40
 FR-Designer_Mobile-Attr=\u79FB\u52A8\u7AEF\u5C5E\u6027
-FR-Designer_Mobile-Vertical=\u7AD6\u5C4FF
+FR-Designer_Mobile-Vertical=\u7AD6\u5C4F
 FR-Designer_Mobile-Horizontal=\u6A2A\u5C4F
 FR-Designer_COMMUNITY=\u793E\u533A
 FR-Designer_COMMUNITY_BBS=\u5E06\u8F6F\u8BBA\u575B

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=\u95DC\u9589\u5176\u4ED6\u7BC4\u672C
 FR-Designer_File=\u6A94\u6848
 FR-Designer_Filter_Conditions=\u904E\u6FFE\u689D\u4EF6
 FR-Designer_Finish-Modify-Share=\u5B8C\u6210\u4FEE\u6539\u4E26\u5206\u4EAB
-FR-Designer_Fit-App=App\u81EA\u9069\u61C9
+FR-Designer_Fit=\u81EA\u9069\u61C9
 FR-Designer_Font-Family=\u5B57\u9AD4\u540D\u7A31
 FR-Designer_Font-Size=\u5B57\u9AD4\u5927\u5C0F
 FR-Designer_Forbid_Drag_into_Adapt_Pane=\u8A72\u5C0D\u8C61\u4E0D\u5141\u8A31\u62D6\u5165\u8868\u55AE\u4E3B\u9AD4

designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java

@@ -50,15 +50,15 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
                 new CRPropertyDescriptor("horziontalAttr", this.xCreator.toData().getClass()).setEditorClass(MobileFitEditor.class)
                         .setRendererClass(MobileFitRender.class)
                         .setI18NName(Inter.getLocText("FR-Designer_Mobile-Horizontal"))
-                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit-App")),
+                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit")),
                 new CRPropertyDescriptor("verticalAttr", this.xCreator.toData().getClass()).setEditorClass(MobileFitEditor.class)
                         .setRendererClass(MobileFitRender.class)
                         .setI18NName(Inter.getLocText("FR-Designer_Mobile-Vertical"))
-                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit-App")),
+                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit")),
                 new CRPropertyDescriptor("heightRestrict", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class)
                         .setI18NName(Inter.getLocText("Form-EC_heightrestrict"))
                         .setRendererClass(BooleanRender.class)
-                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit-App"))
+                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit"))
         };
         List<CRPropertyDescriptor> defaultList = new ArrayList<>();
 
@@ -96,7 +96,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
         }
 
 
-        groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer_Fit-App"), xCreator, propertyTableEditor, designer)));
+        groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer_Fit"), xCreator, propertyTableEditor, designer)));
 
         TableModel model = new BeanTableModel();
         setModel(model);