Merge pull request #502 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit 'f658b504fab10097128b850205497f348ab4750e':
  REPORT-11448 & REPORT-10678

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -155,8 +155,6 @@ public class PreferencePane extends BasicPane {
 
         createServerPane(advancePane);
 
-        createJdkHomePane(advancePane);
-
         JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Oracle_All_Tables"));
         oracleSpace = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_All_Oracle_Tables"));
         oraclePane.add(oracleSpace);
@@ -470,42 +468,6 @@ public class PreferencePane extends BasicPane {
         serverPortPane.add(choosePortPane, BorderLayout.CENTER);
     }
 
-    private void createJdkHomePane(JPanel advancePane) {
-        double p = TableLayout.PREFERRED;
-        double rowSize[] = {p};
-        double columnSize[] = {p, p, p};
-
-        JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_JDK_Home"));
-        advancePane.add(serverPortPane);
-        jdkHomeTextField = new UITextField();
-        UIButton chooseBtn = new UIButton("...");
-        chooseBtn.setPreferredSize(new Dimension(20, 20));
-        JPanel panel = GUICoreUtils.createBorderLayoutPane(
-                jdkHomeTextField, BorderLayout.CENTER,
-                chooseBtn, BorderLayout.EAST
-        );
-        chooseBtn.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                JFileChooser fileChooser = new JFileChooser();
-                fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-                int returnValue = fileChooser.showOpenDialog(PreferencePane.this);
-                if (returnValue == JFileChooser.APPROVE_OPTION) {
-                    File file = fileChooser.getSelectedFile();
-                    jdkHomeTextField.setText(file.getAbsolutePath());
-                }
-            }
-        });
-        panel.setPreferredSize(new Dimension(300, 20));
-        UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));
-        UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_JDK_Home") + ":");
-        Component[][] portComponents = {
-                {serverPortLabel, panel, notiJlabel},
-        };
-        JPanel choosePortPane = TableLayoutHelper.createTableLayoutPane(portComponents, rowSize, columnSize);
-        serverPortPane.add(choosePortPane, BorderLayout.CENTER);
-    }
-
     private JPanel createMemoryPane() {
         JPanel memoryPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Caching_Template"));
         UILabel memoryLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Max_Caching_Template"));
@@ -575,8 +537,6 @@ public class PreferencePane extends BasicPane {
 
         this.portEditor.setValue(new Integer(designerEnvManager.getEmbedServerPort()));
 
-        this.jdkHomeTextField.setText(designerEnvManager.getJdkHome());
-
         this.oracleSpace.setSelected(designerEnvManager.isOracleSystemSpace());
         this.cachingTemplateSpinner.setValue(designerEnvManager.getCachingTemplateLimit());
         this.joinProductImprove.setSelected(designerEnvManager.isJoinProductImprove());
@@ -636,8 +596,6 @@ public class PreferencePane extends BasicPane {
 
         designerEnvManager.setJettyServerPort(portEditor.getValue().intValue());
 
-        designerEnvManager.setJdkHome(jdkHomeTextField.getText());
-
         designerEnvManager.setOracleSystemSpace(this.oracleSpace.isSelected());
         designerEnvManager.setCachingTemplateLimit((int) this.cachingTemplateSpinner.getValue());
         designerEnvManager.setJoinProductImprove(this.joinProductImprove.isSelected());

designer-form/src/main/java/com/fr/design/form/mobile/FormMobileAttrPane.java

@@ -13,8 +13,6 @@ import java.awt.*;
  * Created by fanglei on 2016/11/17.
  */
 public class FormMobileAttrPane extends BasicBeanPane<FormMobileAttr>{
-    //工具栏容器
-    private MobileToolBarPane mobileToolBarPane;
     // 模版设置面板
     private FormMobileTemplateSettingsPane formMobileTemplateSettingsPane;
     // 其他
@@ -33,7 +31,6 @@ public class FormMobileAttrPane extends BasicBeanPane<FormMobileAttr>{
         panel.setBorder(BorderFactory.createEmptyBorder(PADDING, PADDING, PADDING, PADDING));
 
         panel.add(formMobileTemplateSettingsPane = new FormMobileTemplateSettingsPane());
-        panel.add(mobileToolBarPane = new MobileToolBarPane());
         panel.add(formMobileOthersPane = new FormMobileOthersPane());
 
         JPanel panelWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -47,7 +44,6 @@ public class FormMobileAttrPane extends BasicBeanPane<FormMobileAttr>{
         if (ob == null) {
             ob = new FormMobileAttr();
         }
-        this.mobileToolBarPane.populateBean(ob);
         this.formMobileTemplateSettingsPane.populateBean(ob);
         this.formMobileOthersPane.populateBean(ob);
     }
@@ -55,7 +51,6 @@ public class FormMobileAttrPane extends BasicBeanPane<FormMobileAttr>{
     @Override
     public FormMobileAttr updateBean() {
         FormMobileAttr formMobileAttr = new FormMobileAttr();
-        this.mobileToolBarPane.updateBean(formMobileAttr);
         this.formMobileTemplateSettingsPane.updateBean(formMobileAttr);
         this.formMobileOthersPane.updateBean(formMobileAttr);
         return formMobileAttr;

designer-realize/src/main/java/com/fr/design/report/mobile/ReportMobileAttrPane.java

@@ -15,8 +15,6 @@ public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr>{
 
     private ReportMobileTemplateSettingsPane reportMobileTemplateSettingsPane;  // 模版设置面板
     private AppFitBrowserPane appFitBrowserPane;
-    //工具栏容器
-    private MobileToolBarPane mobileToolBarPane;
     // 其他
     private MobileOthersPane mobileOthersPane;
 
@@ -38,7 +36,6 @@ public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr>{
         appFitBrowserPane.setAppFitPreviewPane(appFitPreviewPane);
         jPanel.add(appFitBrowserPane);
 
-        jPanel.add(mobileToolBarPane = new MobileToolBarPane());
         jPanel.add(mobileOthersPane = new MobileOthersPane());
 
         jPanel.add(appFitPreviewPane);
@@ -52,7 +49,6 @@ public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr>{
             ob = new ElementCaseMobileAttr();
         }
         appFitBrowserPane.populateBean(ob);
-        mobileToolBarPane.populateBean(ob);
         mobileOthersPane.populateBean(ob);
         reportMobileTemplateSettingsPane.populateBean(ob);
     }
@@ -60,7 +56,6 @@ public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr>{
     @Override
     public ElementCaseMobileAttr updateBean() {
         ElementCaseMobileAttr caseMobileAttr = appFitBrowserPane.updateBean();
-        mobileToolBarPane.updateBean(caseMobileAttr);
         mobileOthersPane.updateBean(caseMobileAttr);
         reportMobileTemplateSettingsPane.updateBean(caseMobileAttr);