Pull request #7588: REPORT-64012 去掉cipher

Merge in DESIGN/design from ~XIQIU/design:feature/x to feature/x

* commit '7af99b161e11a72ab383663dbf2fafe0a819f0ea':
  REPORT-64012 去掉cipher

designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java

@@ -48,7 +48,7 @@ public class SslPane extends BasicPane {
     private KeyFileUITextField keyPathClientKey = new KeyFileUITextField(18);
     private UIButton fileChooserButtonClientKey = new UIButton();
     private UICheckBox verifyCa = new UICheckBox(i18nText("Fine-Design_Basic_Ssl_Verify_Ca"));
-    private UITextField cipher = new UITextField(20);
+//    private UITextField cipher = new UITextField(20);
     private JPanel jPanel;
     private Component[][] usingComps;
     private double p = TableLayout.PREFERRED;
@@ -74,16 +74,16 @@ public class SslPane extends BasicPane {
         Component[] compClientCert = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Client_Cert") + ":", SwingConstants.RIGHT), filePanelClientCert};
         JPanel filePanelClientKey = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPathClientKey, fileChooserButtonClientKey}}, new double[]{p}, new double[]{f, 20}, 0);
         Component[] compClientKey = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Client_Key") + ":", SwingConstants.RIGHT), filePanelClientKey};
-        Component[] comCipher = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Cipher") + ":", SwingConstants.RIGHT), cipher};
+//        Component[] comCipher = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Cipher") + ":", SwingConstants.RIGHT), cipher};
         usingComps = new Component[][]{
                 compCa,
                 compVerifyCa,
                 compClientCert,
                 compClientKey,
-                comCipher
+//                comCipher
         };
         usingSsl.setSelected(true);
-        contextPane = TableLayoutHelper.createGapTableLayoutPane(usingComps, new double[]{p, p, p, p, p, p}, columnSize, 11, 11);
+        contextPane = TableLayoutHelper.createGapTableLayoutPane(usingComps, new double[]{p, p, p, p}, columnSize, 11, 11);
         jPanel.add(usingSsl, BorderLayout.NORTH);
         jPanel.add(contextPane, BorderLayout.CENTER);
         this.add(jPanel);
@@ -120,7 +120,7 @@ public class SslPane extends BasicPane {
             keyPathClientCert.setText(normalSsl.getClientCertificate());
             keyPathClientKey.setText(normalSsl.getClientPrivateKey());
             verifyCa.setSelected(normalSsl.isVerifyCa());
-            cipher.setText(normalSsl.getCipher());
+//            cipher.setText(normalSsl.getCipher());
         } else {
             throw new SslException("un support ssl type");
         }
@@ -130,7 +130,7 @@ public class SslPane extends BasicPane {
 
     public void update(JDBCDatabaseConnection jdbcDatabase) {
         NormalSsl normalSsl = new NormalSsl();
-        normalSsl.setCipher(cipher.getText().trim());
+//        normalSsl.setCipher(cipher.getText().trim());
         normalSsl.setVerifyCa(verifyCa.isSelected());
         normalSsl.setCaCertificate(keyPathCa.getText().trim());
         normalSsl.setClientCertificate(keyPathClientCert.getText().trim());