Browse Source

Pull request #7588: REPORT-64012 去掉cipher

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

* commit '7af99b161e11a72ab383663dbf2fafe0a819f0ea':
  REPORT-64012 去掉cipher
feature/x
Xiqiu 3 years ago
parent
commit
ec2490a98b
  1. 12
      designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java

12
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 KeyFileUITextField keyPathClientKey = new KeyFileUITextField(18);
private UIButton fileChooserButtonClientKey = new UIButton(); private UIButton fileChooserButtonClientKey = new UIButton();
private UICheckBox verifyCa = new UICheckBox(i18nText("Fine-Design_Basic_Ssl_Verify_Ca")); 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 JPanel jPanel;
private Component[][] usingComps; private Component[][] usingComps;
private double p = TableLayout.PREFERRED; 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}; 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); 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[] 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[][]{ usingComps = new Component[][]{
compCa, compCa,
compVerifyCa, compVerifyCa,
compClientCert, compClientCert,
compClientKey, compClientKey,
comCipher // comCipher
}; };
usingSsl.setSelected(true); 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(usingSsl, BorderLayout.NORTH);
jPanel.add(contextPane, BorderLayout.CENTER); jPanel.add(contextPane, BorderLayout.CENTER);
this.add(jPanel); this.add(jPanel);
@ -120,7 +120,7 @@ public class SslPane extends BasicPane {
keyPathClientCert.setText(normalSsl.getClientCertificate()); keyPathClientCert.setText(normalSsl.getClientCertificate());
keyPathClientKey.setText(normalSsl.getClientPrivateKey()); keyPathClientKey.setText(normalSsl.getClientPrivateKey());
verifyCa.setSelected(normalSsl.isVerifyCa()); verifyCa.setSelected(normalSsl.isVerifyCa());
cipher.setText(normalSsl.getCipher()); // cipher.setText(normalSsl.getCipher());
} else { } else {
throw new SslException("un support ssl type"); throw new SslException("un support ssl type");
} }
@ -130,7 +130,7 @@ public class SslPane extends BasicPane {
public void update(JDBCDatabaseConnection jdbcDatabase) { public void update(JDBCDatabaseConnection jdbcDatabase) {
NormalSsl normalSsl = new NormalSsl(); NormalSsl normalSsl = new NormalSsl();
normalSsl.setCipher(cipher.getText().trim()); // normalSsl.setCipher(cipher.getText().trim());
normalSsl.setVerifyCa(verifyCa.isSelected()); normalSsl.setVerifyCa(verifyCa.isSelected());
normalSsl.setCaCertificate(keyPathCa.getText().trim()); normalSsl.setCaCertificate(keyPathCa.getText().trim());
normalSsl.setClientCertificate(keyPathClientCert.getText().trim()); normalSsl.setClientCertificate(keyPathClientCert.getText().trim());

Loading…
Cancel
Save